------------------------------------------------------------
revno: 1142
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-07-02 21:56:30 +0200
message:
reenable Java for armel
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-07-02 19:54:23 +0000
+++ b/changelog 2008-07-02 19:56:30 +0000
@@ -33,6 +33,8 @@
- BUILD_ONLY_EN_US=y
- remove spellchecking symlink and specify the new configure options for
specifying dictionary/hyphenation/thesauri paths.
+ - reenable Java for armel, gcj-4.3 OOM reportedly fixed. Add build-dep
+ on gcj-4,3 (>= 4.3.1-2) for armel
* debian/rules, debian/control.in:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
@@ -66,7 +68,7 @@
* debian/openoffice.org-emailmerge*: unopkg add --shared mailmerge.py
(closes: #488875)
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 02 Jul 2008 13:07:35 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 02 Jul 2008 21:54:49 +0200
openoffice.org (1:2.4.1-4) unstable; urgency=medium
=== modified file 'control'
--- a/control 2008-06-24 01:20:37 +0000
+++ b/control 2008-07-02 19:56:30 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1)
[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,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, 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) , libcurl4-openssl-dev , libssl-dev ,
libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>=
6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64]
, libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , 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] , mono-jit (>=
1.9.1+dfsg-2) [amd64] , 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 , libxslt1-dev
, libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , libhsqldb-java
(>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>=
2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1)
[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,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, 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) , libcurl4-openssl-dev , libssl-dev ,
libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>=
6.0.7~) , gcj-4.3 (>= 4.3.1-2) [armel] , java-gcj-compat-dev (>= 1.0.76-7)
[i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libgcj-bc [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , ant (>= 1.7.0) [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], ant-optional (>= 1.7.0)
[i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxerces2-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxalan2-java
(>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] ,
mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] ,
libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64
ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc
sparc mips mipsel s390 armel amd64 ppc64 ia64], libsac-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips
mipsel s390 armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libnss3-dev [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , dmake (>= 1:4.11) ,
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] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , 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 , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel
s390 armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel
s390 armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>=
5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
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),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -422,7 +422,7 @@
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
-Architecture: i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64
Section: misc
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${java-runtime-depends}, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
@@ -636,7 +636,7 @@
Package: openoffice.org-report-builder
Section: misc
Priority: optional
-Architecture: i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel s390 armel 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
=== modified file 'rules'
--- a/rules 2008-07-02 11:25:09 +0000
+++ b/rules 2008-07-02 19:56:30 +0000
@@ -297,7 +297,7 @@
OOO_ARCHS += ia64
endif
# Java...
-OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel s390
+OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel s390 armel
ifeq "$(BUILD_AMD64)" "y"
OOO_JAVA_ARCHS+= amd64
endif
@@ -519,9 +519,13 @@
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
BUILD_DEPS += , default-jdk-builddep [$(OOO_JAVA_ARCHS)]
+ ifeq "$(shell readlink $(JAVA_HOME))" "java-gcj"
+ BUILD_DEPS += , gcj-4.3 (>= 4.3.1-2) [armel]
+ endif
endif
ifeq "$(JDK)" "java-gcj-compat"
JAVA_HOME=/usr/lib/jvm/java-gcj
+ BUILD_DEPS += , gcj-4.3 (>= 4.3.1-2) [armel]
endif
ifeq "$(JDK)" "openjdk"
BUILD_DEPS += , openjdk-6-jdk [$(OOO_JAVA_ARCHS)]
