------------------------------------------------------------
revno: 1114
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-06-12 23:04:07 +0200
message:
fix upgrade - bump ure .shlibs and Pre-Depend on 3.0's ure
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-06-12 20:14:33 +0000
+++ b/changelog 2008-06-12 21:04:07 +0000
@@ -35,6 +35,9 @@
python-uno anymore so that -writer (and openoffice.org) still can be
installed when python-uno is not installable (like at python-defaults
changes)
+ - make openoffice.org-core Pre-Depend on ure (>= 1.4+OOo3.0.0~)
+ (unfortunately ure didn't update it's version although 3.0.0 needs new
+ symbols) and update dh_makeshlibs to add a corresponding shlibs
* debian/control.ure.in:
- remove unneeded ${shlibs:Depends} for ure-dbg
* debian/openoffice.org-core.shlibs.local, debian/rules:
@@ -58,7 +61,7 @@
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 12 Jun 2008 22:11:22 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 12 Jun 2008 22:49:27 +0200
openoffice.org (1:2.4.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-06-12 20:14:33 +0000
+++ b/control 2008-06-12 21:04:07 +0000
@@ -103,6 +103,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Pre-Depends: ure (>= 1.4+OOo3.0.0~)
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114,
openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome,
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
=== modified file 'control.in'
--- a/control.in 2008-06-12 20:14:33 +0000
+++ b/control.in 2008-06-12 21:04:07 +0000
@@ -181,6 +181,7 @@
Package: openoffice.orgVER-core
Architecture: %OOO_ARCHS%
+Pre-Depends: ure (>= 1.4+OOo3.0.0~)
Depends: openoffice.orgVER-common (>> ${base-version}),
ttf-opensymbol,
${shlibs:Depends},
=== modified file 'rules'
--- a/rules 2008-06-12 20:14:33 +0000
+++ b/rules 2008-06-12 21:04:07 +0000
@@ -2858,7 +2858,7 @@
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -pure -n -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }'))"
+ dh_makeshlibs -pure -n -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_installdeb -s
ifneq "$(USE_SYSTEM_XMLSEC)" "y"
cat debian/shlibs.override.xmlsec >> debian/shlibs.local
