./packages/openofficeorg/3.2.1/unstable r2048: disable Java on mips(el)
------------------------------------------------------------
revno: 2048
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-06-30 22:19:07 +0200
message:
disable Java on mips(el)
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-06-30 19:35:58 +0000
+++ b/changelog 2010-06-30 20:19:07 +0000
@@ -1,9 +1,11 @@
-openoffice.org (1:3.2.1-5) UNRELEASED; urgency=low
+openoffice.org (1:3.2.1-5) UNRELEASED; urgency=medium
* debian/rules:
- for safety, add a build-conflicts against libhsqldb-java (>> 1.8.1~)
+ - disable Java on mips as (some new) mips buildds have serious problems with
+ Java. Make mipsel follow for consistency.
- -- Rene Engelhard <rene@debian.org> Wed, 30 Jun 2010 21:32:41 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 30 Jun 2010 21:38:10 +0200
openoffice.org (1:3.2.1-4) unstable; urgency=medium
=== modified file 'control'
--- a/control 2010-06-30 19:35:58 +0000
+++ b/control 2010-06-30 20:19:07 +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), 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], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, 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] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfr
eebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openo
ffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerp
c s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libmyth
es-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 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 , librdf0-dev (>= 1.0.8) , libgtk2.0-de
v (>= 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], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, 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] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [
i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i3
86 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel
powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha am
d64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 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 , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
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), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
@@ -431,7 +431,7 @@
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
-Architecture: i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
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
@@ -3345,7 +3345,7 @@
This package contains the (detached) debug symbols for the URE.
Package: openoffice.org-gcj
-Architecture: i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc
+Architecture: i386 s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc
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: office productivity suite -- Java libraries for GIJ
=== modified file 'rules'
--- a/rules 2010-06-30 19:35:58 +0000
+++ b/rules 2010-06-30 20:19:07 +0000
@@ -115,19 +115,25 @@
endif
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
-ENABLE_JAVA=y
-JDK=openjdk
-ifeq "$(ARCH)" "ia64"
- JDK=gcj-jdk
-endif
ifneq (,$(findstring mips,$(ARCH)))
- JDK=gcj-jdk
-endif
-ifneq (,$(findstring kfreebsd,$(ARCH)))
- JDK=gcj-jdk
-endif
-ifeq "$(ARCH)" "hppa"
- JDK=gcj-jdk
+ ENABLE_JAVA=n
+else
+ ENABLE_JAVA=y
+endif
+ifeq "$(ENABLE_JAVA)" "y"
+ JDK=openjdk
+ ifeq "$(ARCH)" "ia64"
+ JDK=gcj-jdk
+ endif
+ ifneq (,$(findstring mips,$(ARCH)))
+ JDK=gcj-jdk
+ endif
+ ifneq (,$(findstring kfreebsd,$(ARCH)))
+ JDK=gcj-jdk
+ endif
+ ifeq "$(ARCH)" "hppa"
+ JDK=gcj-jdk
+ endif
endif
ENABLE_MONO=y
MONO2=y
@@ -466,7 +472,7 @@
endif
# Java...
-OOO_JAVA_ARCHS = i386 mips mipsel powerpc s390
+OOO_JAVA_ARCHS = i386 powerpc s390
ifeq "$(BUILD_KFREEBSD)" "y"
OOO_JAVA_ARCHS+= kfreebsd-i386
endif
Reply to: