[ooo-build-commit] 2 commits - bin/applyflags configure.in patches/dev300

[Petr Mladek]

 bin/applyflags                                        |    2 
 configure.in                                          |    2 
 patches/dev300/apply                                  |    5 +-
 patches/dev300/helpcontent-scalc-01-localize-m14.diff |   40 ++++++++++++++++++
 patches/dev300/helpcontent-scalc-01-localize.diff     |    2 
 5 files changed, 47 insertions(+), 4 deletions(-)

New commits:
commit e148cbcb63e2fe4ba4f19ad0e05410977f3cc837
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jul 23 11:23:10 2009 +0200

    Default build tag ooo310-m16
    
    * configure.in: default build tag ooo310-m16; builds and works here

diff --git a/configure.in b/configure.in
index e5f58dd..b66fe13 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=ooo310-m15
+DEFAULT_TAG=ooo310-m16
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOO310_m1
 
commit cf5916a9877b8e599ac2495c3bd9900576d685dc
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jul 23 11:11:12 2009 +0200

    Really apply the Localize section when possible
    
    * bin/applyflags: fix the check of installed localize.sdf files
    
    * patches/dev300/helpcontent-scalc-01-localize-m14.diff:
    * patches/dev300/helpcontent-scalc-01-localize.diff
    * patches/dev300/apply: updated for ooo310-m15

diff --git a/bin/applyflags b/bin/applyflags
index 781a047..33a2141 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -31,7 +31,7 @@ fi
 if test -d $OOBUILDDIR/swext -o -d $OOBUILDDIR/sdext -o -d $OOBUILDDIR/reportbuilder; then
     echo -n " --distro=Extensions";
 fi
-if grep localize.sdf $OOBUILDDIR/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then
+if test -f $OOBUILDDIR/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then
     echo -n " --distro=Localize";
 fi
 if test "$UNSTABLE_WP" = "YES" ; then
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c8e5b3f..99bcc00 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -166,9 +166,12 @@ cws-graphite01-20090630.diff, i#69129
 [ HelpContent ]
 helpcontent-scalc-01.diff, kohei
 
-[ LocalizeFixes ]
+[ LocalizeFixes > ooo310-m14 ]
 helpcontent-scalc-01-localize.diff, kohei
 
+[ LocalizeFixes <= ooo310-m14 ]
+helpcontent-scalc-01-localize-m14.diff
+
 [ LinuxOnly ]
 # Don't stat tons of config files we don't need to read on startup
 speed-configmgr.diff, i#56783, michael
diff --git a/patches/dev300/helpcontent-scalc-01-localize-m14.diff b/patches/dev300/helpcontent-scalc-01-localize-m14.diff
new file mode 100644
index 0000000..0a952bb
--- /dev/null
+++ b/patches/dev300/helpcontent-scalc-01-localize-m14.diff
@@ -0,0 +1,40 @@
+diff --git helpcontent2/source/text/scalc/01/localize.sdf helpcontent2/source/text/scalc/01/localize.sdf
+index 6b18d82..40b93c0 100644
+--- helpcontent2/source/text/scalc/01/localize.sdf
++++ helpcontent2/source/text/scalc/01/localize.sdf
+@@ -133065,35 +133065,6 @@
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id8868068				0	vi	={1;2;3|4;5;6}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id8868068				0	zh-CN	={1;2;3|4;5;6}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id8868068				0	zh-TW	={1;2;3|4;5;6}				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ar	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	bg	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	br	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ca	El separador de columna (que separa els elements d'una fila) és el punt i coma ';'. El separador de fila és un símbol de barra vertical '|'. Els separadors no depenen de la llengua ni de la configuració regional. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	cs	Oddělovačem sloupců (rozdělení prvků jednoho řádku) je středník ';'. Oddělovačem řádků je symbol roury '|'. Oddělovače nezávisejí na jazykovém nastavení.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	da	Kolonneadskilleren (opdeler elementerne i en række) er ';' semikolon. Rækkeadskilleren er '|' dataledningssymbolet. Skilletegnene er ikke sprog- eller lokalitetsafhængige. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	de	Der Spaltentrenner (trennt die Elemente in einer Zeile) ist das ';' Semikolon. Der Zeilentrenner ist ein '|' Pipe Symbol. Die Trenner sind sprachunabhängig. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	el	Το διαχωριστικό στηλών (διαχωρίζει τα στοιχεία μιας γραμμής) είναι το ελληνικό ερωτηματικό ';'. Ο διαχωριστής γραμμών είναι η κατακόρυφη κάθετος '|'. Οι διαχωριστές είναι ανεξάρτητοι γλώσσας και τοποθεσίας.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	en-GB	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	es	El separador de columnas (separando elementos en una fila) es el ";" punto y coma. El separador de filas es la "|" barra. Los separadores no están dependiente de idioma ni local.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	et	Veergude eraldaja (ühes reas asuvate elementide eraldaja) on semikoolon ';'. Ridade eraldajaks on püstkriipsu märk '|'. Need eraldajad ei sõltu keelest ega lokaadist.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	fi	Sarake-erottimena (yhden rivin arvojen erottelemiseksi) käytetään puolipistettä ';'. Rivierottimena on pystyviiva '|'. Erottimet eivät ole kieli- tai aluekohtaisia.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	fr	Le séparateur de colonne (séparant les éléments dans une ligne) est le ';' point-virgule. Le séparateur de ligne est '|' la barre verticale. Les séparateurs ne sont pas dépendants de la langue ou de l'environnement localisé. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	hu	Az oszlopelválasztó (amely elválasztja a soron belül az elemeket) a pontosvessző (;). A sorelválasztó a függőleges vonal (|). Az elválasztók nem függnek a nyelvtől és a területi beállításoktól. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	it	Il separatore di colonne (che separa gli elementi appartententi ad una stessa riga) è il punto e virgola ';'. Il separatore di riga è il simbolo '|'. I separatori non dipendono dal linguaggio o dalla localizzazione.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ja	列区切り記号 (1 åˆ—ã®è¦ç´ ã‚’åŒºåˆ‡ã‚‹ã‚‚ã®) は セミコロン (;) です。 行区切り記号はパイプ記号 (|) です。 区切り記号は言語ではなく、ロケールにも依存しません。 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	km	អ្នកបំបែក​ជួរ​ឈរ (បំបែក​ធាតុ​ជា​មួយ​ជួរដេក) គឺជា​សញ្ញា​ចំណុច​ក្បៀស ';' ។ អ្នក​បំបែក​ជួរ​ដេក​គឺ​ជា​និមិត្តសញ្ញា​​បំពង់ '|' ។ អ្នក​បំបែក គឺ​មិនមែន​ជា​ភាសា និង​ការ​ដាក់​មូលដ្ឋានទេ ។				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ko	(í•œ 행에서 요소를 분리하는) ì—´ 구분자는 ';' ì„¸ë¯¸ì½œë¡ ìž…ë‹ˆë‹¤. í–‰ 구분자는 '|' 파이프 기호입니다. 구분자는 언어 및 로케일에 ë…ë¦½ì ìž…ë‹ˆë‹¤. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	nl	Het kolomscheidingsteken (dat de elementen in één rij scheidt) is de puntkomma ';'. Het rijscheidingsteken is het 'pipe'-teken '|'. De scheidingstekens zijn niet afhankelijk van taal en locale. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	pl	Separator kolumn (oddzielający elementy w jednym wierszu) to średnik (;). Separator wierszy to symbol potoku „|”. Separatory są niezależne od języka i ustawień regionalnych. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	pt	O separador de colunas (que separa elementos numa linha) é o ponto e vírgula ';'. O separador de linhas é o símbolo '|'. Os separadores não estão dependentes de idioma ou configuração regional. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	pt-BR	O separador de coluna (separando elementos em uma linha) é o ponto-e-vírgula ';'. O separador de linhas é o símbolo '|'. Os separadores não dependem do idioma ou da locale. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	ru	Разделитель столбцов (разделяющий элементы в одной строке) - ";" (точка с запятой). Разделитель строк - "|" (символ конвейеризации). Разделители не зависят от языка и локали. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	sl	Ločilo stolpcev (ki ločuje elemente ene vrstice) je podpičje (';'). Ločilo vrstic je simbol '|'. Ločila niso odvisna od jezikovnih in krajevnih nastavitev. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	sv	Semikolon ';' används som kolumnavgränsare (avgränsar elementen på en rad). Som radavgränsare används symbolen '|'. Avgränsarna är inte språk- eller språkvariantberoende. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	tr	Sütun ayracı ( bir satırdaki elemanları ayıran) ';' noktalı virgül karakteridir. Satır ayracı ise '|' boru sembolüdür. Ayraçlar yerel veya dil bağımlı değildir.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	vi	Dấu tách cột (phân cách các phần tử theo một hà ng) là dấu chấm phẩy « ; ». Dấu tách hà ng là ký hiệu ống dẫn « | ». Hai dấu tách không phụ thuộc và o ngôn ngữ hay miền địa phương. 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	zh-CN	åˆ—åˆ†éš”ç¬¦ï¼ˆç”¨äºŽåˆ†éš”è¡Œä¸­çš„å…ƒç´ ï¼‰æ˜¯åˆ†å· ';'。行分隔符是竖线符号 '|'ã€‚è¿™äº›åˆ†éš”ç¬¦ä¸Žè¯­è¨€å’Œè¯­è¨€çŽ¯å¢ƒæ— å…³ã€‚ 				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	zh-TW	欄分隔符 (åˆ†éš”åŒä¸€åˆ—ä¸­çš„å…ƒç´ ) 為分號「;」。列分隔符為直線符號「|」。分隔符與語言和語言環境無關。 				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id9387493				0	ar	={1;2;3}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id9387493				0	bg	={1;2;3}				2002-02-02 02:02:02
+ helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id9387493				0	br	={1;2;3}				2002-02-02 02:02:02
diff --git a/patches/dev300/helpcontent-scalc-01-localize.diff b/patches/dev300/helpcontent-scalc-01-localize.diff
index 0a952bb..db277fe 100644
--- a/patches/dev300/helpcontent-scalc-01-localize.diff
+++ b/patches/dev300/helpcontent-scalc-01-localize.diff
@@ -13,7 +13,7 @@ index 6b18d82..40b93c0 100644
 -helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	cs	Oddělovačem sloupců (rozdělení prvků jednoho řádku) je středník ';'. Oddělovačem řádků je symbol roury '|'. Oddělovače nezávisejí na jazykovém nastavení.				2002-02-02 02:02:02
 -helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	da	Kolonneadskilleren (opdeler elementerne i en række) er ';' semikolon. Rækkeadskilleren er '|' dataledningssymbolet. Skilletegnene er ikke sprog- eller lokalitetsafhængige. 				2002-02-02 02:02:02
 -helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	de	Der Spaltentrenner (trennt die Elemente in einer Zeile) ist das ';' Semikolon. Der Zeilentrenner ist ein '|' Pipe Symbol. Die Trenner sind sprachunabhängig. 				2002-02-02 02:02:02
--helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	el	Το διαχωριστικό στηλών (διαχωρίζει τα στοιχεία μιας γραμμής) είναι το ελληνικό ερωτηματικό ';'. Ο διαχωριστής γραμμών είναι η κατακόρυφη κάθετος '|'. Οι διαχωριστές είναι ανεξάρτητοι γλώσσας και τοποθεσίας.				2002-02-02 02:02:02
+-helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	el	Το διαχωριστικό στηλών (διαχωρίζει τα στοιχεία μιας γραμμής) είναι το ελληνικό ερωτηματικό ';'. Τα διαχωριστικά γραμμών είναι η κατακόρυφη κάθετος '|'. Τα διαχωριστικά είναι ανεξάρτητα γλώσσας και τοποθεσίας.				2002-02-02 02:02:02
 -helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	en-GB	The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent.				2002-02-02 02:02:02
 -helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	es	El separador de columnas (separando elementos en una fila) es el ";" punto y coma. El separador de filas es la "|" barra. Los separadores no están dependiente de idioma ni local.				2002-02-02 02:02:02
 -helpcontent2	source\text\scalc\01\04060107.xhp	0	help	par_id936613				0	et	Veergude eraldaja (ühes reas asuvate elementide eraldaja) on semikoolon ';'. Ridade eraldajaks on püstkriipsu märk '|'. Need eraldajad ei sõltu keelest ega lokaadist.				2002-02-02 02:02:02