------------------------------------------------------------
revno: 1503
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Fri 2009-04-17 20:40:12 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.124
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 11:42:15 +0200
message:
merge
modified:
changelog
control
control.debug.in
control.in
control.lang.in
control.ure.in
------------------------------------------------------------
revno: 1332.1.125
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 11:43:12 +0200
message:
merge
modified:
control
control.in
------------------------------------------------------------
revno: 1332.1.126
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 11:45:34 +0200
message:
merge
modified:
changelog
control
control.fonts.in
control.mono.in
------------------------------------------------------------
revno: 1332.1.127
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 12:02:51 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.128
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 12:07:06 +0200
message:
handle stuff from DEB_BUILD_OPTIONS *after* lang=xx...
modified:
rules
------------------------------------------------------------
revno: 1332.1.129
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 21:09:05 +0200
message:
update ooo-build; resolve conflicts/regen control
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.130
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2009-04-17 20:37:06 +0200
message:
fixup HELPISOS
modified:
rules
=== modified file 'changelog'
--- a/changelog 2009-04-17 18:32:23 +0000
+++ b/changelog 2009-04-17 18:40:12 +0000
@@ -24,7 +24,7 @@
2.6
- remove scsolver stuff, scsolver is gone from ooo-build
- -- Rene Engelhard <r...@debian.org> Fri, 17 Apr 2009 20:29:42 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 17 Apr 2009 20:39:57 +0200
openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-04-16 14:38:14 +0000
+++ b/rules 2009-04-17 18:40:12 +0000
@@ -528,7 +528,7 @@
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/,/ /')
+ 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/,/ /')
else
# Note that the first one here *has to be* en-US. the first one gets
