[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 4 commits - bin/openoffice-xlate-lang configure.in patches/dev300 patches/mono

[René Engelhard]

 bin/openoffice-xlate-lang                                |    4 ++--
 configure.in                                             |    2 +-
 patches/dev300/office-cfg-linux-common-template-dir.diff |    8 ++++----
 patches/mono/mono-build.diff                             |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 3762e18a8a3cbbd10c1a636c5de01e72070a6726
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jul 3 14:28:35 2011 +0000

    openoffice-xlate-lang: be-BY -> be, ns -> no

diff --git a/bin/openoffice-xlate-lang b/bin/openoffice-xlate-lang
index 81b4c9f..7549f85 100755
--- a/bin/openoffice-xlate-lang
+++ b/bin/openoffice-xlate-lang
@@ -111,7 +111,7 @@ print $LanguageMap->{$LanguageCode}, "\n";
 # keep third column names here with openoffice-dir/share/*/<long lang name>/
 
 __DATA__
-:be-BY:belarussian
+:be:belarussian
 :bg:bulgarian
 :bn:bengali
 :bs:bosnian
@@ -126,7 +126,7 @@ __DATA__
 :lt:lithuanian
 :ne:nepali
 :vi:vietnamese
-:ns:northern_sotho
+:nso:northern_sotho
 :ss:swazi
 :sr:serbian
 :ve:venda
commit abdddb5ad84646154a91d97874ae726b827f25f4
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 2 12:22:10 2011 +0000

    bump version to 3.4.1.3 in configure.in

diff --git a/configure.in b/configure.in
index 4dcd229..1569596 100755
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(libreoffice-build, 3.4.0.2)
+AC_INIT(libreoffice-build, 3.4.1.3)
 AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
commit 9f8ec23534955544b75e2fe00732d61b07c4954b
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 2 12:20:56 2011 +0000

    make office-cfg-linux-common-template-dir.diff apply again

diff --git a/patches/dev300/office-cfg-linux-common-template-dir.diff b/patches/dev300/office-cfg-linux-common-template-dir.diff
index bdedff3..39bc88f 100644
--- a/patches/dev300/office-cfg-linux-common-template-dir.diff
+++ b/patches/dev300/office-cfg-linux-common-template-dir.diff
@@ -22,8 +22,8 @@ index 74c65d3..4e43df8 100644
  						<author>MBA</author>
  						<desc>Specifies the templates originate from these folders and sub-folders.</desc>
  					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value>
-+					<value oor:separator=";">file:///usr/share/templates/libreoffice/common;file:///usr/share/templates/libreoffice/$(vlang);file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);$(insturl)/share/template/$(vlang);$(insturl)/share/template;$(userurl)/template</value>
+-					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/common:$(userurl)/template</value>
++					<value oor:separator=";">file:///usr/share/templates/libreoffice/common;file:///usr/share/templates/libreoffice/$(vlang);file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);$(insturl)/share/template/$(vlang);$(insturl)/share/template/common;$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>
@@ -31,8 +31,8 @@ index 74c65d3..4e43df8 100644
  					<info>
  						<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
  					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value>
-+					<value oor:separator=";">file:///usr/share/templates/libreoffice/common;file:///usr/share/templates/libreoffice/$(vlang);file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);$(insturl)/share/template/$(vlang);$(insturl)/share/template;$(userurl)/template</value>
+-					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/common:$(userurl)/template</value>
++					<value oor:separator=";">file:///usr/share/templates/libreoffice/common;file:///usr/share/templates/libreoffice/$(vlang);file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);$(insturl)/share/template/$(vlang);$(insturl)/share/template/common;$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>
commit ec5daea67d9a409c0173f55ce0f3cbf9035982e1
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 2 12:20:22 2011 +0000

    make mono-build.diff apply again

diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index 672d1d2..9b05d61 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -127,7 +127,7 @@ index 12fbec8..9c8aa00 100644
 --- configure.in
 +++ configure.in
 @@ -475,6 +475,11 @@
- 	[Enable global menu support.]),
+          LibreOffice. By default, it is on on Windows and Mac, and off on Linux.]),
  ,)
  
 +AC_ARG_ENABLE(mono,