------------------------------------------------------------
revno: 2007
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-06-01 15:11:46 +0200
message:
prepare for 3.2.1 final (to be released Friday), update ooo-build
removed:
patches/fix-bashisms-in-configure.diff
added:
patches/hu-translation-fixes.diff
modified:
changelog
patches/series
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-05-31 10:58:42 +0000
+++ b/changelog 2010-06-01 13:11:46 +0000
@@ -1,3 +1,21 @@
+openoffice.org (1:3.2.1-1) UNRELEASED; urgency=low
+
+ * OpenOffice.org 3.2.1 final (OOO320_m19)
+
+ * translation-updates-20100529: oops, this has to be ....
+ * translation-updates-20100526: ... this
+
+ * ooo-build:
+ - update (3.2.1.3)
+
+ * debian/patches/hu-translation-fixes.diff: add hu translation fixes
+ from ooo-build-3-2-1 branch
+
+ * debian/rules:
+ - use Oracles tarballs again
+
+ -- Rene Engelhard <r...@debian.org> Sun, 30 May 2010 19:43:23 +0200
+
openoffice.org (1:3.2.1~rc2-2) experimental; urgency=low
* debian/patches/extensions-mozilla-plugin-pc-if-libxul.diff: remove
=== removed file 'patches/fix-bashisms-in-configure.diff'
--- a/patches/fix-bashisms-in-configure.diff 2010-05-27 22:54:32 +0000
+++ b/patches/fix-bashisms-in-configure.diff 1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
---- openoffice.org-3.2.1~rc2/ooo-build-3-2-1-2/patches/dev300/apply
2010-05-28 00:37:41.000000000 +0200
-+++ openoffice.org-3.2.1~rc2/ooo-build-3-2-1-2/patches/dev300/apply
2010-05-28 00:37:54.000000000 +0200
-@@ -3393,6 +3393,8 @@
- # fixes crasher in xml parser
- unoxml-fix-empty-xmlns.diff, rodo
- configure-fix-lpsolve-depends.diff, janneke
-+# fix bashisms in configure.in (== vs. =)
-+configure-test-operator.diff, i#107645, rengelha
- build-fix-xulrunner-npapi-inc.diff, janneke
- toolkit-proper-erase-fix.diff, i#106575, thorsten
-
---- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++
openoffice.org-3.2.1~rc2/ooo-build-3-2-1-2/patches/dev300/configure-test-operator.diff
2010-05-28 00:27:55.000000000 +0200
-@@ -0,0 +1,98 @@
-+diff --git a/configure.in b/configure.in
-+--- configure.in
-++++ configure.in
-+@@ -3049,7 +3049,7 @@
-+
-+ if test "$SOLAR_JAVA" != ""; then
-+ dnl first check if we have been asked to autodetect JAVA_HOME with a
recent gij
-+- if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-++ if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
-+ if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
-+ cat > findhome.java <<_ACEOF
-+ [import java.io.File;
-+@@ -3137,7 +3137,7 @@
-+ echo "JAVA_HOME was not explicitly informed with --with-jdk-home.
the configure script" >> warn
-+ echo "attempted to find JAVA_HOME automatically, but apparently it
failed" >> warn
-+ echo "in case JAVA_HOME is incorrectly set, some projects with not
be built correctly" >> warn
-+-# if test "$JDK" == "gcj"; then
-++# if test "$JDK" = "gcj"; then
-+ # echo "e.g. install java-1.4.2-gcj-compat-devel and use
--with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
-+ # fi
-+ fi
-+@@ -3731,7 +3731,7 @@
-+ if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
-+ test "$with_system_libxslt" != "no"; then
-+ if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-+- test "$with_system_libxml" == "no"; then
-++ test "$with_system_libxml" = "no"; then
-+ # somehow AC_MSG_WARN won't work...
-+ echo "to prevent incompatibilities between internal libxml2 and
libxslt, the office will be build with system-libxml"
-+ echo "to prevent incompatibilities between internal libxml2 and
libxslt, the office will be build with system-libxml" >> warn
-+@@ -3741,7 +3741,7 @@
-+ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
-+ test "$with_system_libxml" != "no"; then
-+ if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-+- test "$with_system_libxslt" == "no"; then
-++ test "$with_system_libxslt" = "no"; then
-+ # somehow AC_MSG_WARN won't work...
-+ echo "to prevent incompatibilities between internal libxslt and
libxml2, the office will be build with system-libxslt"
-+ echo "to prevent incompatibilities between internal libxslt and
libxml2, the office will be build with system-libxslt" >> warn
-+@@ -4443,7 +4443,7 @@
-+
-+ #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
-+ #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-+- if test "$MOZ_FLAVOUR" == "libxul"; then
-++ if test "$MOZ_FLAVOUR" = "libxul"; then
-+ MOZ_FLAVOUR="mozilla"
-+ fi
-+
-+@@ -4696,7 +4696,7 @@
-+ dnl ===================================================================
-+
-+ AC_MSG_CHECKING([whether to enable graphite support])
-+-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" ==
"z" -o "$enable_graphite" != "no" ; then
-++if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" =
"z" -o "$enable_graphite" != "no" ; then
-+ AC_MSG_RESULT([yes])
-+ ENABLE_GRAPHITE="TRUE"
-+ AC_MSG_CHECKING([which graphite to use])
-+@@ -5851,7 +5851,7 @@
-+ fi
-+ AC_SUBST(ENABLE_MEDIAWIKI)
-+
-+-if test "$ENABLE_MEDIAWIKI" == "YES"; then
-++if test "$ENABLE_MEDIAWIKI" = "YES"; then
-+ AC_MSG_CHECKING([which Servlet API Jar to use])
-+ if test -n "$with_system_servlet_api"; then
-+ AC_MSG_RESULT([external])
-+@@ -5881,7 +5881,7 @@
-+ AC_MSG_ERROR([not existing. get it (did you get the -extensions
tarball?)])
-+ fi
-+ AC_MSG_CHECKING([which jfreereport libs to use])
-+- if test "$with_system_jfreereport" == "yes"; then
-++ if test "$with_system_jfreereport" = "yes"; then
-+ SYSTEM_JFREEREPORT=YES
-+ AC_MSG_RESULT([external])
-+ if test -z $SAC_JAR; then
-+@@ -6251,7 +6251,7 @@
-+ kde_incdirs="/usr/include $x_includes"
-+ kde_libdirs="/usr/lib $x_libraries"
-+
-+- if test "$build_cpu" == "x86_64" ; then
-++ if test "$build_cpu" = "x86_64" ; then
-+ qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-+ kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
-+ fi
-+@@ -6809,11 +6809,11 @@
-+ # ===================================================================
-+ AC_MSG_CHECKING([build verbosity])
-+ if test -n "$enable_verbose"; then
-+- if test "$enable_verbose" == "yes"; then
-++ if test "$enable_verbose" = "yes"; then
-+ VERBOSE="TRUE"
-+ AC_MSG_RESULT([high])
-+ fi
-+- if test "$enable_verbose" == "no"; then
-++ if test "$enable_verbose" = "no"; then
-+ VERBOSE="FALSE"
-+ AC_MSG_RESULT([low])
-+ fi
=== added file 'patches/hu-translation-fixes.diff'
--- a/patches/hu-translation-fixes.diff 1970-01-01 00:00:00 +0000
+++ b/patches/hu-translation-fixes.diff 2010-06-01 13:11:46 +0000
@@ -0,0 +1,42 @@
+diff --git a/src/sdf/fixes-hu.sdf b/src/sdf/fixes-hu.sdf
+index 89a6542..36727d6 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-3/src/sdf/fixes-hu.sdf
++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/src/sdf/fixes-hu.sdf
+@@ -1,5 +1,21 @@
+-svx source\cui\chardlg.src 0 tristatebox
RID_SVXPAGE_CHAR_EFFECTS CB_OUTLINE 82 en-US
Out~line 20100415 16:29:54
+-svx source\cui\chardlg.src 0 tristatebox
RID_SVXPAGE_CHAR_EFFECTS CB_OUTLINE 82 hu
Kö~rvonalas 2010-03-25 22:00:00
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3147344 14 0 en-US Series Type
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3147344 14 0 hu Sorozat típusa
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3148488 16 0 en-US Linear
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3148488 16 0 hu Számtani sorozat
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3159238 17 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC\"\>Creates a linear
number series using the defined increment and end value.\</ahelp\>
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3159238 17 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC\"\>A megadott
növekménnyel, mint különbséggel számtani sorozatot készít a megadott
végértékig.\</ahelp\> 20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149210 18 0 en-US Growth
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149210 18 0 hu Mértani sorozat
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150364 19 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC\"\>Creates a growth
series using the defined increment and end value.\</ahelp\>
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150364 19 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC\"\>A megadott
növekménnyel, mint hányadossal mértani sorozatot készít a megadott
végértékig.\</ahelp\> 20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149528 20 0 en-US Date
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149528 20 0 hu Dátumsorozat
20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3153308 26 0 en-US In this area you can
specify the desired unit of time. This area is only active if the
\<emph\>Date\</emph\> option has been chosen in the \<emph\>Series
type\</emph\> area. 20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3153308 26 0 hu A területen
meghatározhatja a kívánt időegységet. A terület csak akkor aktív, ha a
\<emph\>Sorozat típusa\</emph\> terület \<emph\>Dátum\</emph\> beállítását
választotta. 20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3148605 28 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY\"\>Use the
\<emph\>Date\</emph\> series type and this option to create a series using
seven days.\</ahelp\> 20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3148605 28 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY\"\>Használja a
\<emph\>Dátum\</emph\> sorozattípust és ezt a beállítást egy hét napot használó
sorozat létrehozásához.\</ahelp\> 20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150108 30 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK\"\>Use the
\<emph\>Date\</emph\> series type and this option to create a series of five
day sets.\</ahelp\> 20051120 17:50:58
++helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150108 30 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK\"\>Használja a
\<emph\>Dátum\</emph\> sorozattípust és ezt a beállítást, ha a sorozat tagjai
csak hétköznapokra eshetnek.\</ahelp\> 20051120
17:50:58
+ helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id3153624 3 0 en-US Use zero (0) or the
number sign (#) as placeholders in your number format code to represent
numbers. The (#) only displays significant digits, while the (0) displays
zeroes if there are fewer digits in the number than in the number format.
20051120 17:50:58
+ helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id3153624 3 0 hu Használjon nullát (0)
vagy a szám jelet (#) helykitöltőnek a számformátumkódban a számok jelölésére.
A (#) csak lényeges számjegyeket, míg a (0) nullákat jelenít meg, ha a számban
a számformátumban megadottaknál kevesebb számjegy van.
20051120 17:50:58
+ helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id3147088 7 0 en-US 0 (Zero)
20051120 17:50:58
+@@ -39,4 +55,12 @@ helpcontent2 source\text\shared\01\05020301.xhp
0 help par_id3154302 103 0 hu
+ helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423518 0 en-US The above
listed formatting codes work with your language version of %PRODUCTNAME.
However, when you need to switch the locale of %PRODUCTNAME to another locale,
you will need to know the formatting codes used in that other locale.
20051120 17:50:58
+ helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423518 0 hu A fent
felsorolt formázási kódok az %PRODUCTNAME jelen nyelvi verziójával működnek. Ha
azonban az %PRODUCTNAME területi beállítását módosítania kell, ismernie kell a
másik területi beállításnál használt formátumkódokat.
20051120 17:50:58
+ helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423556 0 en-US For example, if
your software is set to an English locale, and you want to format a year with
four digits, you enter YYYY as a formatting code. When you switch to a German
locale, you must use JJJJ instead. The following table lists only the localized
differences. 20051120 17:50:58
+-helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423556 0 hu Ha például a
szoftver angol vagy magyar területi beállítást használ, és egy évszámot négy
számjegyen kíván ábrázolni, formátumkódként az YYYY használható. Ha átvált
német területi beállításra, a JJJJ kódot kell használnia. A következő táblázat
csak a lokalizációból fakadó különbségeket sorolja fel.
20051120 17:50:58
++helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423556 0 hu Ha például a
szoftver magyar területi beállítást használ, és egy évszámot négy számjegyen
kíván ábrázolni, formátumkódként az YYYY használható. Ha átvált német területi
beállításra, a JJJJ kódot kell használnia. A következő táblázat csak a
lokalizációból fakadó különbségeket sorolja fel.
20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_ARITHMETIC 69 en-US Li~near
20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_ARITHMETIC 69 hu
Számtani sorozat 20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_GEOMETRIC 69 en-US ~Growth
20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_GEOMETRIC 69 hu Mértani
sorozat 20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_DATE 69 en-US Da~te
20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_DATE 69 hu
Dá~tumsorozat 20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 fixedline
RID_SCDLG_FILLSERIES FL_TYPE 75 en-US Series type
20051120 17:50:58
++sc source\ui\src\miscdlgs.src 0 fixedline
RID_SCDLG_FILLSERIES FL_TYPE 75 hu Sorozat típusa
20051120 17:50:58
=== modified file 'patches/series'
--- a/patches/series 2010-05-27 22:54:32 +0000
+++ b/patches/series 2010-06-01 13:11:46 +0000
@@ -1,1 +1,1 @@
-fix-bashisms-in-configure.diff
+hu-translation-fixes.diff
=== modified file 'rules'
--- a/rules 2010-06-01 08:17:19 +0000
+++ b/rules 2010-06-01 13:11:46 +0000
@@ -67,11 +67,11 @@
MWS=OOO320
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
-MILESTONE=m18
-TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
-#TAG=$(MWS)_$(MILESTONE)
+MILESTONE=m19
+#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
+TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-2-1
-OOO_BUILD_VERSION=3.2.1.2
+OOO_BUILD_VERSION=3.2.1.3
OOO_BUILD_TAG=OOO_BUILD_$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./_/g')
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
@@ -246,7 +246,7 @@
endif
# "new" source split? This is to be n when to use
# Suns tarballs.
-WITH_SPLIT=y
+WITH_SPLIT=n
ENABLE_GRAPHITE=y
USE_SYSTEM_GRAPHITE=y
ALLOC=system
=== modified file 'source/components'
--- a/source/components 2010-05-25 17:11:03 +0000
+++ b/source/components 2010-06-01 13:11:46 +0000
@@ -1,3 +1,3 @@
-ooo-build-3-2-1-2
-ext-sources-ooo-build-3-2-1-2
-translation-updates-20100529
+ooo-build-3-2-1-3
+ext-sources-ooo-build-3-2-1-3
+translation-updates-20100526
