[ooo-build-commit] bin/applyflags patches/dev300

[René Engelhard]

 bin/applyflags                      |    2 +-
 patches/dev300/apply                |    9 +++------
 patches/dev300/chart2-es-eje-Y.diff |   17 -----------------
 3 files changed, 4 insertions(+), 24 deletions(-)

New commits:
commit 34fc2459135c1d4341cd399561ffb036df42b0e3
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Sep 5 17:53:00 2009 +0200

    fix applying for "Localize" distr
    
    * bin/applyflags: check for l10n dir
    * patches/dev300/chart2-es-eje-Y.diff: remove, is in m56
    * patches/dev300/apply: remove hart2-es-eje-Y.diff

diff --git a/bin/applyflags b/bin/applyflags
index 693e15b..25322df 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -35,7 +35,7 @@ fi
 # The localize.sdf's are created during the build when they do not exits.
 # Additionally, they are created using something like echo > localize.sdf, so
 # even test -s is not helpful here :-(
-if grep 'OpenOffice\.org' $OOBUILDDIR/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then
+if test -d $OOBUILDDIR/l10n; then
     echo -n " --distro=Localize";
 fi
 
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7bfc2ab..ad1b87b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2556,7 +2556,7 @@ palette-enhanced-gradient.diff
 palette-enhanced-hatch.diff
 
 [ DebianBaseOnly ]
-configures-explicit-arch.diff
+#configures-explicit-arch.diff
 
 
 [ Fixes ]
@@ -2783,9 +2783,6 @@ sw-source-filter-xml-xmltbli-uninitializedvalue.diff, fridrich
 #vcl-salnativewidgets-uninitializedvalues.diff, fridrich
 
 [ LocalizeFixes ]
-# it is Y axis, not X one [in Spanish]
-chart2-es-eje-Y.diff, i#83821, rengelha
-
 # Fix Spanish translation of the autofilter menu; thanks to Eduardo Moreno
 sc-autofilter-l10n-es.diff, i#103840, pmladek
 
@@ -3367,9 +3364,9 @@ offapi-layoutcode.diff, cocofan
 xmloff-layoutcode.diff, cocofan
 
 [ MySQL ]
-cws-mysqlnative-20090828.diff
+#cws-mysqlnative-20090828.diff
 
 [ MySQL and DebianBaseOnly ]
 # add hack to link against STLport version of libmysqlcppconn on i386.
 # Needs a libmysqlcppconn-stlport.so etc built with STLport
-debian-mysqlc-build-against-stlport-hack.diff
+#debian-mysqlc-build-against-stlport-hack.diff
diff --git a/patches/dev300/chart2-es-eje-Y.diff b/patches/dev300/chart2-es-eje-Y.diff
deleted file mode 100644
index 37f668c..0000000
--- a/patches/dev300/chart2-es-eje-Y.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: localize.sdf
-===================================================================
-RCS file: /cvs/graphics/chart2/source/controller/dialogs/localize.sdf,v
-retrieving revision 1.30.22.5
-retrieving revision 1.30.22.6
-diff -u -u -r1.30.22.5 -r1.30.22.6
---- chart2/source/controller/dialogs/localize.sdf	9 Nov 2007 15:56:48 -0000	1.30.22.5
-+++ chart2/source/controller/dialogs/localize.sdf	30 Nov 2007 16:27:54 -0000	1.30.22.6
-@@ -22347,7 +22347,7 @@
- chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	ca	Eix ~Y				2002-02-02 02:02:02
- chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	da	~Y-akse				2002-02-02 02:02:02
- chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	de	~Y-Achse				2002-02-02 02:02:02
--chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	es	~Eje X				2002-02-02 02:02:02
-+chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	es	~Eje Y				2002-02-02 02:02:02
- chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	fr	Axe ~Y				2002-02-02 02:02:02
- chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	hu	~Y tengely				2002-02-02 02:02:02
- chart2	source\controller\dialogs\res_Titles.src	0	fixedtext	TITLES( xpos, ypos, editwidth, namefieldwidth )	FT_TITLE_Y_AXIS		!defined _CHART2_RES_TITLES_SRC	0	it	Asse ~Y				2002-02-02 02:02:02