[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-2-28-g1bbba08
The following commit has been merged in the master branch:
commit 1bbba08b051819cca69146ac640361c18a5fc438
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 11 22:53:31 2012 +0100
change *.so.3 dependencies (shlibs/symbols) to uno-libs3, not ure
diff --git a/changelog b/changelog
index 908930c..d23385c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.4.5~rc2-1) UNRELEASED; urgency=medium
+libreoffice (1:3.4.5-1) unstable; urgency=medium
[ Rene Engelhard ]
* new upstream release
@@ -16,11 +16,15 @@ libreoffice (1:3.4.5~rc2-1) UNRELEASED; urgency=medium
- prevent creating bogus gcc- build-dependency on gcj archs
- fix qstart.desktop Exec= (closes: #655076)
- update fakeroot hack for multiarch paths
-
+ - stop creating a dependency on ure for uno-libs3 in .shlibs, use
+ uno-libs3 instead
+ * debian/uno-libs3.symbols:
+ - use uno-libs3, not ure as dependency
+
* merge from ubuntu-precise-3.5:
- add debian multiarch support for Qt4
- -- Rene Engelhard <rene@debian.org> Tue, 10 Jan 2012 09:06:49 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 11 Jan 2012 12:03:46 +0000
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --git a/rules b/rules
index 719decb..c69de1d 100755
--- a/rules
+++ b/rules
@@ -3326,7 +3326,7 @@ ifeq "$(ENABLE_MONO)" "y"
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 -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 }'))" -- -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`
# ugly hack, but why does that happen? It's not in .symbols...
TMP=`mktemp -q`; \
diff --git a/uno-libs3.lintian-overrides b/uno-libs3.lintian-overrides
deleted file mode 100644
index d71894d..0000000
--- a/uno-libs3.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-uno-libs3: shlibs-declares-dependency-on-other-package
-uno-libs3: symbols-declares-dependency-on-other-package ure #MINVER#
diff --git a/uno-libs3.symbols b/uno-libs3.symbols
index 549b513..df8aff0 100644
--- a/uno-libs3.symbols
+++ b/uno-libs3.symbols
@@ -1,9 +1,9 @@
-libuno_cppu.so.3 ure #MINVER#
+libuno_cppu.so.3 uno-libs3 #MINVER#
*@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 ure #MINVER#
+libuno_cppuhelpergcc3.so.3 uno-libs3 #MINVER#
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
*@UDK_3.2 1.4.0
@@ -12,7 +12,7 @@ libuno_cppuhelpergcc3.so.3 ure #MINVER#
*@UDK_3.5 1.4.0
*@UDK_3.6 1.7.0
*@UDK_3.7 3.4.0
-libuno_sal.so.3 ure #MINVER#
+libuno_sal.so.3 uno-libs3 #MINVER#
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
*@UDK_3.2 1.4.0
@@ -28,8 +28,8 @@ libuno_sal.so.3 ure #MINVER#
osl_clearEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3
osl_setEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3
*@UDK_3.11 1.8.0
-libuno_salhelpergcc3.so.3 ure #MINVER#
+libuno_salhelpergcc3.so.3 uno-libs3 #MINVER#
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
-libuno_purpenvhelpergcc3.so.3 ure #MINVER#
+libuno_purpenvhelpergcc3.so.3 uno-libs3 #MINVER#
*@UDK_3_0_0 1.4.0
--
LibreOffice packaging repository
Reply to: