------------------------------------------------------------
revno: 1684
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-09-30 03:06:35 +0200
message:
fix lang= parsing for > 2 langs; update ooo-build and close #478761
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-09-29 11:21:00 +0000
+++ b/changelog 2009-09-30 01:06:35 +0000
@@ -3,8 +3,9 @@
* The "Goodbye sparc!" release. :-(
* ooo-build:
- - update (a96dab3afc2d47da4cabf2890e3c8215187e96a6)
+ - update (cb6d5f3ab0837310b9733880b14a61bf7fad6ae4)
- Fixed range selection for RTL languages. (closes: #548767)
+ - fix some Extended Tips abbreviations for Italian (closes: #478761)
* merge from Ubuntu:
- Add support to turn off building on sparc.
@@ -17,6 +18,7 @@
not installed
- remove bogus (.*på engelsk) from GSI_da to fix some functions
(closes: #548608)
+ - fix build with > 2 languages in lang=
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
* debian/shell-lib.sh:
- check whether OOo is running before (de-)registering extensions or
@@ -25,7 +27,7 @@
it breaks. Removing "Adding extension XY .. done" echos
* debian/templates, debian/po: add debconf error shown when OOo is running
- -- Rene Engelhard <r...@debian.org> Tue, 29 Sep 2009 13:18:59 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 03:03:53 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-09-29 11:08:34 +0000
+++ b/rules 2009-09-30 01:06:35 +0000
@@ -610,9 +610,9 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
- ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
- LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+ ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
else
# Note that the first one here *has to be* en-US. the first one gets
# gid_Module_Root as filelist later and the rest gid_Module_Root.$iso
