./packages/openofficeorg/3.3.0/experimental r2070: merge prepared updates for upto m2
------------------------------------------------------------
revno: 2070 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2010-07-31 16:34:22 -0400
message:
merge prepared updates for upto m2
removed:
icons/
icons/sysui/
icons/sysui/desktop/
icons/sysui/desktop/icons/
icons/sysui/desktop/icons/hicolor/
icons/sysui/desktop/icons/hicolor/128x128/
icons/sysui/desktop/icons/hicolor/128x128/apps/
icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
icons/sysui/desktop/icons/hicolor/16x16/
icons/sysui/desktop/icons/hicolor/16x16/apps/
icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
icons/sysui/desktop/icons/hicolor/32x32/
icons/sysui/desktop/icons/hicolor/32x32/apps/
icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
icons/sysui/desktop/icons/hicolor/48x48/
icons/sysui/desktop/icons/hicolor/48x48/apps/
icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
openoffice.org-kab.postinst.in
openoffice.org-kab.prerm.in
openoffice.org-mysql-connector.postinst.in
openoffice.org-mysql-connector.prerm.in
openoffice.org-pdfimport.postinst.in
openoffice.org-pdfimport.prerm.in
openoffice.org-presentation-minimizer.postinst.in
openoffice.org-presentation-minimizer.prerm.in
openoffice.org-presenter-console.postinst.in
openoffice.org-presenter-console.prerm.in
openoffice.org-report-builder.postinst.in
openoffice.org-report-builder.prerm.in
openoffice.org-sdbc-postgresql.postinst.in
openoffice.org-sdbc-postgresql.prerm.in
openoffice.org-wiki-publisher.postinst.in
openoffice.org-wiki-publisher.prerm.in
patches/fix-smoketest-without-java.diff
modified:
changelog
control
control.in
control.kde.in
control.mediawiki.in
control.minimizer.in
control.mysql.in
control.pdfimport.in
control.postgresql.in
control.presenter.in
control.reportdesign.in
patches/installer-globals-max-1-regcomp.diff
patches/series
rules
smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
=== modified file 'changelog'
--- a/changelog 2010-07-20 13:24:42 +0000
+++ b/changelog 2010-07-31 20:34:22 +0000
@@ -1,25 +1,35 @@
-openoffice.org (1:3.3.0~beta~dev300m83-1) UNRELEASED; urgency=low
+openoffice.org (1:3.3.0~beta~ooo330m2-1) UNRELEASED; urgency=low
- * OpenOffice.org 3.3.0 milestone m83
+ * OpenOffice.org 3.3.0 release branch milestone 2
- fixes hebrew text in sheet tabs when using system fonts
(closes: #433231)
+ * ooo-build:
+ - back to master/git for now: 554181ce1ae40666b629fc472f7e4532bad3999e
+
* debian/rules:
- add and rework target(s) for new external sources handling upstream
- temporarily disable mono
- updates for 3.3 and its various configuration changes
- move oo-*ldap.xcd.sample to /usr/share/openoffice.org-common/examples
+ - unpack extensions to /usr/lib/openoffice/share/extensions instead of
+ shipping the oxt
* debian/control.in, debian/rules: adapt for "Test Cleanup". Build-depend
on libcppunit-dev [!i386] and junit4. Remove xvfb.
* debian/*.{pre,post},{inst,rm}.in, debian/shell-lib-{components,extensions}:
cleanup. remove unused THIS_SCRIPT. Use dpkgs DPKG_MAINTSCRIPT_PACKAGE
instead of THIS_SCRIPT
- * debian/rules, debian/shell-lib-extensions.sh, debian/*.postinst.in:
- unpack extensions to /usr/lib/openoffice/share/extensions and use
- unopkg --link
+ * debian/shell-lib-extensions.sh: add add_extension_link()
+ * debian/*.postinst.in, debian/*.prerm.in: Remove unopkg calls for
+ extensions in prerm and postinst, as we don't need them anymore
+ * debian/control*in: remove Pre-Depends: on openoffice.orgVER-common
* debian/*.preinst.in: when upgrading from a m84 or newer, don't run unopkg
remove anymore
- * debian/uno-libs3.symbols: update
+ * debian/control.in:
+ - move binfilter to suggests (and remove from openoffice.orgs
+ Description), it is not in the default install anymore
+ * debian/uno-libs3.symbols: update
+ * debian/icons: remove again
* debian/broffice.org*: update diversions
* debian/Recovery.xcu: remove, we now need to to this in main.xcd
* debian/control.in:
@@ -28,7 +38,28 @@
so that we don't "loose" icons because of not-matching basis. Thanks
Michael Tokarev for pointing this out.
- -- Rene Engelhard <rene@debian.org> Tue, 13 Jul 2010 21:38:32 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 31 Jul 2010 16:29:40 -0400
+
+openoffice.org (1:3.2.1-5) unstable; urgency=medium
+
+ * debian/patches/odk-configure-honour-ure-link.diff: fix the (unneeded)
+ configure.pl of the SDK to honour ure-link (closes: #588495)
+ * debian/patches/fix-i113084.diff; fix easy to trigger crash in macro
+ recorder (from upstream)
+ * debian/patches/fix-i113461.diff: do not freeze after erasing non-breaking
+ space inserted by French AutoCorrection (from upstream)
+
+ * debian/rules:
+ - for safety, add a build-conflicts against libhsqldb-java (>> 1.8.1~)
+ - move startcenter.png install to the rest of hicolor icons install;
+ don't install ooo-build desktop icons when using sysui desktops
+ - move LDAP.xcu.sample to /usr/share/openoffice.org-common/examples
+ * debian/control.in:
+ - make new -common Breaks: older openoffice.org-core (closes: #587750)
+ * debian/control.kde.in:
+ - remove obsolete Pre-Depends:
+
+ -- Rene Engelhard <rene@debian.org> Wed, 28 Jul 2010 22:26:58 +0200
openoffice.org (1:3.2.1-4) unstable; urgency=medium
=== modified file 'control'
--- a/control 2010-07-14 20:43:41 +0000
+++ b/control 2010-07-31 20:34:22 +0000
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , xvfb, xfonts-base, xauth , libcppunit-dev (>= 1.12.1) [!i386] , tcsh , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 p
pc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68
k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12.1) [!i386] , tcsh , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libseria
lizer-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5)
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
XS-Python-Version: current
Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.2.1/unstable
@@ -14,8 +14,8 @@
Package: openoffice.org
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base [!armel], openoffice.org-report-builder-bin [!armel], ttf-dejavu, ttf-sil-gentium-basic, ${ooo-officebean-dep}, openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
-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, imagemagick | graphicsmagick-imagemagick-compat, libpaper-utils, ${gstreamer-plugins-suggests}, ${libldap-suggests}
+Recommends: 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, imagemagick | graphicsmagick-imagemagick-compat, libpaper-utils, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep},
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -241,7 +241,7 @@
Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4~)
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, openoffice.org-gcj, openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1), openoffice.org-calc (<< 1:3.2.0~rc1)
-Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4), libhsqldb-java (>= 1.8.1~), openoffice.org-report-builder (<< 1.2.0~), openoffice.org-report-builder-bin (<< 1:3.2.0~)
+Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4), openoffice.org-report-builder (<< 1.2.0~), openoffice.org-report-builder-bin (<< 1:3.2.0~)
Provides: openoffice.org2-base
Description: office productivity suite -- database
OpenOffice.org is a full-featured office productivity suite that provides
@@ -642,7 +642,7 @@
Package: openoffice.org-wiki-publisher
Section: misc
Architecture: all
-Pre-Depends: openoffice.org-java-common (>= 1:3.0.0~), ${java-runtime-depends}
+Pre-Depends: ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, openoffice.org-core (>= 1:3.0.0~), ${misc:Depends}
Enhances: openoffice.org-writer
Recommends: ${lucene-depends}
@@ -659,7 +659,7 @@
Package: openoffice.org-report-builder
Section: misc
Architecture: all
-Pre-Depends: openoffice.org-common, ${java-runtime-depends}
+Pre-Depends: ${java-runtime-depends}
Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>= 1:3.2.0~), openoffice.org-core (>= 1:3.2.0~rc5), openoffice.org-java-common (>= 1:3.2.0~), ${misc:Depends}
Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1), ure (<< 1.5.1+OOo3.1.1-15)
Replaces: openoffice.org-reportdesigner
@@ -691,7 +691,6 @@
Package: openoffice.org-presentation-minimizer
Section: misc
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
-Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3), openoffice.org-impress, ${misc:Depends}
Enhances: openoffice.org-impress
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -714,7 +713,6 @@
Conflicts: openoffice.org-presenter-screen, ure (<< 1.5.1+OOo3.1.1-15)
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
-Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.2.0~), openoffice.org-impress (>= 1:3.2.0~), ${misc:Depends}
Enhances: openoffice.org-impress
Description: OpenOffice.org Impress extension for a separate presenter's console
@@ -739,7 +737,6 @@
Section: misc
Priority: extra
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
-Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6), ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Description: OpenOffice.org extension for importing PDF documents
@@ -836,7 +833,6 @@
Package: openoffice.org-kab
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
-Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: kaddressbook
Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
@@ -851,7 +847,6 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
-Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), ${misc:Depends}
Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212), openoffice.org-gcj (<< 2.3.0~src680m212), ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql
@@ -866,7 +861,6 @@
Package: openoffice.org-mysql-connector
Section: misc
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
-Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.2~), ${misc:Depends}
Suggests: mysql-server (>= 5.1)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
=== modified file 'control.in'
--- a/control.in 2010-07-14 20:43:41 +0000
+++ b/control.in 2010-07-31 20:34:22 +0000
@@ -70,8 +70,7 @@
${lucene-depends},
${java-common-depends},
${misc:Depends}
-Recommends: ${ooo-binfilter-dep},
- ttf-liberation | ttf-mscorefonts-installer
+Recommends: ttf-liberation | ttf-mscorefonts-installer
Suggests: hunspell-dictionary,
myspell-dictionary,
openoffice.orgVER-help-${help-l10n-virtual-version},
@@ -92,7 +91,8 @@
imagemagick | graphicsmagick-imagemagick-compat,
libpaper-utils,
${gstreamer-plugins-suggests},
- ${libldap-suggests}
+ ${libldap-suggests},
+ ${ooo-binfilter-dep},
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.orgVER-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -501,7 +501,6 @@
Conflicts: openoffice.org-debian-files,
openoffice.org2-base (<< ${binary:Version}),
openoffice.org-common (= 2.0.4-4),
- libhsqldb-java (>= 1.8.1~),
openoffice.org-report-builder (<< 1.2.0~),
openoffice.org-report-builder-bin (<< 1:3.2.0~)
Provides: openoffice.org2-base
=== modified file 'control.kde.in'
--- a/control.kde.in 2010-06-12 22:10:26 +0000
+++ b/control.kde.in 2010-07-29 09:18:04 +0000
@@ -25,7 +25,6 @@
Package: openoffice.orgVER-kab
Architecture: %OOO_BASE_ARCHS%
-Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
=== modified file 'control.mediawiki.in'
--- a/control.mediawiki.in 2010-05-20 11:34:57 +0000
+++ b/control.mediawiki.in 2010-07-27 15:39:29 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-wiki-publisher
Section: misc
Architecture: all
-Pre-Depends: openoffice.orgVER-java-common (>= 1:3.0.0~), ${java-runtime-depends}
+Pre-Depends: ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:3.0.0~),
${misc:Depends}
Enhances: openoffice.orgVER-writer
=== modified file 'control.minimizer.in'
--- a/control.minimizer.in 2010-05-20 11:34:57 +0000
+++ b/control.minimizer.in 2010-07-27 15:39:29 +0000
@@ -1,7 +1,6 @@
Package: openoffice.orgVER-presentation-minimizer
Section: misc
Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
-Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 2.3), openoffice.orgVER-impress,
${misc:Depends}
Enhances: openoffice.orgVER-impress
=== modified file 'control.mysql.in'
--- a/control.mysql.in 2010-06-12 22:10:26 +0000
+++ b/control.mysql.in 2010-07-27 15:39:29 +0000
@@ -1,7 +1,6 @@
Package: openoffice.orgVER-mysql-connector
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.2~),
${misc:Depends}
Suggests: mysql-server (>= 5.1)
=== modified file 'control.pdfimport.in'
--- a/control.pdfimport.in 2010-05-20 11:34:57 +0000
+++ b/control.pdfimport.in 2010-07-27 15:39:29 +0000
@@ -2,7 +2,6 @@
Section: misc
Priority: extra
Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
-Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~bea300~dev300m6),
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2010-06-12 22:10:26 +0000
+++ b/control.postgresql.in 2010-07-27 15:39:29 +0000
@@ -1,7 +1,6 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212), openoffice.orgVER-gcj (<< 2.3.0~src680m212), ure (<< 1.5.1+OOo3.1.1-15)
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2010-05-20 11:34:57 +0000
+++ b/control.presenter.in 2010-07-27 15:39:29 +0000
@@ -4,7 +4,6 @@
Conflicts: openoffice.orgVER-presenter-screen, ure (<< 1.5.1+OOo3.1.1-15)
Provides: openoffice.orgVER-presenter-screen
Replaces: openoffice.orgVER-presenter-screen
-Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.2.0~), openoffice.orgVER-impress (>= 1:3.2.0~),
${misc:Depends}
Enhances: openoffice.orgVER-impress
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2010-06-12 22:07:58 +0000
+++ b/control.reportdesign.in 2010-07-27 15:39:29 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Pre-Depends: openoffice.org-common, ${java-runtime-depends}
+Pre-Depends: ${java-runtime-depends}
Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= 1:3.2.0~), openoffice.org-core (>= 1:3.2.0~rc5), openoffice.org-java-common (>= 1:3.2.0~),
${misc:Depends}
Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1), ure (<< 1.5.1+OOo3.1.1-15)
=== removed directory 'icons'
=== removed directory 'icons/sysui'
=== removed directory 'icons/sysui/desktop'
=== removed directory 'icons/sysui/desktop/icons'
=== removed directory 'icons/sysui/desktop/icons/hicolor'
=== removed directory 'icons/sysui/desktop/icons/hicolor/128x128'
=== removed directory 'icons/sysui/desktop/icons/hicolor/128x128/apps'
=== removed file 'icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png 2010-06-29 04:42:04 +0000 and b/icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'icons/sysui/desktop/icons/hicolor/16x16'
=== removed directory 'icons/sysui/desktop/icons/hicolor/16x16/apps'
=== removed file 'icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png 2010-06-29 04:42:04 +0000 and b/icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'icons/sysui/desktop/icons/hicolor/32x32'
=== removed directory 'icons/sysui/desktop/icons/hicolor/32x32/apps'
=== removed file 'icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png 2010-06-29 04:42:04 +0000 and b/icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'icons/sysui/desktop/icons/hicolor/48x48'
=== removed directory 'icons/sysui/desktop/icons/hicolor/48x48/apps'
=== removed file 'icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png 2010-06-29 04:42:04 +0000 and b/icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'openoffice.org-kab.postinst.in'
--- a/openoffice.org-kab.postinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-kab.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- register_to_services_rdb /@OOBASISDIR@/program/libkab1.so
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-kab.prerm.in'
--- a/openoffice.org-kab.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-kab.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- revoke_from_services_rdb /@OOBASISDIR@/program/libkab1.so
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-mysql-connector.postinst.in'
--- a/openoffice.org-mysql-connector.postinst.in 2010-07-20 13:24:42 +0000
+++ b/openoffice.org-mysql-connector.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extensions/mysql-connector-ooo.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-mysql-connector.prerm.in'
--- a/openoffice.org-mysql-connector.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-mysql-connector.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension com.sun.star.mysql-connector-ooo-$PLATFORMID
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-pdfimport.postinst.in'
--- a/openoffice.org-pdfimport.postinst.in 2010-07-20 13:24:42 +0000
+++ b/openoffice.org-pdfimport.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extensions/pdfimport.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-pdfimport.prerm.in'
--- a/openoffice.org-pdfimport.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-pdfimport.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension com.sun.star.PDFImport-$PLATFORMID
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-presentation-minimizer.postinst.in'
--- a/openoffice.org-presentation-minimizer.postinst.in 2010-07-20 13:24:42 +0000
+++ b/openoffice.org-presentation-minimizer.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extensions/presentation-minimizer.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-presentation-minimizer.prerm.in'
--- a/openoffice.org-presentation-minimizer.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-presentation-minimizer.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension com.sun.star.PresentationMinimizer-$PLATFORMID
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-presenter-console.postinst.in'
--- a/openoffice.org-presenter-console.postinst.in 2010-07-20 13:24:42 +0000
+++ b/openoffice.org-presenter-console.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extensions/presenter-screen.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-presenter-console.prerm.in'
--- a/openoffice.org-presenter-console.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-presenter-console.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension com.sun.PresenterScreen-$PLATFORMID
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-report-builder.postinst.in'
--- a/openoffice.org-report-builder.postinst.in 2010-07-20 13:24:42 +0000
+++ b/openoffice.org-report-builder.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extensions/report-builder.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-report-builder.prerm.in'
--- a/openoffice.org-report-builder.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-report-builder.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension com.sun.reportdesigner
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-sdbc-postgresql.postinst.in'
--- a/openoffice.org-sdbc-postgresql.postinst.in 2010-07-20 13:24:42 +0000
+++ b/openoffice.org-sdbc-postgresql.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extensions/postgresql-sdbc*zip
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-sdbc-postgresql.prerm.in'
--- a/openoffice.org-sdbc-postgresql.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-sdbc-postgresql.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- # this is a legacy package, so we need to find it first...
- id=`/usr/lib/openoffice/program/unopkg list --shared | grep Identifier:.*postgresql-sdbc | cut -d":" -f2`
- remove_extension $id
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-wiki-publisher.postinst.in'
--- a/openoffice.org-wiki-publisher.postinst.in 2010-07-20 13:24:42 +0000
+++ b/openoffice.org-wiki-publisher.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extensions/wiki-publisher.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-wiki-publisher.prerm.in'
--- a/openoffice.org-wiki-publisher.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-wiki-publisher.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension com.sun.wiki-publisher
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'patches/fix-smoketest-without-java.diff'
--- a/patches/fix-smoketest-without-java.diff 2010-06-21 23:25:09 +0000
+++ b/patches/fix-smoketest-without-java.diff 1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
---- /dev/null 2010-06-21 14:50:44.132270648 +0200
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/fix-smoketest-without-java.diff 2010-06-22 01:14:00.000000000 +0200
-@@ -0,0 +1,65 @@
-+diff -urN smoketestoo_native.old//com/sun/star/comp/smoketest/makefile.mk smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk
-+--- smoketestoo_native.old//com/sun/star/comp/smoketest/makefile.mk 2010-05-26 18:30:01.000000000 +0000
-++++ smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk 2010-06-21 22:44:12.000000000 +0000
-+@@ -34,6 +34,8 @@
-+
-+ # --- Settings -----------------------------------------------------
-+
-++.IF "$(SOLAR_JAVA)" != ""
-++
-+ .INCLUDE : settings.mk
-+
-+ JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
-+@@ -77,3 +79,8 @@
-+
-+ $(MISC)$/$(TARGET)$/$(JARTARGET) : $(JARTARGETN)
-+ $(COPY) $< $@
-++
-++.ELSE
-++@all:
-++ @echo "Java disabled. Nothing to do."
-++.ENDIF
-+diff -urN smoketestoo_native.old//smoketest.pl smoketestoo_native/smoketest.pl
-+--- smoketestoo_native.old//smoketest.pl 2010-06-20 21:50:03.000000000 +0000
-++++ smoketestoo_native/smoketest.pl 2010-06-21 22:51:37.000000000 +0000
-+@@ -502,12 +502,13 @@
-+ print_error ($error_messages[$error_patchBootstrap], $error_patchBootstrap);
-+ }
-+
-+- # copy extension (error 6)
-+-
-+- createPath ($LOGPATH, $error_copyExtension);
-+- $Command = "$COPY_FILE \"$ExtensionDir" . "TestExtension.oxt\" " . "\"$LOGPATH$PathSeparator\"";
-+- execute_Command ($Command, $error_copyExtension, $show_Message, $command_withoutOutput);
-++ if ( "$ENV{SOLAR_JAVA}" eq "TRUE" ) {
-++ # copy extension (error 6)
-+
-++ createPath ($LOGPATH, $error_copyExtension);
-++ $Command = "$COPY_FILE \"$ExtensionDir" . "TestExtension.oxt\" " . "\"$LOGPATH$PathSeparator\"";
-++ execute_Command ($Command, $error_copyExtension, $show_Message, $command_withoutOutput);
-++ }
-+
-+ # start office (error 4)
-+
-+diff --git a/smoketestoo_native/data/scripts/Global.xba b/smoketestoo_native/data/scripts/Global.xba
-+--- smoketestoo_native/data/scripts/Global.xba
-++++ smoketestoo_native/data/scripts/Global.xba
-+@@ -546,9 +546,15 @@
-+ bMakeHTMLTest = true
-+ bMakeMathTest = true
-+ bMakeChartTest = true
-+- bMakeJavaTest = true
-+- bMakeDBTest = true
-+- bMakeExtensionTest = true
-++ if Environ("SOLAR_JAVA") = "" then
-++ bMakeJavaTest = false
-++ bMakeDBTest = false
-++ bMakeExtensionTest = false
-++ else
-++ bMakeJavaTest = true
-++ bMakeDBTest = true
-++ bMakeExtensionTest = true
-++ End If
-+ bMakeSaveOpenXMLTest = true
-+ REM Disable StarOffice 5.0 tests in case binfilter has not been included
-+ if Environ("WITH_BINFILTER") = "NO" then
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 3a732ae..f4ceb02 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
-@@ -506,6 +506,9 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
- # FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog.
- #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
-
-+# don't run stuff needing Java in smoketest when built without Java
-+fix-smoketest-without-java.diff, i#112212, rengelha
-+
- [ LinuxOnly ]
- # fix that allows OOo to work with a standard (unpatched) libjpeg,
- jpegc.c.diff, i#80674, n#272574, flr
=== modified file 'patches/installer-globals-max-1-regcomp.diff'
--- a/patches/installer-globals-max-1-regcomp.diff 2010-07-05 10:44:33 +0000
+++ b/patches/installer-globals-max-1-regcomp.diff 2010-07-31 20:25:23 +0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++ openoffice.org-3.2.1/ooo-build-0e5cd4ee71f4892e8044cdb49572647099a81faf/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
++++ openoffice.org-3.3.0/ooo-build-554181ce1ae40666b629fc472f7e4532bad3999e/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
@@ -0,0 +1,14 @@
+diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
+--- solenv/bin/modules/installer/globals.pm
@@ -17,8 +17,8 @@
+ $fix_number_of_cab_files = 1;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a732ae..5f1c32a 100644
---- openoffice.org-3.2.1/ooo-build-0e5cd4ee71f4892e8044cdb49572647099a81faf/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-0e5cd4ee71f4892e8044cdb49572647099a81faf/patches/dev300/apply
+--- openoffice.org-3.3.0/ooo-build-554181ce1ae40666b629fc472f7e4532bad3999e/patches/dev300/apply
++++ openoffice.org-3.3.0/ooo-build-554181ce1ae40666b629fc472f7e4532bad3999e/patches/dev300/apply
@@ -307,6 +307,10 @@ gcc-HelpLinker.diff
# configmgr paths are not yet existing then
speed-sal-fewer-lstats.diff, i#89730, jholesov
=== modified file 'patches/series'
--- a/patches/series 2010-06-29 19:25:13 +0000
+++ b/patches/series 2010-07-29 09:20:58 +0000
@@ -1,2 +1,1 @@
-#fix-smoketest-without-java.diff
installer-globals-max-1-regcomp.diff
=== modified file 'rules'
--- a/rules 2010-07-20 13:24:42 +0000
+++ b/rules 2010-07-31 20:34:22 +0000
@@ -67,13 +67,13 @@
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
unexport LS_COLORS
-MWS=DEV300
+MWS=OOO330
MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
#MILESTONE=m18
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-3
-OOO_BUILD_VERSION=0e5cd4ee71f4892e8044cdb49572647099a81faf
+OOO_BUILD_VERSION=554181ce1ae40666b629fc472f7e4532bad3999e
OOO_BUILD_TAG=
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
@@ -102,6 +102,10 @@
BUILD_PYUNO=y
USE_PYCENTRAL=y
USE_PYSUPPORT=n
+# THIS IS ONLY FOR TESTING. When building against a specified pythonX.Y
+# this will work inside OOo but *not* from outside OOo unless the user
+# uses pythonX.Y directly (and the dh_pycentral-created dependencies allow
+# also the non-working default python then) - see e.g. #587402
PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
PYTHON=python
@@ -117,18 +121,20 @@
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=y
ENABLE_JAVA=y
-JDK=openjdk
-ifeq "$(ARCH)" "ia64"
- JDK=gcj-jdk
-endif
-ifneq (,$(findstring mips,$(ARCH)))
- JDK=gcj-jdk
-endif
-ifneq (,$(findstring kfreebsd,$(ARCH)))
- JDK=gcj-jdk
-endif
-ifeq "$(ARCH)" "hppa"
- JDK=gcj-jdk
+ifeq "$(ENABLE_JAVA)" "y"
+ JDK=openjdk
+ ifeq "$(ARCH)" "ia64"
+ JDK=gcj-jdk
+ endif
+ ifneq (,$(findstring mips,$(ARCH)))
+ JDK=gcj-jdk
+ endif
+ ifneq (,$(findstring kfreebsd,$(ARCH)))
+ JDK=gcj-jdk
+ endif
+ ifeq "$(ARCH)" "hppa"
+ JDK=gcj-jdk
+ endif
endif
ENABLE_MONO=n
MONO2=y
@@ -194,6 +200,7 @@
USE_SYSTEM_BSH=y
USE_SYSTEM_HSQLDB=y
HSQLDB_MINVER= (>> 1.8.0.10)
+HSQLDB_TOONEWVER=1.8.1
# disabled because system-saxon breaks all kinds exports using XSLT transforms
# (e.g. M$ Word/Excel 2003 XML, Mediawiki, XHTML, UOF, ...)
# It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
@@ -791,7 +798,6 @@
ifeq "$(RUN_SMOKETEST)" "y"
BUILD_DEPS += , epm
- BUILD_DEPS += , xvfb, xfonts-base, xauth
endif
ifeq "$(USE_SYSTEM_CPPUNIT)" "y"
CONFIGURE_FLAGS += --with-system-cppunit
@@ -1232,7 +1238,7 @@
endif
ifeq "$(USE_SYSTEM_HSQLDB)" "y"
BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER) [$(OOO_JAVA_ARCHS)]
- BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER)
+ BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
CONFIGURE_FLAGS+= --with-system-hsqldb
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
endif
@@ -1851,6 +1857,10 @@
perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 5)/" debian/control
endif
+ifeq "$(USE_SYSTEM_HSQLDB)" "y"
+ perl -pi -e "s/(Build-Conflicts: .*)/\1, libhsqldb-java (>= $(HSQLDB_TOONEWVER)~)/" debian/control
+endif
+
ifneq "$(USE_SYSTEM_STLPORT)" "y"
# at least here it crashes the build in some funny way.
perl -pi -e "s/(Build-Conflicts: .*)/\1, libstlport4.6-dev/" debian/control
@@ -2113,23 +2123,21 @@
fi
# smoketest
ifeq "$(ARCH)" "armel"
- TMP=`mktemp -q -d`; \
- mkdir -p $$TMP && \
- cd $$TMP && unzip $(CURDIR)/$(SOURCE_TREE)/smoketestoo_native/data/smoketestdoc.sxw && \
- cp $(CURDIR)/$(SOURCE_TREE)/smoketestoo_native/data/smoketestdoc.sxw \
- $(CURDIR)/$(SOURCE_TREE)/smoketestoo_native/data/smoketestdoc.sxw.orig && \
- patch -p0 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff && \
- zip -r $(CURDIR)/$(SOURCE_TREE)/smoketestoo_native/data/smoketestdoc.sxw Basic/Standard/Test_DB.xml
+ cd $(SOURCE_TREE)/smoketestoo_native && \
+ patch -p1 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
cd $(SOURCE_TREE)/smoketestoo_native && \
. $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
export PATH=$(BUILD_PATH); \
export TMPDIR=$(CURDIR)/debian/smoketest; \
export JAVA_HOME=$(TEST_JAVA_HOME); \
- xvfb-run -a ../solenv/bin/build.pl
+ SAL_USE_VCLPLUGIN="svp" ../solenv/bin/build.pl
+ # doesn't get cleaned up.. (at least the dirs, the contents are gone)
+ cd $(CURDIR)/debian/smoketest && \
+ find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \;
ifeq "$(ARCH)" "armel"
- mv $(SOURCE_TREE)/smoketestoo_native/data/smoketestdoc.sxw.orig \
- $(SOURCE_TREE)/smoketestoo_native/data/smoketestdoc.sxw
+ cd $(SOURCE_TREE)/smoketestoo_native && \
+ patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
endif
ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
@@ -3292,13 +3300,6 @@
# convert icons to xpm; we need them for the Debian menu policy...
cd $(PKGDIR)-common/usr/share/icons/hicolor/32x32/apps && \
for x in *.png; do convert $$x `basename $$x .png`.xpm; done
-ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
- # install the matching startcenter.png
- for i in 16x16 32x32 48x48; do \
- install -m644 debian/icons/sysui/desktop/icons/hicolor/$$i/apps/startcenter.png \
- $(PKGDIR)-common/usr/share/icons/hicolor/$$i/apps/openofficeorg$(shell echo $(OOVER) | cut -d. -f1)-startcenter.png; \
- done
-endif
ifeq "$(ENABLE_JAVA)" "y"
# symlink jars we use externally
@@ -3330,12 +3331,20 @@
fi; \
done
+ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
+ # install the matching startcenter.png
+ for i in 16x16 32x32 48x48; do \
+ install -m644 debian/icons/sysui/desktop/icons/hicolor/$$i/apps/startcenter.png \
+ $(PKGDIR)-common/usr/share/icons/hicolor/$$i/apps/openofficeorg$(shell echo $(OOVER) | cut -d. -f1)-startcenter.png; \
+ done
+else
# install ooo-build desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
mkdir -p $(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
cp $(OOO_BUILD_TREE)/desktop/$$r/*.png \
$(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
done
+endif
# move psprint.conf into /etc
mkdir -p $(PKGDIR)-common/etc/$(OODIRNAME)
@@ -3577,8 +3586,8 @@
ifeq "$(USE_PYCENTRAL)" "y"
dh_pycentral -ppython-uno
ifeq "$(PYTHON_VERSION)" "current"
- # fix up broken depends (should be python (<< 2.6), python (>= 2.5) as
- # it was the case before it broke somewhen
+ # fix up broken depends (should be like python (<< 2.6), python (>= 2.5)
+ # as it was the case before it broke somewhen
perl -pi -e 's/python, python-central/python (<< $(PYMAJOR).$(PYMINORPLUS1)), python (>= $(PYMAJOR).$(PYMINOR)), python-central/' debian/python-uno.substvars
endif
else
=== modified file 'smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff'
--- a/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff 2010-06-22 06:18:33 +0000
+++ b/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff 2010-07-14 14:48:51 +0000
@@ -1,5 +1,5 @@
---- Basic/Standard/Test_DB.xml
-+++ Basic/Standard/Test_DB.xml
+--- smoketestoo_native/data/Test_DB.xml
++++ smoketestoo_native/data/Test_DB.xml
@@ -4,9 +4,6 @@
const cMessageDatabaseService = "Database Service"
Reply to: