------------------------------------------------------------
revno: 2065
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Mon 2010-08-16 18:16:48 +0200
message:
merge shlibs fix from Loic Minier, thanks
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-07-29 07:51:23 +0000
+++ b/changelog 2010-08-16 16:16:48 +0000
@@ -1,3 +1,14 @@
+openoffice.org (1:3.2.1-6) UNRELEASED; urgency=low
+
+ * merge from Ubuntu (thanks Loic Minier):
+ - Pass the same -v to "dh_makeshlibs --" (for dpkg-gensymbols) as to
+ "dh_gencontrol --" (for dpkg-gencontrol); some symbols are missing from
+ the symbols files and hence ure symbols have bogus dep on ure >=
+ source-version which can't be satisfied as ure uses another versioning
+ scheme
+
+ -- Rene Engelhard <[email protected]> Mon, 16 Aug 2010 18:14:09 +0200
+
openoffice.org (1:3.2.1-5) unstable; urgency=medium
* debian/patches/odk-configure-honour-ure-link.diff: fix the (unneeded)
=== modified file 'rules'
--- a/rules 2010-07-29 07:51:08 +0000
+++ b/rules 2010-08-16 16:16:48 +0000
@@ -3579,8 +3579,8 @@
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-c0
- dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
+ dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-c0 -v$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-v$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
# ugly hack, but why does that happen? It's not in .symbols...
TMP=`mktemp -q`; \
grep -v PRIVATE debian/uno-libs3/DEBIAN/symbols > $$TMP && \
