./packages/openofficeorg/2.3.1/unstable r996: merge Java fixes from 2.3
------------------------------------------------------------
revno: 996
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-01-28 17:26:58 +0100
message:
merge Java fixes from 2.3
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-01-27 22:18:14 +0000
+++ b/changelog 2008-01-28 16:26:58 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.3.1-3.4pre) unstable; urgency=low
* ooo-build:
- - update (r11422)
+ - update (r11428)
+ enable jawt-check.cleanup.diff again (closes: #441202)
+ fixes fontconfig integration to ignore unavailable default fonts
like Albany MT/Tahoma MT
@@ -10,6 +10,11 @@
* debian/rules:
- fix SYSTEM_XALAN conditional to not reset SYSTEM_XML_APIS
bogusly
+ - update for gcj 4.3; detect libgcj package name/libjawt dir automatically
+ - add icedtea-java7-jre to JVM alternatives for JVM recommends/depends.
+ Place it before sun-java?-jre
+ - don't try to create a libstlport_gcc.so symlink if we don't build
+ with stlport and the readlink will fail :)
* debian/control.in:
- another Replaces: (-core) missed the epoch, thanks Chris Cheney
- make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
@@ -19,7 +24,7 @@
+ make -gcj depend on libhsqldb-java-gcj
+ some minor parallel build conditional improvements
- -- Rene Engelhard <rene@debian.org> Sat, 26 Jan 2008 21:13:04 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 28 Jan 2008 17:16:57 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-25 09:12:20 +0000
+++ b/control 2008-01-28 16:26:58 +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 amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev (>= 1.2.3) [i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64], cli-common-dev (>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc amd64], mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64], libgcj-bc , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev (>= 1.2.3) [i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64], cli-common-dev (>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc amd64], mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
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, 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)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2008-01-15 17:50:06 +0000
+++ b/rules 2008-01-28 16:26:58 +0000
@@ -23,7 +23,7 @@
UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d- -f1)
BASE_VERSION:=$(UPSTREAM_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
-HELP_L10N_VIRTUAL_VERSION:=2.3
+HELP_L10N_VIRTUAL_VERSION:=2.4
BINARY_VERSION=$(SOURCE_VERSION)
#BINARY_VERSION=2.2.0-$(shell dpkg-parsechangelog | grep urgency \
@@ -404,40 +404,38 @@
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(BUILD_JARS_NATIVE)" "y"
ifeq "$(ETCH_BACKPORT)" "n"
- BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_JAVA_ARCHS)], libgcj-bc
else
- BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.65-4) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.65-4) [$(OOO_JAVA_ARCHS)], libgcj-bc
endif
else
- BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.56) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.56) [$(OOO_JAVA_ARCHS)], libgcj-bc
endif
BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_JAVA_ARCHS)]
- GCJ_VERSION = $(shell $(JAVA_HOME)/bin/gcj --version | head -n 1 | awk '{ print $$3; }' | cut -d"." -f1,2)
+ GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
GCJ_DBTOOL = gcj-dbtool-$(GCJ_VERSION)
SYSTEM_XT=y
SYSTEM_XALAN=y
SYSTEM_XERCES=y
SYSTEM_XML_APIS=y
- ifeq "$(GCJ_VERSION)" "4.2"
- LIBGCJ_SONR=8
- else
- LIBGCJ_SONR=7
- endif
- DBG_DBG_SUGGESTS+= , libgcj$(LIBGCJ_SONR)-dbg
- ifeq "$(shell dpkg --compare-versions `dpkg -l gcj-4.1 | tail -n 1 | awk '{ print $$3 }'` ge '4.1.2-3' && echo true || echo false)" "true"
- GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-1-awt
- else
- ifeq "$(GCJ_VERSION)" "4.2"
- GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-1-awt
- else
- GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-awt
- endif
- endif
- ifeq "$(ETCH_BACKPORT)" "y"
- GCJ_JAWT_DIR=/usr/lib/gcj-4.1
- else
- GCJ_JAWT_DIR=/usr/lib/gcj-4.2-81
- endif
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
+ # workaround for etch; etch only has libgcj7-awt
+ifeq "$(ETCH_BACKPORT)" "y"
+ GCJ_JAWT_DEPENDS= $(shell echo $(GCJ_JAWT_DEPENDS) | sed -e s/-0//)
+endif
+ DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
+ JAVA_RUNTIME_DEPENDS = java-gcj-compat
+ ifneq (,$(GCJ_JAWT_DEPENDS))
+ JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
+ endif
+ ifneq (,$(filter $(ARCH), amd64 i386 powerpc))
+ JAVA_RUNTIME_DEPENDS += | icedtea-java7-jre
+ endif
+ ifneq (,$(filter $(ARCH), amd64 i386))
+ JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
+ endif
+ JAVA_RUNTIME_DEPENDS += | java2-runtime
+ GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common (>> 2.2.0-4)
@@ -2018,10 +2016,12 @@
echo "libstdc++ $$LIBSTDCPP_SOVER" > debian/shlibs.override.stdlibs; \
echo "libgcc_s $$LIBGCC_SOVER" >> debian/shlibs.override.stdlibs
endif
-ifeq "$(USE_SYSTEM_STLPORT)" "y"
+ifeq "$(USE_STLPORT)" "y"
+ ifeq "$(USE_SYSTEM_STLPORT)" "y"
rm -f $(PKGDIR)-core/$(OODIR)/program/libstlport*
ln -s `readlink /usr/lib/libstlport_gcc.so` \
debian/openoffice.org$(VER)-core/$(OODIR)/program/libstlport_gcc.so
+ endif
endif
ifeq "$(ENABLE_JAVA)" "y"
Reply to: