The following commit has been merged in the master branch:
commit 3c8a97cc5a6c620ca78eab69dd314b24bf765569
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 30 12:52:08 2011 +0000
adapt for /usr/lib/jvm/java-6-openjdk -> /usr/lib/jvm/java-6-openjdk-$ARCH
move in OpenJDK
diff --git a/changelog b/changelog
index d96720c..5623fbc 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:3.3.4-3) UNRELEASED; urgency=low
* debian/rules:
- fix SYSTEM_STUFF for ENABLE_JAVA=n
- don't try to run dh_nativejava if ENABLE_JAVA=n
+ - adapt for /usr/lib/jvm/java-6-openjdk ->
/usr/lib/jvm/java-6-openjdk-$ARCH
+ move in OpenJDK
-- Rene Engelhard <r...@debian.org> Mon, 29 Aug 2011 14:33:47 +0000
diff --git a/control b/control
index 165ab9c..61a536c 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev,
libssl-dev, libdb-dev, dpkg-dev (>= 1.15.1), python (>= 2.6.6-3+squeeze4),
python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk
[alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x
sparc]
, gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1)
[!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0),
gcc-mingw32, mingw32-runtime, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel],
libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfr
eebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>=
2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libpq-dev, libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java
(>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve
(>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>=
0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, libldap
2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev,
libssl-dev, libdb-dev, dpkg-dev (>= 1.15.1), python (>= 2.6.6-3+squeeze4),
python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk
(>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe
ppc64
s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64],
libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0),
ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel],
libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [am
d64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64
i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386
ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev
(>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>=
2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libpq-dev, libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java
(>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve
(>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>=
0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libor
bit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386
kfreebsd-amd64], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant
(= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], libmdds-dev (>= 0.4.0),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/rules b/rules
index 6b65c2a..7bd4184 100755
--- a/rules
+++ b/rules
@@ -693,8 +693,13 @@ ifeq "$(ENABLE_JAVA)" "y"
BUILD_DEPS += , gcj-jdk$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(JDK)" "openjdk"
+ ifeq "$(SQUEEZE_BACKPORT)" "y"
BUILD_DEPS += , openjdk-6-jdk [$(filter-out
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ else
+ BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [$(filter-out
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(ARCH)
+ endif
CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
TEST_JAVA_HOME=$(JAVA_HOME)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qytmo-0007wn...@vasks.debian.org
