------------------------------------------------------------
revno: 1660 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Wed 2009-09-30 03:07:56 +0200
message:
merge
modified:
changelog
rules
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2009-09-29 11:34:27 +0000
+++ b/changelog 2009-09-30 01:07:56 +0000
@@ -14,7 +14,7 @@
- now honours ACLs (closes: #216596, #548881)
* ooo-build:
- - update (1512ce8660d8f53567986be1e0953209d24dcca3)
+ - update (fb536c206482bb18e5faf1861a69e3f3f0575f0e)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -44,15 +44,16 @@
- remove hardcoded libldap2-dev builddep and add ENABLE_LDAP conditional.
Only suggest it because it's now dlopen()'ed anyway.
- -- Rene Engelhard <r...@debian.org> Tue, 29 Sep 2009 08:40:30 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 00:19:20 +0200
openoffice.org (1:3.1.1-3) UNRELEASED; urgency=low
* 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.
@@ -65,6 +66,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
@@ -73,7 +75,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:24:22 +0000
+++ b/rules 2009-09-30 01:07:56 +0000
@@ -609,9 +609,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
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2009-09-29 11:21:00 +0000
+++ b/shell-lib.sh 2009-09-29 12:56:48 +0000
@@ -70,7 +70,7 @@
PID=`/usr/bin/pgrep soffice.bin | head -n 1`
fi
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
- exit $RET
+ exit 1
fi
fi
fi
