[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. 4e2fa7a62b65ed8f59d8ad71ecb28de28e275df8
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 4e2fa7a62b65ed8f59d8ad71ecb28de28e275df8
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 4 15:20:56 2011 +0200
fix ure/uno-libs3 version
diff --git a/rules b/rules
index 1a7a486..792a322 100755
--- a/rules
+++ b/rules
@@ -3162,8 +3162,8 @@ 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$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`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 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ 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 -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 && \
@@ -3221,7 +3221,7 @@ endif
-Nlibreoffice$(VER)-pdfimport \
-Nlibreoffice$(VER)-sdbc-postgresql \
-Nlibreoffice$(VER)-mysql-connector -- \
- -V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
+ -V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
@@ -3269,8 +3269,8 @@ ifeq "$(PACKAGE_BASE)" "y"
endif
endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
- -V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
- -v$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -V"ure:Version=`echo $(BINARY_VERSION) | cut -d: -f2`" \
+ -v"`echo $(BINARY_VERSION) | cut -d: -f2`"
dh_md5sums -s -X$(shell echo $(OOBASISDIR) | sed -e s/usr/var/)/program/services.rdb
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
--
LibreOffice packaging repository
Reply to: