------------------------------------------------------------
revno: 1357
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2008-12-22 03:06:12 +0100
message:
use UREPACKAGEVERSION for determining UREs version
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-12-21 21:32:44 +0000
+++ b/changelog 2008-12-22 02:06:12 +0000
@@ -4,7 +4,7 @@
- build without -march=armv5te for arm (closes: #501957)
- lbnames.h supports gcc 4.4 (closes: #505669)
* ooo-build:
- - back on trunk (r14768)
+ - back on trunk (r14909)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
* debian/rules, debian/openoffice.org-qa-tools.{preinst,postrm}.in,
@@ -17,10 +17,12 @@
- remove option for internal writer2latex as it's now a (bundled) extension
upstream too and we have it packaged already.
Hardcode --without-writer2latex
+ - use UREPACKAGEVERSION for determining UREs version (keep .shlibs at
+ old one to not bump shlibs unnecessarily)
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
- -- Rene Engelhard <r...@debian.org> Sun, 07 Dec 2008 19:40:24 +0100
+ -- Rene Engelhard <r...@debian.org> Mon, 22 Dec 2008 03:03:41 +0100
openoffice.org (1:3.0.1~rc1-0.1pre) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-12-19 18:22:24 +0000
+++ b/rules 2008-12-22 02:06:12 +0000
@@ -3019,8 +3019,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
}')+OOo3.0.0~)"
+ dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+OOo3.0.0~)"
dh_installdeb -s
ifeq "$(USE_SYSTEM_ICU)" "n"
cat debian/shlibs.override.icu >> debian/shlibs.local
@@ -3128,8 +3128,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)
