The following commit has been merged in the debian-experimental-4.1 branch:
commit 236be2b8cbf7c498f1ead6efadc35624897262b2
Author: Rene Engelhard <r...@debian.org>
Date: Mon May 27 23:30:30 2013 +0200
use OpenJDK 7 on everything including kfreebsd-* - except on mips(el). Stay
with 6 there.
diff --git a/changelog b/changelog
index 8571bd3..d0d0c08 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:4.1.0~beta1-2) UNRELEASED; urgency=low
* debian/rules:
- use internal harfbuzz until we get a harfbuzz with ICU support again;
add build-conflicts on libharfbuzz-dev (= 0.9.17-3) (closes: #709973)
+ - use OpenJDK 7 on everything including kfreebsd-* - except on
+ mips(el). Stay with 6 there.
-- Rene Engelhard <r...@debian.org> Mon, 27 May 2013 18:46:52 +0200
diff --git a/control b/control
index fb83bbb..53ef466 100644
--- a/control
+++ b/control
@@ -17,8 +17,8 @@ Build-Depends: ant (>= 1.7.0),
fastjar,
flex | flex-old,
g++-mingw-w64-i686 [i386 amd64],
- gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
- gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
+ gcj-jdk [hppa],
+ gcj-native-helper [hppa],
gdb,
gettext,
gperf,
@@ -42,7 +42,7 @@ Build-Depends: ant (>= 1.7.0),
libexttextcat-dev (>= 3.1.1),
libfontconfig1-dev,
libfreetype6-dev,
- libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
+ libgcj-common (>= 1:4.4.1) [hppa],
libgconf2-dev,
libgl1-mesa-dev [!armel !mips !mipsel],
libglib2.0-dev (>= 2.15.0),
@@ -104,8 +104,8 @@ Build-Depends: ant (>= 1.7.0),
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
- openjdk-6-jdk (>= 6b23~pre8-2) [amd64 armel armhf i386 mips
mipsel powerpc powerpcspe ppc64 s390 s390x sparc],
- openjdk-7-jdk [ia64],
+ openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
+ openjdk-7-jdk [amd64 armel armhf i386 ia64 kfreebsd-amd64
kfreebsd-i386 powerpc powerpcspe ppc64 s390 s390x sparc],
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
@@ -123,26 +123,26 @@ Build-Depends-Indep: bsh (>= 2.0b4),
fdupes,
fontforge,
imagemagick,
- libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libbase-java [!hppa],
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
libcommons-logging-java (>= 1.1.1-9),
- libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
- libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
- libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
- liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
- libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa
!kfreebsd-amd64 !kfreebsd-i386],
- librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
- libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
- libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
+ libflute-java (>= 1.1.6) [!hppa],
+ libfonts-java (>= 1.1.6) [!hppa],
+ libformula-java (>= 1.1.7) [!hppa],
+ liblayout-java (>= 0.2.10) [!hppa],
+ libloader-java (>= 1.1.6) [!hppa],
+ libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa],
+ librepository-java (>= 1.1.6) [!hppa],
+ libsac-java [!hppa],
+ libserializer-java (>= 1.1.6) [!hppa],
libservlet3.0-java,
- libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
+ libxml-java (>= 1.1.6) [!hppa],
xml-core
-Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
- ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
- ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
+Build-Conflicts: ant (= 1.8.0-1) [hppa],
+ ant (= 1.8.0-2) [hppa],
+ ant (= 1.8.0-3) [hppa],
flex (= 2.5.34-1) [amd64],
g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-4.6 (= 4.6.1-10),
@@ -168,7 +168,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -181,7 +181,7 @@ Depends: fonts-sil-gentium-basic,
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libreoffice-report-builder-bin [!hppa],
libreoffice-writer,
${dejavu-depends},
${java-common-depends},
@@ -4185,7 +4185,7 @@ Description: LibreOffice component for building database
reports
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips
mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Description: LibreOffice component for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
diff --git a/rules b/rules
index 0aa7914..a8d52f8 100755
--- a/rules
+++ b/rules
@@ -153,8 +153,8 @@ BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
- JAVA_MAINVER=6
- ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
+ JAVA_MAINVER=7
+ ifneq (,$(filter hppa, $(DEB_HOST_ARCH)))
JDK=gcj-jdk
endif
endif
@@ -450,7 +450,7 @@ $(eval $(call gen_no_archs,OOO_JAVA_ARCHS))
OOO_GCJ_ARCHS = $(filter-out $(OOO_OPENJDK_ARCHS), $(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_GCJ_ARCHS))
-OOO_GCJ_JDK_ARCHS := hppa kfreebsd-i386 kfreebsd-amd64
+OOO_GCJ_JDK_ARCHS := hppa
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
@@ -825,16 +825,16 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(JDK)" "openjdk"
ifeq "$(JAVA_MAINVER)" "6"
- BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2)
[$(filter-out ia64,$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))])
- # except on ia64, which doesn't build with 6...
- ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
- BUILD_DEPS += , openjdk-7-jdk [ia64]
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2)
[$(filter-out ia64 $((OOO_GCJ_JDK_ARCHS),$(filter-out
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))])
+ else
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out mips mipsel
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ # no 7 on mips(el)
+ ifneq (,$(findstring mips,$(OOO_JAVA_ARCHS)))
+ BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel]
ifeq "$(DEB_HOST_ARCH)" "ia64"
- JAVA_MAINVER=7
+ JAVA_MAINVER=6
endif
endif
- else
- BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
endif
JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
endif
--
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/e1uh7z0-0000pj...@vasks.debian.org
