[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.1-1-12-gb9cafb9
The following commit has been merged in the debian-experimental-3.5 branch:
commit b9cafb9d74074c7bce689404e40899b2394d9968
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 27 18:24:48 2012 +0200
actually a ure dependency is already set when you link to ure by .shlibs
diff --git a/changelog b/changelog
index 1c0d0a1..60eccb4 100644
--- a/changelog
+++ b/changelog
@@ -8,7 +8,7 @@ libreoffice (1:3.5.1-2) UNRELEASED; urgency=low
* debian/rules:
- make make check failure abort again
* debian/rules, debian/uno-libs3.symbols:
- - add ure dependency, too
+ - add ure dependency for stuff linked to uno-libs3, too
-- Rene Engelhard <rene@debian.org> Tue, 27 Mar 2012 18:04:15 +0200
diff --git a/rules b/rules
index ad7d2b8..97fc83a 100755
--- a/rules
+++ b/rules
@@ -2770,7 +2770,7 @@ endif
dh_icons -s
dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')~), ure" -- -c0 -v`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 }')~), ure" -- -v`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`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 && \
--
LibreOffice packaging repository
Reply to: