./packages/openofficeorg/3.2/experimental r1642: merge
------------------------------------------------------------
revno: 1642 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2009-09-04 22:11:46 +0200
message:
merge
added:
control.mysql.in
openoffice.org-mysql-connector.postinst.in
openoffice.org-mysql-connector.preinst.in
openoffice.org-mysql-connector.prerm.in
modified:
changelog
control
control.in
control.mediawiki.in
control.minimizer.in
control.postgresql.in
control.presenter.in
control.ure.in
openoffice.org-filter-binfilter.postinst.in
rules
=== modified file 'changelog'
--- a/changelog 2009-09-04 20:07:45 +0000
+++ b/changelog 2009-09-04 20:11:46 +0000
@@ -26,7 +26,69 @@
-- Rene Engelhard <rene@debian.org> Thu, 03 Sep 2009 23:37:23 +0200
-openoffice.org (1:3.1.1~rc1-2) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-2) UNRELEASED; urgency=low
+
+ [ Rene Engelhard ]
+ * ooo-build:
+ - update (62b71445f871e042403f2959cf339b9f2d12af9d)
+ * debian/rules:
+ - 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
+ * debian/control.mysql.in:
+ - remove conflicts against OOo >= 3.3
+ * debian/changelog:
+ - mention fixed security issues in ~ooo310m15-1 and rc2-1 uploads
+
+ [ Rail Aliev ]
+ * debian/rules:
+ - use the official tarballs in get-orig-source when WITH_SPLIT=n is set
+ - prevent empty GCJ_JAWT_DIR when libgcj10-awt is installed
+ - remove ooo-build directory before "git clone"
+ - remove download.list file produced by download target
+ * 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
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2009 15:17:00 +0200
+
+openoffice.org (1:3.1.1-1) unstable; urgency=low
+
+ * OpenOffice.org 3.1.1 final release.
+ * upload to unstable
+
+ * ooo-build:
+ - update (e73e72f999097ca3ab08ec48cddec798d6128075 - 3.1.1.1)
+ - new-SQLLEN.diff: fix ODBC libs for "new" SQLLEN (closes: #539642)
+ - prevent-multiple-window-resize-calls-when-maximised.diff: add;
+ fixes window resize behavior when using Gtk plugin under KDE,
+ thanks Chris Halls (closes: #542387)
+ - fixes save to UTF8 paths in KDE4 filefpicker (closes: #536664)
+
+ * debian/rules:
+ - use upstreams tarballs
+
+ * debian/control.mysql.in, debian/rules,
+ debian/openoffice.org-mysql-connector.*: add support for "mysqlnative"
+ driver 1.0.0 alongside the already packages sdbc_postgresql one. Use
+ internal libmysqlcppconn on i386 for now... Don't enable it yet.
+ * debian/control.mediawiki.in: don't depend on liblucene2-java but on
+ ${lucene-depends}, so that we don't pick up a liblucene2-java depends
+ when we use internal lucene...
+
+ -- Rene Engelhard <rene@debian.org> Fri, 28 Aug 2009 09:06:36 +0200
+
+openoffice.org (1:3.1.1~rc2-1) experimental; urgency=low
+
+ * OpenOffice.org 3.1.1 rc2 (OOO310_m19)
+ - fixes CVE-2009-2414 / CVE-2009-2416 for the (unused) inernal libxml2
+ copy
+
+ * ooo-build:
+ - update (28051d9210b60491d4de238a41f03d96035b0f29)
+ - src: update GSIs from ftp.linux.cz: bg bn el ga mk nb nn sk sl uz
* debian/control.in:
- Standards-Version: 3.8.3 (no changes needed)
@@ -35,13 +97,17 @@
- move libsdfilt* to -draw
- remove result/ and test/ from OOos own copy of libxml2, too...
(see #331534)
+ - use gcc-mingw32 instead of mingw32 when we build with gcc 4.4
+ - use gcj-jdk/java-gcj-compat-dev on kfreebsd-*
+ - make -l10n-tr suggest openoffice.org-spellcheck-tr to catch
+ openoffice.org-zemberek analogous to openoffice.org-voikko
* debian/rules, debian/openoffice.org-filter-binfilter-*:
Move libbf_migratefilter* back to -filter-binfilter as it's linked to
libs there. Add the regcomp (un)registering.
* debian/source.lintian-overrides:
- remove, lintian is fixed to not complain about these anymore
- -- Rene Engelhard <rene@debian.org> Mon, 17 Aug 2009 01:09:08 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 21 Aug 2009 13:41:02 +0200
openoffice.org (1:3.1.1~rc1-1) experimental; urgency=low
@@ -78,6 +144,8 @@
* OpenOffice.org 3.1.1 development milestone 15 (OOO310_m15)
- fixes import of (non-RTL) ww8 tables (closes: #535971)
+ - fixes CVE-2009-0200 ("OpenOffice.org sprmTDelete integer underflow")
+ and CVE-2009-0201 ("OpenOffice.org sprmTInsert buffer overflow")
* ooo-build:
- update (ccbde7123a771221cf05adccf8ab86a1e01cf583)
=== modified file 'control'
--- a/control 2009-09-04 20:07:45 +0000
+++ b/control 2009-09-04 20:11:46 +0000
@@ -4,7 +4,7 @@
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], 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, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64] , libcurl4-openssl-dev , libssl-dev , libdb
-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common (>= 1:4.4.0) [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i
386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 arm armel amd6
4 ia64 ppc64], libnss3-dev (>= 3.12.3) [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev , libqt4-dev (>= 4.5) , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , 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-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev
-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], 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), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable
@@ -62,7 +62,6 @@
* libpaper-utils: papersize detection support via paperconf
Package: broffice.org
-Section: editors
Priority: extra
Architecture: all
Depends: openoffice.org, openoffice.org-l10n-pt-br, openoffice.org-help-pt-br, myspell-pt-br, ${misc:Depends}
@@ -76,7 +75,6 @@
Package: openoffice.org-l10n-za
Section: localization
-Priority: optional
Architecture: all
Depends: openoffice.org-l10n-af, openoffice.org-l10n-en-za, openoffice.org-l10n-nr, openoffice.org-l10n-ns, openoffice.org-l10n-ss, openoffice.org-l10n-st, openoffice.org-l10n-tn, openoffice.org-l10n-ts, openoffice.org-l10n-ve, openoffice.org-l10n-xh, openoffice.org-l10n-zu, ${misc:Depends}
Description: full-featured office productivity suite -- South African language packages
@@ -88,7 +86,6 @@
Package: openoffice.org-l10n-in
Section: localization
-Priority: optional
Architecture: all
Depends: openoffice.org-l10n-as-in, openoffice.org-l10n-bn, openoffice.org-l10n-gu-in, openoffice.org-l10n-hi-in, openoffice.org-l10n-ml-in, openoffice.org-l10n-mr-in, openoffice.org-l10n-or-in, openoffice.org-l10n-pa-in, openoffice.org-l10n-ta-in, openoffice.org-l10n-te-in, ${misc:Depends}
Recommends: ttf-indic-fonts
@@ -2427,7 +2424,7 @@
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-tr
Provides: openoffice.org-l10n-${help-l10n-virtual-version}, openoffice.org2-l10n-tr
-Suggests: hunspell-dictionary-tr | myspell-dictionary-tr, openoffice.org-hyphenation-tr, openoffice.org2-thesaurus-tr, openoffice.org-help-tr
+Suggests: hunspell-dictionary-tr | myspell-dictionary-tr | openoffice.org-spellcheck-tr, openoffice.org-hyphenation-tr, openoffice.org2-thesaurus-tr, openoffice.org-help-tr
Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>= ${base-version}.1), openoffice.org2-l10n-tr
Replaces: openoffice.org2-l10n-tr
Description: full-featured office productivity suite -- Turkish language package
@@ -3098,7 +3095,7 @@
Section: libs
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: ure
+Replaces: ure (<< 1:3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
@@ -3121,7 +3118,7 @@
Priority: extra
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
-Replaces: ure-dbg
+Replaces: ure-dbg (<< 1:3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared library debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
@@ -3293,7 +3290,6 @@
Package: openoffice.org-wiki-publisher
Section: misc
-Priority: optional
Architecture: all
Pre-Depends: openoffice.org-java-common (>= 1:3.0.0~), ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, openoffice.org-core (>= 1:3.0.0~), ${misc:Depends}
@@ -3341,7 +3337,6 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3), openoffice.org-impress, ${misc:Depends}
@@ -3361,7 +3356,6 @@
Package: openoffice.org-presenter-console
Section: misc
-Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Conflicts: openoffice.org-presenter-screen
Provides: openoffice.org-presenter-screen
@@ -3499,7 +3493,6 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
-Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), ${misc:Depends}
=== modified file 'control.in'
--- a/control.in 2009-08-16 23:11:42 +0000
+++ b/control.in 2009-08-30 18:24:18 +0000
@@ -49,7 +49,7 @@
libpq-dev,
bc
%BUILD_DEPS%
-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]
+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)
Standards-Version: 3.8.3
XS-Python-Version: @PYTHON_VERSION@
Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable
@@ -139,7 +139,6 @@
* libpaper-utils: papersize detection support via paperconf
Package: broffice.orgVER
-Section: editors
Priority: extra
Architecture: all
Depends: openoffice.orgVER, openoffice.orgVER-l10n-pt-br, openoffice.orgVER-help-pt-br, myspell-pt-br,
@@ -154,7 +153,6 @@
Package: openoffice.orgVER-l10n-za
Section: localization
-Priority: optional
Architecture: all
Depends: openoffice.orgVER-l10n-af, openoffice.orgVER-l10n-en-za, openoffice.orgVER-l10n-nr, openoffice.orgVER-l10n-ns, openoffice.orgVER-l10n-ss, openoffice.orgVER-l10n-st, openoffice.orgVER-l10n-tn, openoffice.orgVER-l10n-ts, openoffice.orgVER-l10n-ve, openoffice.orgVER-l10n-xh, openoffice.orgVER-l10n-zu,
${misc:Depends}
@@ -167,7 +165,6 @@
Package: openoffice.orgVER-l10n-in
Section: localization
-Priority: optional
Architecture: all
Depends: openoffice.orgVER-l10n-as-in, openoffice.orgVER-l10n-bn, openoffice.orgVER-l10n-gu-in, openoffice.orgVER-l10n-hi-in, openoffice.orgVER-l10n-ml-in, openoffice.orgVER-l10n-mr-in, openoffice.orgVER-l10n-or-in, openoffice.orgVER-l10n-pa-in, openoffice.orgVER-l10n-ta-in, openoffice.orgVER-l10n-te-in,
${misc:Depends}
=== modified file 'control.mediawiki.in'
--- a/control.mediawiki.in 2009-08-28 07:51:13 +0000
+++ b/control.mediawiki.in 2009-09-04 20:11:46 +0000
@@ -1,6 +1,5 @@
Package: openoffice.orgVER-wiki-publisher
Section: misc
-Priority: optional
Architecture: all
Pre-Depends: openoffice.orgVER-java-common (>= 1:3.0.0~), ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:3.0.0~),
=== modified file 'control.minimizer.in'
--- a/control.minimizer.in 2009-06-10 07:32:34 +0000
+++ b/control.minimizer.in 2009-08-30 18:24:18 +0000
@@ -1,6 +1,5 @@
Package: openoffice.orgVER-presentation-minimizer
Section: misc
-Priority: optional
Architecture: %OOO_ARCHS%
Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 2.3), openoffice.orgVER-impress,
=== added file 'control.mysql.in'
--- a/control.mysql.in 1970-01-01 00:00:00 +0000
+++ b/control.mysql.in 2009-08-30 18:24:18 +0000
@@ -0,0 +1,15 @@
+Package: openoffice.orgVER-mysql-connector
+Section: misc
+Architecture: %OOO_ARCHS%
+Pre-Depends: openoffice.orgVER-common
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.1~)
+ ${misc:Depends}
+Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212), openoffice.orgVER-gcj (<< 2.3.0~src680m212)
+Suggests: mysql-server (>= 5.1)
+Description: MySQL Connector extension for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The MySQL Connectot extension allows to use the MySQL database from
+ OpenOffice.org without any wrapper layer such as ODBC or JDBC.
+
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2009-06-10 07:32:34 +0000
+++ b/control.postgresql.in 2009-08-30 18:24:18 +0000
@@ -1,6 +1,5 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
-Priority: optional
Architecture: %OOO_ARCHS%
Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.3.0~oog680m1),
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2009-06-10 07:32:34 +0000
+++ b/control.presenter.in 2009-08-30 18:24:18 +0000
@@ -1,6 +1,5 @@
Package: openoffice.orgVER-presenter-console
Section: misc
-Priority: optional
Architecture: %OOO_ARCHS%
Conflicts: openoffice.orgVER-presenter-screen
Provides: openoffice.orgVER-presenter-screen
=== modified file 'control.ure.in'
--- a/control.ure.in 2009-04-27 13:34:49 +0000
+++ b/control.ure.in 2009-08-25 09:21:28 +0000
@@ -3,7 +3,7 @@
Architecture: %OOO_ARCHS%
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: ure
+Replaces: ure (<< 1:3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
@@ -27,7 +27,7 @@
Architecture: %OOO_ARCHS%
Depends: uno-libs3 (= ${ure:Version}),
${misc:Depends}
-Replaces: ure-dbg
+Replaces: ure-dbg (<< 1:3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared library debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
=== modified file 'openoffice.org-filter-binfilter.postinst.in'
--- a/openoffice.org-filter-binfilter.postinst.in 2009-08-12 20:33:48 +0000
+++ b/openoffice.org-filter-binfilter.postinst.in 2009-08-19 07:04:41 +0000
@@ -8,7 +8,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- register_to_services_rdb /@OOBASISDIR@/program/libbf_mingratefilter$LIBSUFFIX.so
+ register_to_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
fi
#DEBHELPER#
=== added file 'openoffice.org-mysql-connector.postinst.in'
--- a/openoffice.org-mysql-connector.postinst.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.postinst.in 2009-08-25 09:21:28 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=openoffice.org-mysql-connector
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
+ add_extension /usr/lib/openoffice/share/extension/install/mysql-connector-ooo*oxt
+fi
+
+#DEBHELPER#
+
+exit 0
=== added file 'openoffice.org-mysql-connector.preinst.in'
--- a/openoffice.org-mysql-connector.preinst.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.preinst.in 2009-08-25 09:21:28 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-mysql-connector
+
+THIS_PACKAGE=openoffice.org-mysql-connector
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+ upgrade)
+ remove_extension com.sun.star.mysql-connector-ooo-$PLATFORMID
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
=== added file 'openoffice.org-mysql-connector.prerm.in'
--- a/openoffice.org-mysql-connector.prerm.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.prerm.in 2009-08-25 09:21:28 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-mysql-connector
+
+THIS_PACKAGE=openoffice.org-mysql-connector
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+ remove)
+ remove_extension com.sun.star.mysql-connector-ooo-$PLATFORMID
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
=== modified file 'rules'
--- a/rules 2009-09-04 20:07:45 +0000
+++ b/rules 2009-09-04 20:11:46 +0000
@@ -108,6 +108,9 @@
ifneq (,$(findstring mips,$(ARCH)))
JDK=gcj-jdk
endif
+ifneq (,$(findstring kfreebsd,$(ARCH)))
+ JDK=gcj-jdk
+endif
ENABLE_MONO=y
MONO2=y
ifeq "$(MONO2)" "y"
@@ -130,6 +133,9 @@
ifeq "$(BOOST_VERSION)" "1.37"
BOOST_MINVER= (>= 1.37.0-4)
endif
+ifeq "$(BOOST_VERSION)" "1.39"
+ BOOST_MINVER= (>= 1.39.0-2)
+endif
USE_SYSTEM_VIGRA=y
USE_EXTERNAL_CXXLIBS=y
LIBWPD8_MINVER= (>= 0.8.3-3)
@@ -238,6 +244,9 @@
INTERNAL_STDLIBS=n
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) industrial crystal hicontrast tango oxygen classic
+ENABLE_MYSQLNATIVE=n
+USE_SYSTEM_MYSQLCLIENT=y
+USE_SYSTEM_MYSQLCPPCONN=y
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= --disable-post-install-scripts \
@@ -315,6 +324,9 @@
ifneq (,$(findstring mips,$(ARCH)))
JDK=java-gcj-compat-dev
endif
+ifneq (,$(findstring kfreebsd,$(ARCH)))
+ JDK=java-gcj-compat-dev
+endif
endif
#############
@@ -669,7 +681,7 @@
JAVA_RUNTIME_DEPENDS += | java5-runtime
# Suns Java "packages"
JAVA_RUNTIME_DEPENDS += | jre
- GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so`)
+ GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common (>> 2.2.0-4)
@@ -679,7 +691,15 @@
JAVA_COMMON_JAVA_DEPENDS+= , libsaxonb-java
endif
ifeq "$(DIST)" "Debian"
+ ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4"
+ BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)]
+ else
+ ifeq "$(GCC_VERSION)" "4.4"
+ BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)]
+ else
BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
+ endif
+ endif
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
@@ -905,6 +925,18 @@
endif
endif
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ CONFIGURE_FLAGS += --enable-mysql-connector
+ ifeq "$(USE_SYSTEM_MYSQLCLIENT)" "y"
+ CONFIGURE_FLAGS += --with-system-mysql
+ BUILD_DEPS += , libmysqlclient-dev
+ endif
+ ifeq "$(USE_SYSTEM_MSQLCPPCONN)" "y"
+ CONFIGURE_FLAGS += --with-system-mysql-cppconn
+ BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out $(OOO_STLPORT_ARCHS),$(OOO_ARCHS)))], libmysqlcppconn-stlport-dev [$(OOO_STLPORT_ARCHS)]
+ endif
+endif
+
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-gtk -Nopenoffice.org$(VER)-gnome
@@ -1033,7 +1065,7 @@
# Build n projects in parallel?
# DEB_BUILD_OPTIONS=parallel=<n>
-NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?parallel=\([0-9]\+\).*$$/\2/p')
+NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*\s\)\?parallel=\([0-9]\+\).*/\2/p')
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(NUM_CPUS)" ""
NUM_CPUS := 1
@@ -1285,6 +1317,7 @@
rm -f debian/openoffice.org-$$i.lintian-overrides; \
done
rm -f debian/*.install debian/*.dirs
+ rm -f download.list
$(MAKE) -f debian/rules control
@@ -1440,6 +1473,10 @@
endif
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.postgresql.in
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
+ >> debian/control < debian/control.mysql.in
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
@@ -1482,6 +1519,8 @@
# make -l10n-fi suggest openoffice.org-spellcheck-fi to
# match myspell-fi and openoffice.org-soikko/-voikko
perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | openoffice.org-spellcheck-fi/' debian/control
+ # similar for tr (openoffice.org-zemberek)
+ perl -pi -e 's/myspell-dictionary-tr/myspell-dictionary-tr | openoffice.org-spellcheck-tr/' debian/control
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/GConf backend$$/GConf backend\n * openoffice.org$(VER)-kde: KDE UI Plugin and KDE File Picker support/' debian/control
@@ -2512,6 +2551,12 @@
install -D -m644 $(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip \
$(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extension/install/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ rm -rf $(PKGDIR)-mysql-connector
+ install -D -m644 $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/mysql-connector-ooo-$(shell . $(SOURCE_TREE)/mysqlc/version.mk 2>/dev/null; echo $${MYSQLC_VERSION_MAJOR}.$${MYSQLC_VERSION_MINOR}.$${MYSQLC_VERSION_MICRO}-$(shell echo $(PLATFORMID) | sed -e s/_/-/)).oxt \
+ $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extension/install/mysql-connector-ooo-$(shell . $(SOURCE_TREE)/mysqlc/version.mk; echo $${MYSQLC_VERSION_MAJOR}.$${MYSQLC_VERSION_MINOR}.$${MYSQLC_VERSION_MICRO}-$(shell echo $(PLATFORMID) | sed -e s/_/-/)).oxt
+endif
+
ifeq "$(ENABLE_OPENGL)" "y"
rm -rf $(PKGDIR)-ogltrans
mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/program
@@ -3116,6 +3161,15 @@
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+ dpkg-shlibdeps -O \
+ -Sdebian/uno-libs3/$(OOUREDIR)/lib \
+ -Sdebian/ure/$(OOUREDIR)/lib \
+ $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/mysqlc.uno.so \
+ $(SOURCE_TREE)/mysqlcppconn/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/libmysqlcppconn.so \
+ > debian/openoffice.org$(VER)-mysql-connector.substvars
+endif
ifeq "$(ENABLE_MINIMIZER)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
dpkg-shlibdeps -O \
@@ -3152,7 +3206,8 @@
-Nopenoffice.org$(VER)-presentation-minimizer \
-Nopenoffice.org$(VER)-presenter-console \
-Nopenoffice.org$(VER)-pdfimport \
- -Nopenoffice.org$(VER)-sdbc-postgresql -- \
+ -Nopenoffice.org$(VER)-sdbc-postgresql \
+ -Nopenoffice.org$(VER)-mysql-connector -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
@@ -3190,6 +3245,10 @@
endif
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`
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ dh_gencontrol -popenoffice.org$(VER)-mysql-connector -- \
+ -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
-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`
@@ -3333,6 +3392,7 @@
# Get ooo-build
get-ooo-build:
+ rm -rf ooo-build
git clone git://anongit.freedesktop.org/git/ooo-build/ooo-build
ifneq "$(OOO_BUILD_BRANCH)" ""
cd ooo-build && \
@@ -3342,8 +3402,52 @@
endif
cd ooo-build && NOCONFIGURE=1 ./autogen.sh
-# FIXME: works for milestones *AND* for a --with-split build only...
get-orig-source:
+ifneq "$(WITH_SPLIT)" "y"
+ if test -n "$$TMP"; then \
+ TMPD=`mktemp -d -p $$TMP`; \
+ else \
+ TMPD=`mktemp -d`; \
+ fi && \
+ cd $$TMPD && \
+ mkdir -p openoffice.org-$(UPSTREAM_VERSION)/ooo-build/src && \
+ cd openoffice.org-$(UPSTREAM_VERSION)/ooo-build/src && \
+ wget http://download.services.openoffice.org/files/stable/$(UPSTREAM_VERSION)/OOo_$(UPSTREAM_VERSION)_src_binfilter.tar.bz2 && \
+ wget http://download.services.openoffice.org/files/stable/$(UPSTREAM_VERSION)/OOo_$(UPSTREAM_VERSION)_src_core.tar.bz2 && \
+ wget http://download.services.openoffice.org/files/stable/$(UPSTREAM_VERSION)/OOo_$(UPSTREAM_VERSION)_src_extensions.tar.bz2 && \
+ wget http://download.services.openoffice.org/files/stable/$(UPSTREAM_VERSION)/OOo_$(UPSTREAM_VERSION)_src_l10n.tar.bz2 && \
+ wget http://download.services.openoffice.org/files/stable/$(UPSTREAM_VERSION)/OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2 && \
+ tar xfvj OOo_$(UPSTREAM_VERSION)_src_core.tar.bz2 && \
+ for i in `find $(TAG)/psprint_config/configuration/ppds ! -name "SGEN*" -name "*.PS"`; do \
+ rm $$i; \
+ done && \
+ tar cfvj OOo_$(UPSTREAM_VERSION)_src_core.tar.bz2.dfsg $(TAG) && \
+ rm -rf $(TAG) && \
+ ln -sf OOo_$(UPSTREAM_VERSION)_src_core.tar.bz2.dfsg OOo_$(UPSTREAM_VERSION)_src_core.tar.bz2 && \
+ tar xfvj OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2 && \
+ for i in da_DK en_GB nl_NL ru_RU; do \
+ rm $(TAG)/dictionaries/$$i/hyph_$${i}.dic; \
+ done && \
+ cd $(TAG)/libxml2/download/ && \
+ tar xfvz libxml2-2.6.31.tar.gz && \
+ rm -rf libxml2-2.6.31/result libxml2-2.6.31/test && \
+ tar cfvz libxml2-2.6.31.tar.gz libxml2-2.6.31/ && \
+ rm -rf libxml2-2.6.31/ && \
+ cd ../../.. && \
+ tar cfvj OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2.dfsg $(TAG) && \
+ rm -rf $(TAG) && \
+ ln -sf OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2.dfsg OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2 && \
+ tar xfvj OOo_$(UPSTREAM_VERSION)_src_extensions.tar.bz2 && \
+ zip -d $(TAG)/jfreereport/download/liblayout.zip \
+ liblayout/resource/rfc1345.txt && \
+ tar cfvj OOo_$(UPSTREAM_VERSION)_src_extensions.tar.bz2.dfsg $(TAG) && \
+ rm -rf $(TAG) && \
+ ln -sf OOo_$(UPSTREAM_VERSION)_src_extensions.tar.bz2.dfsg OOo_$(UPSTREAM_VERSION)_src_extensions.tar.bz2 && \
+ cd $$TMPD && tar cfvz openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz openoffice.org-$(UPSTREAM_VERSION) && \
+ rm -rf openoffice.org-$(UPSTREAM_VERSION) && \
+ mv openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz $(CURDIR)/.. && \
+ rmdir $$TMPD
+else
if test -n "$$TMP"; then \
TMPD=`mktemp -d -p $$TMP`; \
else \
@@ -3380,6 +3484,7 @@
rm -rf libxml2-2.6.31/result libxml2-2.6.31/test && \
tar cfvz libxml2-2.6.31.tar.gz libxml2-2.6.31/ && \
rm -rf libxml2-2.6.31/ && \
+ cd ../../.. && \
tar cfvj $(TAG)-libs-extern-sys.tar.bz2.dfsg $(TAG)-libs-extern-sys && \
ln -sf $(TAG)-libs-extern-sys.tar.bz2.dfsg $(TAG)-libs-extern-sys.tar.bz2 && \
rm -rf $(TAG)-libs-extern-sys && \
@@ -3400,6 +3505,7 @@
rm -rf openoffice.org-$(UPSTREAM_VERSION) && \
mv openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz $(CURDIR)/.. && \
rmdir $$TMPD
+endif
# Download the latest sources needed for ooo-build. Note that is
# might download more than actually needed here....
Reply to: