./packages/openofficeorg/3.2/experimental r1650: merge
------------------------------------------------------------
revno: 1650 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2009-09-14 16:53:26 +0200
message:
merge
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-09-12 19:10:05 +0000
+++ b/changelog 2009-09-14 14:53:26 +0000
@@ -32,16 +32,24 @@
-- Rene Engelhard <rene@debian.org> Sat, 12 Sep 2009 00:14:48 +0200
-openoffice.org (1:3.1.1-2) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-2) unstable; urgency=low
[ Rene Engelhard ]
* ooo-build:
- - update (62b71445f871e042403f2959cf339b9f2d12af9d)
+ - update (1f44d9a5c0c024cba36a904b0b04dd09aca9e205)
* debian/rules:
- - bump libmysqlcppconn-dev builddep for new snapshot of mysqlnative and adapt
- for STLport flavour
+ - bump libmysqlcppconn-dev builddep for new snapshot of mysqlnative and
+ adapt for STLport flavour
- fix parallel=X handling to actually works, thanks to Wouter Verhelst for
pointing it out
+ - add export PYTHONPATH into /usr/lib/openoffice/program/unopkg, too.
+ Thanks Frederic Peters (closes: #545482)
+ * debian/control.in:
+ - s/msttcorefonts/ttf-mscorefonts-installer/. Former is a transitional
+ package even in lenny
+ - conflict against mozilla-plugin-vlc (<< 1.0)
+ - actually add Pre-Depends: for -filter-binfiler, thanks Chris Cheney
+ for the pointer
* debian/control.mysql.in:
- remove conflicts against OOo >= 3.3
* debian/changelog:
@@ -56,9 +64,9 @@
* debian/control.in, debian/control.mediawiki.in,
debian/control.minimizer.in, debian/control.mysql.in,
debian/control.postgresql.in, debian/control.presenter.in:
- - drop the fileds inherited from source package
+ - drop the fields inherited from source package
- -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2009 15:17:00 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 12 Sep 2009 14:13:08 +0200
openoffice.org (1:3.1.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-09-07 20:39:50 +0000
+++ b/control 2009-09-14 14:53:26 +0000
@@ -14,7 +14,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin, ttf-dejavu, ttf-sil-gentium, ttf-sil-gentium-basic, ${ooo-officebean-dep}, openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ttf-liberation | msttcorefonts
+Recommends: ${ooo-binfilter-dep}, ttf-liberation | ttf-mscorefonts-installer
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
@@ -99,7 +99,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
-Conflicts: openoffice.org-thesaurus, 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-core (<< ${binary:Version}), openoffice.org-calc (<< ${binary:Version}), openoffice.org-writer (<< ${binary:Version}), openoffice.org-i
mpress (<< ${binary:Version}), openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<< ${binary:Version}), openoffice.org-gtk (<< ${binary:Version}), openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<< ${binary:Version}), openoffice.org-evolution (<< ${binary:Version}), openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean (<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre
+Conflicts: openoffice.org-thesaurus, 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-core (<< ${binary:Version}), openoffice.org-calc (<< ${binary:Version}), openoffice.org-writer (<< ${binary:Version}), openoffice.org-i
mpress (<< ${binary:Version}), openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<< ${binary:Version}), openoffice.org-gtk (<< ${binary:Version}), openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<< ${binary:Version}), openoffice.org-evolution (<< ${binary:Version}), openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean (<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<< 2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<< 1:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless (<< 1:3.0.0~dev300m26), openoffice.org-filter-binfilter (<< 1:3.1.0-5)
Description: full-featured office productivity suite -- arch-dependent files
@@ -427,6 +427,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
Architecture: i386 powerpc sparc mips mipsel s390 m68k amd64 ia64 ppc64
+Pre-Depends: openoffice.org-core (>= 1:3.1.0-2)
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<< 1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org-core (<< 1:3.1.1~rc1-2), openoffice.org2-filter-so52, openoffice.org-filter-so52
Provides: openoffice.org2-filter-so52, openoffice.org-filter-so52
=== modified file 'control.in'
--- a/control.in 2009-09-07 20:39:50 +0000
+++ b/control.in 2009-09-14 14:53:26 +0000
@@ -74,7 +74,7 @@
${java-common-depends},
${misc:Depends}
Recommends: ${ooo-binfilter-dep},
- ttf-liberation | msttcorefonts
+ ttf-liberation | ttf-mscorefonts-installer
Suggests: hunspell-dictionary,
myspell-dictionary,
openoffice.orgVER-help-${help-l10n-virtual-version},
@@ -233,7 +233,8 @@
cli-uno-bridge (<< 1:3.0.0~dev300m22),
openoffice.org-qa-ui-tests (<< ${base-version}),
openoffice.org-qa-ui-tests (>= ${base-version}.1),
- cacao-oj6-jre
+ cacao-oj6-jre,
+ mozilla-plugin-vlc (<< 1.0)
Provides: openoffice.orgVER-bundled,
openoffice.org2-core,
openoffice.org-java,
@@ -708,6 +709,7 @@
Package: openoffice.orgVER-filter-binfilter
Section: misc
Architecture: %OOO_BINFILTER_ARCHS%
+Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2)
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
=== modified file 'rules'
--- a/rules 2009-09-10 19:15:58 +0000
+++ b/rules 2009-09-14 14:53:26 +0000
@@ -2840,6 +2840,9 @@
$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml
ln -s /$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml \
$(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
+ # set PYTHONPATH in unopkg
+ perl -pi -e 's,export PATH,export PATH\n\nexport PYTHONPATH=\"/$(OOBASISDIR)/program\"\n\n,' \
+ $(PKGDIR)-common/$(OOBRANDDIR)/program/unopkg
# install DicOOo; we need to do this manually; the
# dictionaries/ module isn't built with --without-myspell-dicts
Reply to: