------------------------------------------------------------ revno: 1360 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Sun 2008-12-28 01:46:58 +0100 message: fix -gcjs Architecture:; remove rest (not working anyway right now) of ETCH_BACKPORT stuff modified: changelog control control.gcj.in rules
=== modified file 'changelog' --- a/changelog 2008-12-27 16:42:38 +0000 +++ b/changelog 2008-12-28 00:46:58 +0000 @@ -5,13 +5,17 @@ * debian/rules: - apply Python26 patchset if building with python 2.6 - install libsalalloc_malloc.so.3 into -qa-tools + - remove rest of if(n)eq ETCH_BACKPORT conditionals * debian/control.reportdesign.in: - add missing Depends: on ${java-runtime-depends} * debian/control.in: - only recommend ttf-liberation and change it to ttf-liberation | msttcorefonts (closes: #509193) + * 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 <r...@debian.org> Sat, 27 Dec 2008 17:38:22 +0100 + -- Rene Engelhard <r...@debian.org> Sun, 28 Dec 2008 01:36:01 +0100 openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'control' --- a/control 2008-12-25 13:55:56 +0000 +++ b/control 2008-12-28 00:46:58 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org> Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@debian.org> -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 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , 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 +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 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 @@ -3088,7 +3088,7 @@ This package contains the (detached) debug symbols for the URE. Package: openoffice.org-gcj -Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 +Architecture: i386 sparc mips mipsel s390 armel 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 2008-12-28 00:46:58 +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 2008-12-27 16:42:38 +0000 +++ b/rules 2008-12-28 00:46:58 +0000 @@ -103,7 +103,11 @@ endif PACKAGE_TTF_OPENSYMBOL=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 @@ -263,13 +267,9 @@ LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2) PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2) -ifneq "$(ETCH_BACKPORT)" "y" - OOO_STLPORT_ARCHS= i386 - ifeq "$(ARCH)" "i386" +OOO_STLPORT_ARCHS= i386 +ifeq "$(ARCH)" "i386" USE_STLPORT=y - endif -else - OOO_STLPORT_ARCHS=$(OOO_ARCHS) endif ifeq "$(ENABLE_OPENGL)" "y" @@ -312,6 +312,10 @@ ifeq "$(BUILD_PPC64)" "y" OOO_JAVA_ARCHS+= ppc64 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 @@ -360,10 +364,8 @@ # use 32-bit compiler CC_PREFIX=sparc-linux-gnu- endif -ifneq "$(ETCH_BACKPORT)" "y" - ifeq (s390,$(findstring s390,$(OOO_ARCHS))) +ifeq (s390,$(findstring s390,$(OOO_ARCHS))) BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] - endif endif OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel s390 armel @@ -568,13 +570,7 @@ endif ifeq "$(BUILD_JARS_NATIVE)" "y" CONFIGURE_FLAGS += --enable-gcjaot - ifneq "$(ETCH_BACKPORT)" "y" - BUILD_DEPS += , gij [$(OOO_JAVA_ARCHS)], java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_JAVA_ARCHS)], libgcj-bc [$(OOO_JAVA_ARCHS)] - else - BUILD_DEPS += , gij [$(OOO_JAVA_ARCHS)], java-gcj-compat-dev (>= 1.0.65-4) [$(OOO_JAVA_ARCHS)], libgcj-bc [$(OOO_JAVA_ARCHS)] - endif - else - BUILD_DEPS += , gij [$(OOO_JAVA_ARCHS)], java-gcj-compat-dev (>= 1.0.56) [$(OOO_JAVA_ARCHS)], libgcj-bc [$(OOO_JAVA_ARCHS)] + BUILD_DEPS += , gij [$(OOO_GCJ_ARCHS)], java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_GCJ_ARCHS)], libgcj-bc [$(OOO_GCJ_ARCHS)] endif ifeq "$(ENABLE_MEDIAWIKI)" "y" BUILD_DEPS += , ant (>= 1.7.0) [$(OOO_JAVA_ARCHS)], ant-optional (>= 1.7.0) [$(OOO_JAVA_ARCHS)] @@ -583,12 +579,7 @@ endif GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//) SYSTEM_SAXON=y -ifneq "$(ETCH_BACKPORT)" "y" GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/) -else - # workaround for etch; etch only has libgcj7-awt - GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/ | sed -e s/-0//) -endif DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/) JAVA_RUNTIME_DEPENDS = default-jre | java-gcj-compat # ifneq (,$(GCJ_JAWT_DEPENDS)) @@ -860,17 +851,13 @@ BUILD_DEPS += , libhsqldb-java (>= 1.8.0.9-1) [$(OOO_JAVA_ARCHS)] BASE_HSQLDB_DEPENDS = libhsqldb-java (>= 1.8.0.9-1) CONFIGURE_FLAGS+= --with-system-hsqldb - ifneq "$(ETCH_BACKPORT)" "y" JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj - endif endif ifeq "$(USE_SYSTEM_BSH)" "y" BUILD_DEPS += , bsh (>= 2.0b4-1) [$(OOO_JAVA_ARCHS)] COMMON_BSH_DEPENDS = bsh (>= 2.0b4-1) CONFIGURE_FLAGS+= --with-system-beanshell - ifneq "$(ETCH_BACKPORT)" "y" JAVA_GCJ_DEPENDS += , bsh-gcj - endif endif endif @@ -1353,6 +1340,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 @@ -1364,10 +1352,6 @@ perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he, openoffice.org-ctl-he/' debian/control endif -ifeq "$(ETCH_BACKPORT)" "y" - perl -pi -e 's/Package: openoffice.org$(VER)-core/Package: openoffice.org$(VER)-core\nRecommends: nfs-common/' debian/control -endif - perl -pi -e 's/Package: openoffice.org$(VER)-help-en-us/Package: openoffice.org$(VER)-help-en-us\nReplaces: openoffice.org$(VER)-common (<< 1:3.0.0~dev300m28)/' debian/control ifeq "$(USE_SCSOLVER)" "y" @@ -1909,7 +1893,6 @@ : # remove problematic ones rm -f debian/tmp/native-jars/ridl.jar : # compile the others -ifneq "$(ETCH_BACKPORT)" "y" # the Debian i386 buildd, although having much ram still OOMs without # this (at unoil.jar). # Also the native jar build is MUCH faster with this. But it @@ -1926,10 +1909,6 @@ PYTHONPATH="debian/scripts:$(shell echo $(PYTHON_SITE) | sed -e s,debian/python-uno,,)" \ AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/openoffice \ debian/tmp/native-jars debian/tmp/native-jars/gcj - else - AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/openoffice \ - debian/tmp/native-jars debian/tmp/native-jars/gcj -endif gcj-dbtool -n debian/tmp/native-jars/tmp.db 64 find debian/tmp/native-jars/gcj -name '*.db' -print0 \ | xargs -r -0 \ @@ -3076,9 +3055,7 @@ dh_strip -s endif dh_desktop -s -ifneq "$(ETCH_BACKPORT)" "y" dh_icons -s -endif ifeq "$(ENABLE_MONO)" "y" dh_installcligac -s endif @@ -3182,11 +3159,9 @@ -V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \ -V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \ -v$(BINARY_VERSION) -ifneq "$(ETCH_BACKPORT)" "y" - ifeq "$(ENABLE_JAVA)" "y" +ifeq "$(ENABLE_JAVA)" "y" perl -pi -e "s/java-gcj-compat/java-gcj-compat (>= 1.0.77-4)/" \ debian/openoffice.org$(VER)-officebean/DEBIAN/control - endif endif ifeq "$(ENABLE_PDFIMPORT)" "y" dh_gencontrol -popenoffice.org$(VER)-pdfimport -- \ @@ -3280,9 +3255,7 @@ dh_link -i dh_fixperms -i dh_desktop -i -ifneq "$(ETCH_BACKPORT)" "y" dh_icons -i -endif dh_installxmlcatalogs -i ifeq "$(ENABLE_MONO)" "y" dh_installcligac -i