------------------------------------------------------------
revno: 979
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2008-01-26 23:52:46 +0100
message:
+ - 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
really add control.etch_lenny_transitional.in
added:
control.etch_lenny_transitional.in
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-01-24 19:20:04 +0000
+++ b/changelog 2008-01-26 22:52:46 +0000
@@ -8,7 +8,7 @@
not only on startup (closes: #290016)
- doesn't link libofficebean.so with -lgcj anymore (closes: #441202)
* ooo-build:
- - use trunk again (r11405)
+ - use trunk again (r11421)
- src:
+ use (new) OOH680 GSIs from ftp.linux.cz
. new: ro, gd
@@ -46,6 +46,9 @@
- enable eu and ro langpacks, enable eu help
- specify --with-max-jobs=$(NUM_CPUS) in addition to --with-num-cpus
- s/libjfreereport-java/libpentaho-reporting-flow-engine-java/
+ - 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
* debian/control.in:
- remove Provides: writer2latex from -writer, bogus (we only provide
libwriter2latex-java at all, and that with an old version). Depend
@@ -68,7 +71,7 @@
- debian/rules:
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 24 Jan 2008 20:19:25 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 26 Jan 2008 23:47:15 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-24 19:20:04 +0000
+++ b/control 2008-01-26 22:52:46 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], flex-old [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], zip [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], autoconf [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], sharutils [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64], pkg-config [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfreetype6-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], libx11-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], libsm-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], libxt-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xsltproc [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], graphicsmagick-imagemagick-compat
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], netpbm [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], fdupes [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], xml-core [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dpkg-dev (>=
1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libgl1-mesa-dev [i386 powerpc sparc amd64 ppc64], libglu1-mesa-dev [i386
powerpc sparc amd64 ppc64] , libcurl4-openssl-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libssl-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4)
[i386 powerpc sparc mips mipsel armel amd64 ppc64] , ant (>= 1.6.5) [i386
powerpc sparc mips mipsel armel amd64 ppc64] , libxerces2-java [i386 powerpc
sparc mips mipsel armel amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386
powerpc sparc mips mipsel armel amd64 ppc64] , mingw32 [i386 powerpc sparc mips
mipsel armel amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc
mips mipsel armel amd64 ppc64], libsac-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64], libxml-java [i386 powerpc sparc mips mipsel armel amd64
ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64
ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel armel amd64
ppc64], libloader-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] ,
libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libnss3-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dmake (>= 1:4.11)
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , mono-mcs (>= 1.2.3)
[i386 sparc arm armel amd64], mono-gmcs (>= 1.2.3) [i386 sparc arm armel
amd64], libmono-dev (>= 1.2.3) [i386 sparc arm armel amd64], mono-utils (>=
1.2.3) [i386 sparc arm armel amd64], cli-common-dev (>= 0.4.4) [i386 sparc arm
armel amd64], mono-1.0-devel [i386 sparc arm armel amd64], mono-2.0-devel [i386
sparc arm armel amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
, libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libicu-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libxslt1-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libcairo2-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libhsqldb-java (>=
1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , bsh (>=
2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm amd64 ppc64], lp-solve (>=
5.5.0.10-4) [i386 powerpc sparc mips mipsel arm amd64 ppc64] ,
libsuitesparse-dev [] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , libneon27-dev [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], flex-old [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], zip [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], autoconf [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], sharutils [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64], pkg-config [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfreetype6-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], libx11-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], libsm-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], libxt-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xsltproc [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], graphicsmagick-imagemagick-compat
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], netpbm [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], fdupes [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], xml-core [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dpkg-dev (>=
1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libgl1-mesa-dev [i386 powerpc sparc amd64 ppc64], libglu1-mesa-dev [i386
powerpc sparc amd64 ppc64] , libcurl4-openssl-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libssl-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4)
[i386 powerpc sparc mips mipsel armel amd64 ppc64], libgcj-bc , ant (>= 1.6.5)
[i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxerces2-java [i386
powerpc sparc mips mipsel armel amd64 ppc64] , libxalan2-java (>= 2.6.0-1)
[i386 powerpc sparc mips mipsel armel amd64 ppc64] , mingw32 [i386 powerpc
sparc mips mipsel armel amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386
powerpc sparc mips mipsel armel amd64 ppc64], libsac-java [i386 powerpc sparc
mips mipsel armel amd64 ppc64], libxml-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc
mips mipsel armel amd64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64], libloader-java [i386 powerpc sparc mips mipsel armel amd64
ppc64], libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] ,
libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libnss3-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dmake (>= 1:4.11)
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , mono-mcs (>= 1.2.3)
[i386 sparc arm armel amd64], mono-gmcs (>= 1.2.3) [i386 sparc arm armel
amd64], libmono-dev (>= 1.2.3) [i386 sparc arm armel amd64], mono-utils (>=
1.2.3) [i386 sparc arm armel amd64], cli-common-dev (>= 0.4.4) [i386 sparc arm
armel amd64], mono-1.0-devel [i386 sparc arm armel amd64], mono-2.0-devel [i386
sparc arm armel amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
, libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libicu-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libxslt1-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libcairo2-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libhsqldb-java (>=
1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , bsh (>=
2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm amd64 ppc64], lp-solve (>=
5.5.0.10-4) [i386 powerpc sparc mips mipsel arm amd64 ppc64] ,
libsuitesparse-dev [] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , libneon27-dev [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc
sparc mips mipsel arm armel 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),
gcj-4.2 (= 4.2.2-6)
Standards-Version: 3.7.2
XS-Python-Version: current
=== added file 'control.etch_lenny_transitional.in'
--- a/control.etch_lenny_transitional.in 1970-01-01 00:00:00 +0000
+++ b/control.etch_lenny_transitional.in 2008-01-26 22:52:46 +0000
@@ -0,0 +1,9 @@
+Package: openoffice.orgVER-l10n-sr-cs
+Architecture: all
+Depends: openoffice.orgVER-l10n-sr
+Description: transitional package to openoffice.orgVER-l10n-sr
+ This package is a transitional package for upgrading to the new
+ openoffice.orgVER-l10n-sr.
+ .
+ It can be safely removed when openoffice.orgVER-l10n-sr is installed.
+
=== modified file 'rules'
--- a/rules 2008-01-24 19:20:04 +0000
+++ b/rules 2008-01-26 22:52:46 +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 \
@@ -502,47 +502,37 @@
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_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
- JAVA_RUNTIME_DEPENDS = java-gcj-compat
+ 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)
+ 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
- ifeq "$(ETCH_BACKPORT)" "y"
- GCJ_JAWT_DIR=/usr/lib/gcj-4.1
- else
- GCJ_JAWT_DIR=/usr/lib/gcj-4.2-81
- endif
+ 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)
