./packages/openofficeorg/3.0.1/experimental r1383: + - use UREPACKAGEVERSION for determining ures version, more correct and
------------------------------------------------------------
revno: 1383
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-20 16:42:39 +0100
message:
+ - use UREPACKAGEVERSION for determining ures version, more correct and
+ also includes the minor. Remove +OOo3.0.0~ suffix as ure now is at 1.4.1
+ and we bump .shlibs anyway
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-20 09:51:04 +0000
+++ b/changelog 2009-01-20 15:42:39 +0000
@@ -4,6 +4,9 @@
- update (r15097)
* debian/rules:
- update xulrunner build-dep in MOZILLA=libxul case for current reality
+ - use UREPACKAGEVERSION for determining ures version, more correct and
+ also includes the micro. Remove +OOo3.0.0~ suffix as ure now is at 1.4.1
+ and we bump .shlibs anyway
* debian/control.in:
- make -common conflict against dictionaries-common (<< 0.98.14)
- move from Breaks: to Conflicts: as otherwise the experimental buildds
@@ -11,7 +14,7 @@
* merge from Ubuntu:
- make ure only Suggest a JRE
- -- Rene Engelhard <rene@debian.org> Tue, 20 Jan 2009 09:49:31 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Jan 2009 14:05:04 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-20 09:51:04 +0000
+++ b/rules 2009-01-20 15:42:39 +0000
@@ -3070,8 +3070,8 @@
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo3.0.0~)"
- dh_makeshlibs -n -pure -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo3.0.0~)"
+ dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
+ dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
dh_installdeb -s
ifneq "$(USE_SYSTEM_XMLSEC)" "y"
cat debian/shlibs.override.xmlsec >> debian/shlibs.local
@@ -3188,8 +3188,8 @@
dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
- -V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
- -v$(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+ -V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
+ -v$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
dh_md5sums -s
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
Reply to: