./packages/openofficeorg/2.4/experimental r1032: + * debian/rules:
------------------------------------------------------------
revno: 1032
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-03-21 19:48:52 +0100
message:
+ * debian/rules:
+ - disable binfilter builds for arm(el)
+ - disable arm builds completely as it's "an obsolete arch". Still keep
+ armel (won't block testing migration)
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-03-19 14:42:27 +0000
+++ b/changelog 2008-03-21 18:48:52 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.0~rc6-1.2pre) unstable; urgency=low
* ooo-build:
- - update (r11946)
+ - update (r11980)
+ buildfix-oox-depends-on-unotools.diff: make oox
depend on unotools (closes: #471633)
+ sc-fix-value-iterator.diff; fixes e.g MIN function
@@ -12,8 +12,12 @@
* debian/*.lintian-overrides*: remove "unused-override"s
* debian/openoffice.org-{core,ogltrans}.control.bug:
Report-With: infos about fglrx and nvidia drivers
+ * debian/rules:
+ - disable binfilter builds for arm(el)
+ - disable arm builds completely as it's "an obsolete arch". Still keep
+ armel (won't block testing migration)
- -- Rene Engelhard <rene@debian.org> Wed, 19 Mar 2008 14:36:08 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 21 Mar 2008 19:46:22 +0100
openoffice.org (1:2.4.0~rc6-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-03-19 13:16:11 +0000
+++ b/control 2008-03-21 18:48:52 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxtst-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , g++-4.3 [s390], gcc-4.3 [s390] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libboost-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm s390 amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm s390 amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386 powerpc sparc mips mipsel arm s390 amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxtst-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , g++-4.3 [s390], gcc-4.3 [s390] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libboost-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), 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), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -12,7 +12,7 @@
Homepage: http://www.openoffice.org
Package: openoffice.org
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-officebean, ${ooo-binfilter-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, 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}
Conflicts: openoffice.org2 (<< ${Source-Version})
@@ -101,7 +101,7 @@
indic languages.
Package: openoffice.org-core
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled, 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-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell
@@ -142,7 +142,7 @@
the Java support for OpenOffice.org (Java classes, scripts, config snippets).
Package: openoffice.org-writer
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<< 1:2.3.1)
@@ -156,7 +156,7 @@
This package contains the wordprocessor component for OpenOffice.org.
Package: openoffice.org-calc
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${lpsolve-dep}
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 (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-calc (<< ${Source-Version})
@@ -168,7 +168,7 @@
This package contains the spreadsheet component for OpenOffice.org.
Package: openoffice.org-impress
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-draw (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-impress (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
Provides: openoffice.org2-impress
@@ -180,7 +180,7 @@
This package contains the presentation component for OpenOffice.org.
Package: openoffice.org-draw
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-draw (<< ${Source-Version}), openoffice.org-core (<< 2.2.1~rc3-3), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-draw (<< ${Source-Version})
@@ -192,7 +192,7 @@
This package contains the drawing component for OpenOffice.org.
Package: openoffice.org-math
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-math (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-math (<< ${Source-Version})
@@ -204,7 +204,7 @@
This package contains the equation editor component for OpenOffice.org.
Package: openoffice.org-base-core
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.org-base
@@ -219,7 +219,7 @@
install openoffice.org-base.
Package: openoffice.org-base
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj, openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java
@@ -309,7 +309,7 @@
enabled in the OpenOffice.org option menu.
Package: openoffice.org-kde
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-crystal, ${shlibs:Depends}
Suggests: konqueror, kmail, kaddressbook
Section: kde
@@ -330,7 +330,7 @@
* kaddressbook
Package: openoffice.org-gtk
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-tango, ${shlibs:Depends}
Section: gnome
Enhances: openoffice.org
@@ -345,7 +345,7 @@
contains a QuickStarter for the "notification area".
Package: openoffice.org-headless
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Section: misc
Enhances: openoffice.org
@@ -357,7 +357,7 @@
features which needs $DISPLAY without it.
Package: openoffice.org-gnome
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-gtk, ${shlibs:Depends}, gconf2
Suggests: openoffice.org-evolution
Section: gnome
@@ -377,7 +377,7 @@
* evolution
Package: openoffice.org-evolution
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Section: gnome
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base, ${shlibs:Depends}
Recommends: evolution
@@ -395,7 +395,7 @@
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Enhances: openoffice.org
Depends: openoffice.org-core (= ${Source-Version}), ${python:Depends}, ${shlibs:Depends}
Replaces: openoffice.org-common (<< 1.9.82)
@@ -426,7 +426,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<< 1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org2-filter-so52, openoffice.org-filter-so52
Provides: openoffice.org2-filter-so52, openoffice.org-filter-so52
@@ -488,7 +488,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
Priority: optional
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3), openoffice.org-impress
Enhances: openoffice.org-impress
Description: OpenOffice.org Presentation Minimizer extension
@@ -2976,7 +2976,7 @@
Package: ure
Section: libs
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}
Recommends: java2-runtime
Description: UNO runtime environment
@@ -2992,7 +2992,7 @@
Package: ure-dbg
Section: devel
Priority: extra
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}, ure (= ${ure:Version})
Description: UNO runtime environment -- debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
@@ -3007,7 +3007,7 @@
This package contains the (detached) debug symbols for the URE.
Package: openoffice.org-gcj
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}, java-gcj-compat, openoffice.org-core (= ${Source-Version}), openoffice.org-java-common (= ${source:Version}), ${java-gcj-depends}
Enhances: openoffice.org-writer, openoffice.org-base
Description: OpenOffice.orgs Java libraries (native for use with GIJ)
@@ -3039,7 +3039,7 @@
Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Description: OpenOffice.org Automatic Test Programs
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3097,7 +3097,7 @@
Package: openoffice.org-report-builder
Section: misc
Priority: optional
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base (>= 2.3.0~src680m225), openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
@@ -3126,7 +3126,7 @@
Package: openoffice.org-dbg
Section: devel
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Priority: extra
Suggests: ${dbg-dbg-suggests}
Description: OpenOffice.org debug symbols
@@ -3138,7 +3138,7 @@
Package: openoffice.org-dev
Section: devel
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${dev-stl-depends}
Recommends: dmake, g++, java-gcj-compat-dev, ${java-common-depends}
Suggests: openoffice.org-dev-doc, libmythes-dev, c-shell
@@ -3176,7 +3176,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
Priority: optional
-Architecture: i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212), openoffice.org-gcj (<< 2.3.0~src680m212)
Recommends: postgresql
=== modified file 'control.in'
--- a/control.in 2008-03-19 13:16:11 +0000
+++ b/control.in 2008-03-21 18:48:52 +0000
@@ -668,7 +668,7 @@
Package: openoffice.orgVER-filter-binfilter
Section: misc
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_BINFILTER_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1),
=== modified file 'rules'
--- a/rules 2008-03-18 20:26:24 +0000
+++ b/rules 2008-03-21 18:48:52 +0000
@@ -252,7 +252,7 @@
ENABLE_OGLTRANS=n
endif
-OOO_ARCHS= i386 powerpc sparc mips mipsel arm armel s390
+OOO_ARCHS= i386 powerpc sparc mips mipsel armel s390
ifeq "$(BUILD_AMD64)" "y"
OOO_ARCHS += amd64
endif
@@ -317,6 +317,12 @@
endif
OOO_SCSOLVER_ARCHS= $(filter-out armel,$(OOO_ARCHS))
+# builds long...
+ifneq (,$(findstring arm,$(ARCH)))
+ BUILD_BINFILTES=n
+endif
+OOO_BINFILTER_ARCHS=$(filter-out arm,$(filter-out armel,$(OOO_ARCHS)))
+
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
CC_PREFIX=sparc-linux-gnu-
@@ -1282,6 +1288,7 @@
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g" debian/control
ifeq (he,$(findstring he,$(LANGPACKISOS)))
perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he, openoffice.org-ctl-he/' debian/control
Reply to: