------------------------------------------------------------ revno: 1653 [merge] committer: Rene Engelhard <r...@debian.org> branch nick: experimental timestamp: Mon 2009-09-21 02:07:46 +0200 message: merge; regenerate control modified: changelog control control.mysql.in rules
=== modified file 'changelog' --- a/changelog 2009-09-18 15:23:16 +0000 +++ b/changelog 2009-09-21 00:07:46 +0000 @@ -35,6 +35,20 @@ -- Rene Engelhard <r...@debian.org> Sat, 12 Sep 2009 00:14:48 +0200 +openoffice.org (1:3.1.1-3) UNRELEASED; urgency=low + + * The "Goodbye sparc!" release. :-( + + * ooo-build: + - update (2bd5d28c97d3d84756bb5f88a3be0487a62fe9b0) + + * merge from Ubuntu: + - Add support to turn off building on sparc. + * debian/rules: don't build sparc. Too many random(!) build failures + * debian/control.mysql.in: remove bogus conflicts, add Homepage: + + -- Rene Engelhard <r...@debian.org> Wed, 16 Sep 2009 15:27:39 +0200 + openoffice.org (1:3.1.1-2) unstable; urgency=low [ Rene Engelhard ]
=== modified file 'control' --- a/control 2009-09-18 15:23:16 +0000 +++ b/control 2009-09-21 00:07:46 +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, 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 [i386 powerpc sp arc 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 amd64 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 , 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, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc 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 mips mipsel s390 armel amd64 ia64], libgcj-common (>= 1:4.4.0) [i386 mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc m ips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64], lib mono-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 , 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 mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc 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 , 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 @@ -12,7 +12,7 @@ Homepage: http://www.go-oo.org Package: openoffice.org -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin, ttf-dejavu, ttf-sil-gentium-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, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}, ${libldap-suggests} @@ -99,7 +99,7 @@ indic languages. Package: openoffice.org-core -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends} Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-core (<< ${binary:Version}), openoffice.org-calc (<< ${binary:Version}), openoffice.org-writer (<< ${binary:Version}), openoffice.org-i mpress (<< ${binary:Version}), openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<< ${binary:Version}), openoffice.org-gtk (<< ${binary:Version}), openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<< ${binary:Version}), openoffice.org-evolution (<< ${binary:Version}), openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean (<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0) Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell @@ -141,7 +141,7 @@ the Java support for OpenOffice.org (Java classes, scripts, config snippets). Package: openoffice.org-writer -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, openoffice.org-emailmerge, openoffice.org-math Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${binary:Version}), openoffice.org-common (<< 1:2.3.1) @@ -155,7 +155,7 @@ This package contains the wordprocessor component for OpenOffice.org. Package: openoffice.org-calc -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core (= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends} Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4), openoffice.org2-calc (<< ${binary:Version}), openoffice.org-common (<< 2.0.3+2.0.4m179) Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-calc (<< ${binary:Version}) @@ -167,7 +167,7 @@ This package contains the spreadsheet component for OpenOffice.org. Package: openoffice.org-impress -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-draw (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-impress (<< ${binary:Version}), openoffice.org-common (<< 2.0.3+2.0.4m179) Provides: openoffice.org2-impress @@ -179,7 +179,7 @@ This package contains the presentation component for OpenOffice.org. Package: openoffice.org-draw -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-draw (<< ${binary:Version}), openoffice.org-core (<< 1:3.1.1~rc1-2), openoffice.org-common (<< 2.0.3+2.0.4m179) Conflicts: openoffice.org-debian-files, openoffice.org2-draw (<< ${binary:Version}) @@ -191,7 +191,7 @@ This package contains the drawing component for OpenOffice.org. Package: openoffice.org-math -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-math (<< ${binary:Version}), openoffice.org-common (<< 2.0.3+2.0.4m179) Conflicts: openoffice.org-debian-files, openoffice.org2-math (<< ${binary:Version}) @@ -203,7 +203,7 @@ This package contains the equation editor component for OpenOffice.org. Package: openoffice.org-base-core -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Replaces: openoffice.org-base (<< 1:2.3.1) Suggests: openoffice.org-base @@ -218,7 +218,7 @@ install openoffice.org-base. Package: openoffice.org-base -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Section: database Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends} Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, openoffice.org-gcj, openoffice.org-report-builder @@ -333,7 +333,7 @@ option menu. Package: openoffice.org-gtk -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-style-tango, ${shlibs:Depends}, ${misc:Depends} Section: gnome Enhances: openoffice.org @@ -348,7 +348,7 @@ contains a QuickStarter for the "notification area". Package: openoffice.org-gnome -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-gtk, gconf2, ${shlibs:Depends}, ${misc:Depends} Suggests: openoffice.org-evolution Section: gnome @@ -368,7 +368,7 @@ * evolution Package: openoffice.org-evolution -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Section: gnome Pre-Depends: openoffice.org-core (>= 1:3.1.0-2) Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends} @@ -400,7 +400,7 @@ Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Section: python -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Enhances: openoffice.org Depends: openoffice.org-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Replaces: openoffice.org-common (<< 1.9.82) @@ -413,7 +413,7 @@ Homepage: http://udk.openoffice.org/python/python-bridge.html Package: openoffice.org-officebean -Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 Section: java Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends}, ${misc:Depends} Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean @@ -428,7 +428,7 @@ Package: openoffice.org-filter-binfilter Section: misc -Architecture: i386 powerpc sparc mips mipsel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 Pre-Depends: openoffice.org-core (>= 1:3.1.0-2) Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<< 1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org-core (<< 1:3.1.1~rc1-2), openoffice.org2-filter-so52, openoffice.org-filter-so52 @@ -463,7 +463,7 @@ Package: libmythes-dev Section: libdevel Suggests: perl -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: ${misc:Depends} Description: simple thesaurus library -- development files MyThes is a simple thesaurus that uses a structured @@ -3096,7 +3096,7 @@ Package: uno-libs3 Section: libs -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: ure (<< 1:3.0.0~beta2-1) Description: OpenOffice.org UNO runtime environment -- public shared libraries @@ -3119,7 +3119,7 @@ Package: uno-libs3-dbg Section: debug Priority: extra -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends} Replaces: ure-dbg (<< 1:3.0.0~beta2-1) Description: OpenOffice.org UNO runtime environment -- public shared library debug symbols @@ -3141,7 +3141,7 @@ Package: ure Section: libs -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: java5-runtime, cli-uno-bridge Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-writer2latex (<< 0.5.0.2-3), openoffice.org-writer2xhtml (<< 0.5.0.2-3), openoffice.org-report-builder (<< 1:1.0.5+3.0.1-5), openoffice.org-wiki-publisher (<< 1.0+OOo3.0.1-5), openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-3) @@ -3159,7 +3159,7 @@ Package: ure-dbg Section: debug Priority: extra -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: ure (= ${ure:Version}), uno-libs3-dbg (= ${ure:Version}), ${misc:Depends} Description: OpenOffice.org UNO runtime environment -- debug symbols The Uno Runtime Environment (URE) is the well-known UNO component model @@ -3174,7 +3174,7 @@ This package contains the (detached) debug symbols for the URE. Package: openoffice.org-gcj -Architecture: i386 sparc mips mipsel s390 armel amd64 ia64 +Architecture: i386 mips mipsel s390 armel amd64 ia64 Depends: ${shlibs:Depends}, java-gcj-compat, openoffice.org-core (= ${binary:Version}), openoffice.org-java-common (= ${source:Version}), ${java-gcj-depends}, ${misc:Depends} Enhances: openoffice.org-writer, openoffice.org-base Description: full-featured office productivity suite -- Java libraries for GIJ @@ -3188,7 +3188,7 @@ Package: cli-uno-bridge Section: cli-mono -Architecture: i386 sparc amd64 ia64 +Architecture: i386 amd64 ia64 Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil, libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil, libuno-cli-ure1.0-cil, ${cli:Depends}, ${misc:Depends} Conflicts: libuno-cil, libuno-cli-types1.1-cil Provides: libuno-cil @@ -3261,7 +3261,7 @@ Package: mozilla-openoffice.org Section: net -Architecture: i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 Enhances: iceape-browser, iceweasel, mozilla-browser, @@ -3280,7 +3280,7 @@ Package: openoffice.org-ogltrans Section: graphics Priority: extra -Architecture: i386 powerpc sparc s390 amd64 ia64 ppc64 +Architecture: i386 powerpc s390 amd64 ia64 ppc64 Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1.0~), openoffice.org-impress (>> 1:3.1.0~), openoffice.org-common (>> 1:3.1.0~), ${misc:Depends} Enhances: openoffice.org-impress Replaces: openoffice.org-impress (= 1:3.1.0~rc1-1) @@ -3328,7 +3328,7 @@ Package: openoffice.org-report-builder-bin Section: misc -Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.org-base (>= 2.3.0~src680m225), ${misc:Depends} Replaces: openoffice.org-report-builder Description: OpenOffice.org extension for building database reports -- libraries @@ -3340,7 +3340,7 @@ Package: openoffice.org-presentation-minimizer Section: misc -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc 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} Enhances: openoffice.org-impress @@ -3359,7 +3359,7 @@ Package: openoffice.org-presenter-console Section: misc -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Conflicts: openoffice.org-presenter-screen Provides: openoffice.org-presenter-screen Replaces: openoffice.org-presenter-screen @@ -3387,7 +3387,7 @@ Package: openoffice.org-pdfimport Section: misc Priority: extra -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Pre-Depends: openoffice.org-common Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6), ${misc:Depends} Description: OpenOffice.org extension for importing PDF documents @@ -3411,7 +3411,7 @@ Package: openoffice.org-dbg Section: debug -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Priority: extra Depends: openoffice.org-core (= ${binary:Version}) | openoffice.org-gcj (= ${binary:Version}) | openoffice.org-dev (= ${binary:Version}) | openoffice.org-gnome (= ${binary:Version}) | openoffice.org-kde (= ${binary:Version}) | openoffice.org-calc (= ${binary:Version}) | openoffice.org-base-core (= ${binary:Version}) | openoffice.org-base (= ${binary:Version}) | openoffice.org-impress (= ${binary:Version}) | openoffice.org-filter-binfilter (= ${binary:Version}) | openoffice.org-draw (= ${binary:Version}) | openoffice.org-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-openoffice.org (= ${binary:Version}) | openoffice.org-ogltrans (= ${binary:Version}), ${misc:Depends} Recommends: ure-dbg @@ -3425,7 +3425,7 @@ Package: openoffice.org-dev Section: devel -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${dev-stl-depends}, ${misc:Depends} Recommends: dmake, g++, java-gcj-compat-dev, ${java-common-depends} Suggests: openoffice.org-dev-doc, libmythes-dev, c-shell @@ -3462,7 +3462,7 @@ It also contains the gsicheck utility. Package: openoffice.org-kde -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), ${kde-iconset-dep}, ${shlibs:Depends}, ${misc:Depends} Suggests: konqueror, kmail, openoffice.org-kab Section: kde @@ -3482,7 +3482,7 @@ * openoffice.org-kab: KDE Addressbook support Package: openoffice.org-kab -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 Pre-Depends: openoffice.org-core (>= 1:3.1.0-2) Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: kaddressbook @@ -3496,7 +3496,7 @@ Package: openoffice.org-sdbc-postgresql Section: misc -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 powerpc 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} Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212), openoffice.org-gcj (<< 2.3.0~src680m212) === modified file 'control.mysql.in' --- a/control.mysql.in 2009-08-30 18:24:18 +0000 +++ b/control.mysql.in 2009-09-16 13:28:47 +0000 @@ -4,8 +4,8 @@ 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) +Homepage: http://wiki.services.openoffice.org/wiki/Database/Drivers/MySQL_Native 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. === modified file 'rules' --- a/rules 2009-09-16 07:16:19 +0000 +++ b/rules 2009-09-21 00:07:46 +0000 @@ -81,6 +81,7 @@ BUILD_AMD64=y BUILD_PPC64=y BUILD_IA64=y +BUILD_SPARC=n PATCHSET=$(DIST) BUILD_DEPS= BUILD_PYUNO=y @@ -343,7 +344,7 @@ ifeq "$(ENABLE_OPENGL)" "y" # doesn't make that much sense on arm(el) and mips(el), does it? :) -OOO_OGLTRANS_ARCHS= i386 powerpc sparc s390 +OOO_OGLTRANS_ARCHS= i386 powerpc s390 ifeq "$(BUILD_AMD64)" "y" OOO_OGLTRANS_ARCHS+= amd64 endif @@ -353,6 +354,9 @@ ifeq "$(BUILD_PPC64)" "y" OOO_OGLTRANS_ARCHS+= ppc64 endif +ifeq "$(BUILD_SPARC)" "y" + OOO_OGLTRANS_ARCHS+= sparc +endif ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS))) ENABLE_OPENGL=n endif @@ -360,7 +364,7 @@ OOO_OGLTRANS_ARCHS= endif -OOO_ARCHS= i386 powerpc sparc mips mipsel armel s390 m68k +OOO_ARCHS= i386 powerpc mips mipsel armel s390 m68k ifeq "$(BUILD_AMD64)" "y" OOO_ARCHS += amd64 endif @@ -370,8 +374,11 @@ ifeq "$(BUILD_PPC64)" "y" OOO_ARCHS += ppc64 endif +ifeq "$(BUILD_SPARC)" "y" + OOO_ARCHS += sparc +endif # Java... -OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel s390 armel +OOO_JAVA_ARCHS = i386 powerpc mips mipsel s390 armel ifeq "$(BUILD_AMD64)" "y" OOO_JAVA_ARCHS+= amd64 endif @@ -381,6 +388,9 @@ ifeq "$(BUILD_PPC64)" "y" OOO_JAVA_ARCHS+= ppc64 endif +ifeq "$(BUILD_SPARC)" "y" + OOO_JAVA_ARCHS+= sparc +endif # gcj does not work on ppc, so no need to build -gcj for it OOO_GCJ_ARCHS := $(filter-out ppc64,$(filter-out powerpc,$(OOO_JAVA_ARCHS))) @@ -401,13 +411,16 @@ ifeq "$(ENABLE_MONO)" "y" # mono # ppc fails (#412967), arm(el), too -OOO_MONO_ARCHS = i386 sparc +OOO_MONO_ARCHS = i386 ifeq "$(BUILD_AMD64)" "y" OOO_MONO_ARCHS += amd64 endif ifeq "$(BUILD_IA64)" "y" OOO_MONO_ARCHS += ia64 endif +ifeq "$(BUILD_SPARC)" "y" + OOO_MONO_ARCHS += sparc +endif ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS))) ENABLE_MONO=n endif @@ -438,7 +451,7 @@ BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] endif -OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel s390 arm armel +OOO_MOZILLA_ARCHS=i386 powerpc mips mipsel s390 arm armel ifeq "$(BUILD_AMD64)" "y" OOO_MOZILLA_ARCHS += amd64 endif @@ -448,6 +461,9 @@ ifeq "$(BUILD_PPC64)" "y" OOO_MOZILLA_ARCHS += ppc64 endif +ifeq "$(BUILD_SPARC)" "y" + OOO_MOZILLA_ARCHS += sparc +endif ifeq "$(USE_BZIP_COMPRESS)" "y" DPKG_DEPENDS = dpkg (>= 1.10.24) @@ -931,7 +947,7 @@ CONFIGURE_FLAGS += --with-system-mysql BUILD_DEPS += , libmysqlclient-dev endif - ifeq "$(USE_SYSTEM_MSQLCPPCONN)" "y" + 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)] endif
