------------------------------------------------------------
revno: 1459
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2009-04-15 12:02:51 +0200
message:
merge
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-04-15 09:45:34 +0000
+++ b/changelog 2009-04-15 10:02:51 +0000
@@ -3,8 +3,10 @@
* debian/control.in, debian/control.kde.in, debian/rules:
- disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve
BUILD_KDE conditional
- * debian/control.in, debian/broffice.org.postrm.in:
- - Standards-Version: 3.8.1
+ * debian/control.in, debian/broffice.org.postrm.in, debian/rules:
+ - Standards-Version: 3.8.1. Fix DEB_BUILD_OPTIONS lang= parsing to actually
+ work with DEB_BUILD_OPTIONS being separated by spaces as introduced
+ in 3.8.0. (ccache,lang=en-US de -> ccache lang=en-US,de)
* debian/rules, debian/control.debug.in:
- fix lintians dbg-package-missing-depends
* debian/control*in:
=== modified file 'rules'
--- a/rules 2009-04-15 09:35:28 +0000
+++ b/rules 2009-04-15 10:02:51 +0000
@@ -507,9 +507,9 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
- ISOS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*lang=\([^,]*\),.*/\1/p')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*lang=\([^,]*\),.*/\1/p')
- LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*lang=\([^,]*\),.*/\1/p')
+ ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^,\s*\)\s.*/\1/p' | sed -e 's/,/ /')
+ LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
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
