------------------------------------------------------------
revno: 1662 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Fri 2009-10-02 02:22:29 +0200
message:
merge
modified:
changelog
control
control.in
control.mysql.in
control.postgresql.in
rules
=== modified file 'changelog'
--- a/changelog 2009-10-01 16:02:24 +0000
+++ b/changelog 2009-10-02 00:22:29 +0000
@@ -14,7 +14,7 @@
- now honours ACLs (closes: #216596, #548881)
* ooo-build:
- - update (fb536c206482bb18e5faf1861a69e3f3f0575f0e)
+ - update (571836c97355e18d01f5d26342e90d842809091f)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -46,16 +46,18 @@
* debian/openoffice.org-filter-binfilter.{templates,postinst.in}:
- warn against those filters being obsoleted with OOo 3.4
- -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 00:19:20 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 02 Oct 2009 02:15:47 +0200
openoffice.org (1:3.1.1-3) UNRELEASED; urgency=low
* The "Goodbye sparc!" release. :-(
* ooo-build:
- - update (cb6d5f3ab0837310b9733880b14a61bf7fad6ae4)
+ - update (4d4be60ad4dfc84b85b0ea1d4b21b8d74212673d)
- Fixed range selection for RTL languages. (closes: #548767)
- fix some Extended Tips abbreviations for Italian (closes: #478761)
+ - apply optional-icon-themes.diff so that OOo doesn't list not-installed
+ icons anymore (closes: #416877)
* merge from Ubuntu:
- Add support to turn off building on sparc.
@@ -68,7 +70,10 @@
not installed
- remove bogus (.*på engelsk) from GSI_da to fix some functions
(closes: #548608)
- - fix build with > 2 languages in lang=
+ - fix lang= handling for DEB_BUILD_OPTIONS
+ - point --with-external-{dict,hyph,thes}-dir to the new locations
+ * debian/control.in: break dict/hyphen patterns/thesauri packages
+ with the old location
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
* debian/shell-lib.sh:
- check whether OOo is running before (de-)registering extensions or
@@ -77,7 +82,7 @@
it breaks. Removing "Adding extension XY .. done" echos
* debian/templates, debian/po: add debconf error shown when OOo is running
- -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 03:03:53 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 13:49:29 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-09-29 11:24:22 +0000
+++ b/control 2009-10-02 00:22:29 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@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,
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 , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0)
[s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x] ,
libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips mipsel armel s390
m68k amd64 ia64 ppc64 s390x] , libcurl4-openssl-dev , libssl-dev , libdb-dev ,
python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk ,
gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-common (>=
1:4.4.0) [i386 mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x], libloader-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], librepository-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libserializer-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm armel amd64
ia64 ppc64 s390x], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm
armel amd64 ia64 ppc64 s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386
amd64 ia64], libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1)
[i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost-dev (>= 1.38) , 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) , libmysqlclient-dev ,
libmysqlcppconn-dev (>= 1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64
ia64 ppc64 s390x)], libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x] , 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 ,
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], 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,
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 , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0)
[s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x] ,
libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips mipsel armel s390
m68k amd64 ia64 ppc64 s390x] , libcurl4-openssl-dev , libssl-dev , libdb-dev ,
python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk ,
gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-common (>=
1:4.4.0) [i386 mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x], libloader-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], librepository-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libserializer-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm armel amd64
ia64 ppc64 s390x], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm
armel amd64 ia64 ppc64 s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386
amd64 ia64], libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1)
[i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost-dev (>= 1.38) , 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) , libmysqlclient-dev ,
libmysqlcppconn-dev (>= 1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64
ia64 ppc64 s390x], libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x] , 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 ,
libldap2-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], libboost1.39-dev (<< 1.39.0-2), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
@@ -102,6 +102,7 @@
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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-impress (<< ${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)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz, myspell-el-gr (<<
0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar
(<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<<
2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<<
0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se
(<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us
(<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1),
myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<<
2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1),
myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1),
myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<<
2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), myspell-da (<<
1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2),
myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at
(<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<<
20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), openoffice.org-hyphenation-hr (<< 20060617-2),
openoffice.org-hyphenation-pl (<< 1:3.0a-3), openoffice.org-hyphenation-sh (<<
1:3.1.0-3), openoffice.org-hyphenation-sr (<< 1:3.1.0-3),
openoffice.org-hyphenation-de (<< 1:3.1.0-3), openoffice.org-hyphenation-hu (<<
1:3.1.0-3), openoffice.org-hyphenation-it (<< 1:3.1.0-3),
openoffice.org-hyphenation-sl (<< 1:3.1.0-3), openoffice.org-hyphenation-af (<<
1:3.1.0-3), openoffice.org-hyphenation-zu (<< 1:3.1.0-3),
openoffice.org-hyphenation-fr (<< 1:3.1.0-3), openoffice.org-thesaurus-it (<<
2.0.7.gh.deb1-1.1), openoffice.org-thesaurus-en-au (<< 2.1-5),
openoffice.org-thesaurus-pl (<< 1.5-3), openoffice.org-thesaurus-en-us (<<
1:3.1.0-3), openoffice.org-thesaurus-cs (<< 1:3.1.0-3),
openoffice.org-thesaurus-sk (<< 1:3.1.0-3), openoffice.org-thesaurus-ru (<<
1:3.1.0-3), openoffice.org-thesaurus-ne (<< 1:3.1.0-3),
openoffice.org-thesaurus-hu (<< 1:3.1.0-3), openoffice.org-thesaurus-fr (<<
1:3.1.0-3)
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
@@ -908,7 +909,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-common
+Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
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)
Suggests: postgresql
@@ -924,7 +925,7 @@
Section: misc
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.2~) ${misc:Depends}
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.2~), ${misc:Depends}
Suggests: mysql-server (>= 5.1)
Homepage:
http://wiki.services.openoffice.org/wiki/Database/Drivers/MySQL_Native
Description: MySQL Connector extension for OpenOffice.org
=== modified file 'control.in'
--- a/control.in 2009-09-29 11:24:22 +0000
+++ b/control.in 2009-10-02 00:22:29 +0000
@@ -234,6 +234,7 @@
openoffice.org-qa-ui-tests (>= ${base-version}.1),
cacao-oj6-jre,
mozilla-plugin-vlc (<< 1.0)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz, myspell-el-gr (<<
0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar
(<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<<
2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<<
0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se
(<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us
(<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1),
myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<<
2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1),
myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1),
myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<<
2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), myspell-da (<<
1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2),
myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at
(<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<<
20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), openoffice.org-hyphenation-hr (<< 20060617-2),
openoffice.org-hyphenation-pl (<< 1:3.0a-3), openoffice.org-hyphenation-sh (<<
1:3.1.0-3), openoffice.org-hyphenation-sr (<< 1:3.1.0-3),
openoffice.org-hyphenation-de (<< 1:3.1.0-3), openoffice.org-hyphenation-hu (<<
1:3.1.0-3), openoffice.org-hyphenation-it (<< 1:3.1.0-3),
openoffice.org-hyphenation-sl (<< 1:3.1.0-3), openoffice.org-hyphenation-af (<<
1:3.1.0-3), openoffice.org-hyphenation-zu (<< 1:3.1.0-3),
openoffice.org-hyphenation-fr (<< 1:3.1.0-3), openoffice.org-thesaurus-it (<<
2.0.7.gh.deb1-1.1), openoffice.org-thesaurus-en-au (<< 2.1-5),
openoffice.org-thesaurus-pl (<< 1.5-3), openoffice.org-thesaurus-en-us (<<
1:3.1.0-3), openoffice.org-thesaurus-cs (<< 1:3.1.0-3),
openoffice.org-thesaurus-sk (<< 1:3.1.0-3), openoffice.org-thesaurus-ru (<<
1:3.1.0-3), openoffice.org-thesaurus-ne (<< 1:3.1.0-3),
openoffice.org-thesaurus-hu (<< 1:3.1.0-3), openoffice.org-thesaurus-fr (<<
1:3.1.0-3)
Provides: openoffice.orgVER-bundled,
openoffice.org2-core,
openoffice.org-java,
=== modified file 'control.mysql.in'
--- a/control.mysql.in 2009-09-29 11:24:22 +0000
+++ b/control.mysql.in 2009-10-02 00:22:29 +0000
@@ -2,7 +2,7 @@
Section: misc
Architecture: %OOO_ARCHS%
Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.2~)
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.2~),
${misc:Depends}
Suggests: mysql-server (>= 5.1)
Homepage:
http://wiki.services.openoffice.org/wiki/Database/Drivers/MySQL_Native
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2009-08-30 18:24:18 +0000
+++ b/control.postgresql.in 2009-09-30 15:26:05 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-common
+Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
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)
=== modified file 'rules'
--- a/rules 2009-10-01 16:02:24 +0000
+++ b/rules 2009-10-02 00:22:29 +0000
@@ -251,6 +251,9 @@
ENABLE_MYSQLNATIVE=y
USE_SYSTEM_MYSQLCLIENT=y
USE_SYSTEM_MYSQLCPPCONN=y
+DICT_DIR=/usr/share/hunspell
+HYPH_DIR=/usr/share/hyphen
+THES_DIR=/usr/share/mythes
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= --disable-post-install-scripts \
@@ -269,9 +272,6 @@
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--enable-hids \
--with-system-dicts \
- --with-external-dict-dir=/usr/share/myspell/dicts \
- --with-external-hyph-dir=/usr/share/myspell/dicts \
- --with-external-thes-dir=/usr/share/myspell/dicts \
--with-additional-sections="$(ADDITIONAL_SECTIONS)" \
--without-git
@@ -323,6 +323,9 @@
ifneq (,$(findstring kfreebsd,$(ARCH)))
JDK=java-gcj-compat-dev
endif
+ DICT_DIR=/usr/share/myspell/dicts
+ HYPH_DIR=/usr/share/myspell/dicts
+ THES_DIR=/usr/share/myspell/dicts
endif
#############
@@ -609,9 +612,9 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
- ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
- LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
else
# Note that the first one here *has to be* en-US. the first one gets
# gid_Module_Root as filelist later and the rest gid_Module_Root.$iso
@@ -819,6 +822,7 @@
BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
CONFIGURE_FLAGS+= --with-system-hunspell
endif
+ CONFIGURE_FLAGS += --with-external-dict-dir=$(DICT_DIR)
ifeq "$(SYSTEM_ALTLINUXHYPH)" "y"
ifeq "$(USE_LIBHYPHEN)" "y"
@@ -828,6 +832,7 @@
endif
CONFIGURE_FLAGS += --with-system-altlinuxhyph
endif
+ CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR)
ifeq "$(USE_AGG)" "y"
CONFIGURE_FLAGS+= --with-agg
@@ -894,6 +899,7 @@
CONFIGURE_FLAGS += --with-system-libwpg
endif
endif
+ CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
ifeq "$(USE_SYSTEM_ICU)" "y"
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
@@ -962,7 +968,7 @@
endif
ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "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)]
+ BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS))], libmysqlcppconn-stlport-dev
[$(OOO_STLPORT_ARCHS)]
endif
endif
@@ -1575,6 +1581,10 @@
perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client
library; needed for OOo getting its profiles\n from LDAP/' debian/control
endif
+ifneq "$(DICT_DIR)" "/usr/share/hunspell"
+ perl -pi -e 's/^Breaks:.*myspell*\n//' debian/control
+endif
+
.DELETE_ON_ERROR: debian/control
build: build-arch build-indep
@@ -3177,7 +3187,7 @@
else
dh_strip -s
endif
-ifneq "$(LENNY_BACKPORT)" "y"
+ifeq "$(LENNY_BACKPORT)" "y"
dh_desktop -s
endif
dh_icons -s
@@ -3391,7 +3401,7 @@
dh_lintian -i
dh_link -i
dh_fixperms -i
-ifneq "$(LENNY_BACKPORT)" "y"
+ifeq "$(LENNY_BACKPORT)" "y"
dh_desktop -i
endif
dh_icons -i
