[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.1
in repository libreoffice.
commit 74712d40712e666e888dc7d779603798e018f37e
Merge: 84183e0 88d8724
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 17 11:15:43 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
Conflicts:
changelog
control
rules
changelog | 4 ++++
control | 2 +-
libreoffice-script-provider-python.bug-script.in | 2 --
rules | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --cc changelog
index 2e4363e,69e7527..2e35b97
--- a/changelog
+++ b/changelog
@@@ -8,6 -8,7 +8,8 @@@ libreoffice (1:4.1.1~rc1-2) UNRELEASED
- don't try to package up -subsequentcheckbase on gcj-using archs
as needed stuff isn't built there
- build-depend on uuid when running make check
- - use openjdk also on kfreebsd-*
++ - use openjdk also on kfreebsd-* (if not using default-jdk, otherwise that
++ is taken)
- "fix" to also ignore check failures on kfreebsd-{i386,amd64} (assuming
openjdk use)
* debian/libreoffice-dev-doc.links: add api -> docs symlink as Javadocs
diff --cc rules
index 9b430b2,25d1716..9bcc3ac
--- a/rules
+++ b/rules
@@@ -150,17 -150,10 +150,17 @@@ PACKAGE_TTF_OPENSYMBOL=
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
- JDK=openjdk
- JAVA_MAINVER=7
- ifneq (,$(filter hppa, $(DEB_HOST_ARCH)))
- JDK=gcj-jdk
+ ifneq "$(WHEEZY_BACKPORT)" "y"
+ JDK=default
+ include /usr/share/java/java_defaults.mk
+ else
+ JDK=openjdk
+ endif
+ ifneq "$(JDK)" "default"
+ JAVA_MAINVER=7
- ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
++ ifneq (,$(filter hppa, $(DEB_HOST_ARCH)))
+ JDK=gcj-jdk
+ endif
endif
endif
JAVAHELPER_MIN_VERSION= (>= 0.37~)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: