[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-5-106-ga3760ae



The following commit has been merged in the debian-experimental-3.6 branch:
commit a3760ae9f344cbdb269b1d03972b5cd1f4e62105
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jun 26 17:23:21 2012 +0200

    update dh_makeshlibs for new (broken) UREPACKAGEVERSION

diff --git a/rules b/rules
index 15bf2eb..5a94a30 100755
--- a/rules
+++ b/rules
@@ -2813,8 +2813,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 }')~), 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 }')~)" -- -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 }'  cut -d. -f1-3)~), 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 }'  cut -d. -f1-3)~)" -- -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: