------------------------------------------------------------ revno: 1670 [merge] committer: Rene Engelhard <[email protected]> branch nick: experimental timestamp: Mon 2009-10-12 00:09:23 +0200 message: merge modified: changelog control control.in rules
=== modified file 'changelog' --- a/changelog 2009-10-10 21:25:29 +0000 +++ b/changelog 2009-10-11 22:09:23 +0000 @@ -49,6 +49,20 @@ -- Rene Engelhard <[email protected]> Sat, 10 Oct 2009 23:06:13 +0200 +openoffice.org (1:3.1.1-5) UNRELEASED; urgency=low + + * ooo-build: + - update (b9b5298e5b6e0f038786d99f12bb8190a3d607f9) + - fixes german translation (s/Verwerfen/Abbrechen) (closes: #550453) + + * debian/control.in: + - move -style-* recommends at -common to suggests (closes: #550126) + - build-depend on po-debconf + - build-depend on binutils (>= 2.20) and g{cc,++}-4.4 (>= 4.4.1-6) for + armel, see http://gcc.gnu.org/PR40521 + + -- Rene Engelhard <[email protected]> Wed, 07 Oct 2009 21:41:56 +0200 + openoffice.org (1:3.1.1-4) unstable; urgency=low * ooo-build:
=== modified file 'control' --- a/control 2009-10-04 17:15:52 +0000 +++ b/control 2009-10-11 22:09:23 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team <[email protected]> Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]> -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-cent ral (>= 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 m ipsel 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], lib nss3-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 amd 64 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-gnutls-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, po-debconf, , 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 p owerpc 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 ppc6 4 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 s 390 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-gnutls-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 @@ -115,8 +115,8 @@ Package: openoffice.org-common Architecture: all Depends: openoffice.org-style-default | openoffice.org-style, ${misc:Depends} -Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast -Recommends: openoffice.org-style-tango, openoffice.org-style-crystal, openoffice.org-style-oxygen, xfonts-mathml +Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast, openoffice.org-style-tango, openoffice.org-style-crystal, openoffice.org-style-oxygen +Recommends: xfonts-mathml Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>= 1:${basis-version}.99) Provides: openoffice.org2-common, openoffice.org-l10n-en-us Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base (<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3) @@ -342,7 +342,7 @@ Package: openoffice.org-gtk Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: openoffice.org-style-tango, +Recommends: openoffice.org-style-tango Section: gnome Enhances: openoffice.org Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), openoffice.org-common (<< 2.0.4~rc1-0) === modified file 'control.in' --- a/control.in 2009-10-04 17:15:52 +0000 +++ b/control.in 2009-10-11 22:09:23 +0000 @@ -45,7 +45,8 @@ unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, - libpq-dev + libpq-dev, + po-debconf, %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], libboost1.39-dev (<< 1.39.0-2) Standards-Version: 3.8.3 @@ -263,11 +264,11 @@ Depends: openoffice.orgVER-style-default | openoffice.orgVER-style, ${misc:Depends} Suggests: openoffice.orgVER-style-industrial, - openoffice.orgVER-style-hicontrast -Recommends: openoffice.orgVER-style-tango, + openoffice.orgVER-style-hicontrast, + openoffice.orgVER-style-tango, openoffice.orgVER-style-crystal, - openoffice.orgVER-style-oxygen, - xfonts-mathml + openoffice.orgVER-style-oxygen +Recommends: xfonts-mathml Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, @@ -594,7 +595,7 @@ Depends: openoffice.orgVER-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: openoffice.orgVER-style-tango, +Recommends: openoffice.orgVER-style-tango Section: gnome Enhances: openoffice.orgVER Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), === modified file 'rules' --- a/rules 2009-10-10 21:26:25 +0000 +++ b/rules 2009-10-11 22:09:23 +0000 @@ -464,6 +464,11 @@ ifeq (s390,$(findstring s390,$(OOO_ARCHS))) BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] endif +ifeq (armel,$(findstring armel,$(OOO_ARCHS))) + ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4" + BUILD_DEPS += , binutils (>= 2.20) [armel], gcc-4.4 (>= 4.1.1-6) [armel], g++-4.4 (>= 4.1.1-6) [armel] + endif +endif OOO_MOZILLA_ARCHS=i386 powerpc mips mipsel s390 arm armel ifeq "$(BUILD_AMD64)" "y" @@ -1588,7 +1593,7 @@ endif ifneq "$(DICT_DIR)" "/usr/share/hunspell" - perl -pi -e 's/^Breaks:.*myspell*\n//' debian/control + perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control endif .DELETE_ON_ERROR: debian/control
