------------------------------------------------------------
revno: 1237
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2009-01-14 14:34:26 +0100
message:
disable -gcj for ppc
modified:
changelog
control
control.gcj.in
rules
=== modified file 'changelog'
--- a/changelog 2009-01-14 11:58:50 +0000
+++ b/changelog 2009-01-14 13:34:26 +0000
@@ -8,6 +8,9 @@
- add missing Depends: on ${java-runtime-depends}
* debian/presubj: point to OpenOffice.orgs README sections
("Problems During Program Startup" and "File Locking").
+ * debian/rules, control.gcj.in: disable ppc for -gcj as gij doesn't work
+ there anyway (#478760). Fix Architecture: of -gcj to not include
+ non-Java archs.
-- Rene Engelhard <[email protected]> Sun, 14 Dec 2008 23:49:35 +0100
=== modified file 'control'
--- a/control 2008-12-23 13:31:12 +0000
+++ b/control 2009-01-14 13:34:26 +0000
@@ -3,7 +3,11 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]>
+<<<<<<< TREE
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,
libcupsys2-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 , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0)
[s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390],
libglu1-mesa-dev [i386 powerpc sparc s390] , libcurl4-openssl-dev , libssl-dev
, libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>=
5.0.51~) , 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.6.5) [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] , 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.5.7) [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-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, 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) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel
amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390
armel amd64 ia64], libgcj-bc [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] , libsaxonb-java [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] , libjcommon-java (>= 1.0.10) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libloader-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libformula-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], librepository-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libjcommon-serializer-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386
powerpc sparc mips mipsel s390 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] , 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 , liblucene2-java
(>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , 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 , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
+>>>>>>> MERGE-SOURCE
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.8.0
XS-Python-Version: current
@@ -3018,7 +3022,7 @@
This package contains the (detached) debug symbols for the URE.
Package: openoffice.org-gcj
-Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Architecture: i386 sparc mips mipsel armel s390 amd64 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)
=== modified file 'control.gcj.in'
--- a/control.gcj.in 2007-11-19 00:12:19 +0000
+++ b/control.gcj.in 2009-01-14 13:34:26 +0000
@@ -1,5 +1,5 @@
Package: openoffice.orgVER-gcj
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_GCJ_ARCHS%
Depends: ${shlibs:Depends},
java-gcj-compat,
openoffice.orgVER-core (= ${Source-Version}),
=== modified file 'rules'
--- a/rules 2009-01-14 11:58:50 +0000
+++ b/rules 2009-01-14 13:34:26 +0000
@@ -95,7 +95,11 @@
PACKAGE_TTF_OPENSYMBOL=y
PACKAGE_NPSOPLUGIN=y
PACKAGE_PCVSLIB=n
-BUILD_JARS_NATIVE=y
+ifneq "$(ARCH)" "powerpc"
+ ifneq "$(ARCH)" "ppc64"
+ BUILD_JARS_NATIVE=y
+ endif
+endif
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
@@ -286,6 +290,10 @@
ifeq "$(BUILD_IA64)" "y"
OOO_JAVA_ARCHS+= ia64
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)))
+
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -1241,6 +1249,7 @@
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
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
