The following commit has been merged in the debian-experimental-3.5 branch:
commit 05469c2c02c757b8a543115f93ee245dc5098b87
Author: Rene Engelhard <r...@debian.org>
Date: Tue Mar 27 18:04:52 2012 +0200
add ure dependency to uno-libs3/ure, too
diff --git a/changelog b/changelog
index 0f35b53..1c0d0a1 100644
--- a/changelog
+++ b/changelog
@@ -7,8 +7,10 @@ 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
- -- Rene Engelhard <r...@debian.org> Sun, 25 Mar 2012 14:17:20 +0000
+ -- Rene Engelhard <r...@debian.org> Tue, 27 Mar 2012 18:04:15 +0200
libreoffice (1:3.5.1-1) experimental; urgency=low
diff --git a/rules b/rules
index ca9ff81..ad7d2b8 100755
--- a/rules
+++ b/rules
@@ -2769,8 +2769,8 @@ else
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 }')~)" -- -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 }')~)"
-- -v`echo $(BINARY_VERSION) | cut -d: -f2`
+ 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`
# ugly hack, but why does that happen? It's not in .symbols...
TMP=`mktemp -q`; \
grep -v PRIVATE debian/uno-libs3/DEBIAN/symbols > $$TMP && \
diff --git a/uno-libs3.symbols b/uno-libs3.symbols
index 897270e..0ecfd4a 100644
--- a/uno-libs3.symbols
+++ b/uno-libs3.symbols
@@ -1,9 +1,9 @@
-libuno_cppu.so.3 uno-libs3 #MINVER#
+libuno_cppu.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
*@UDK_3.2 1.4.0
*@UDK_3.3 1.4.0
-libuno_cppuhelpergcc3.so.3 uno-libs3 #MINVER#
+libuno_cppuhelpergcc3.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
*@UDK_3.2 1.4.0
@@ -13,7 +13,7 @@ libuno_cppuhelpergcc3.so.3 uno-libs3 #MINVER#
*@UDK_3.6 1.7.0
*@UDK_3.7 3.4.0
*@UDK_3.8 3.5.0~beta
-libuno_sal.so.3 uno-libs3 #MINVER#
+libuno_sal.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
*@UDK_3.2 1.4.0
@@ -30,8 +30,8 @@ libuno_sal.so.3 uno-libs3 #MINVER#
osl_setEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3
*@UDK_3.11 1.8.0
*@LIBO_UDK_3.5 3.5.0~beta
-libuno_salhelpergcc3.so.3 uno-libs3 #MINVER#
+libuno_salhelpergcc3.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
-libuno_purpenvhelpergcc3.so.3 uno-libs3 #MINVER#
+libuno_purpenvhelpergcc3.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1scyu9-00060i...@vasks.debian.org
