[libreoffice] 03/03: build using gcj-jdk for kfreebsd-* on wheezy-backports

[Rene Engelhard <rene@alioth.debian.org>]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 5cca04e7c3c1dacd05cd677bd4f116c807a6c97f
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Sep 5 21:58:37 2013 +0200

    build using gcj-jdk for kfreebsd-* on wheezy-backports
---
 changelog |    1 +
 control   |    2 +-
 rules     |   11 ++++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 70ec2f0..9e1c93a 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ libreoffice (1:4.1.1-2) UNRELEASED; urgency=low
   * debian/rules:
     - fix curl conditional to really add libcurl4-<whatever>-dev builddep....
     - disable graphite2 for armel and sparc for wheezy-backports
+    - build using gcj-jdk for kfreebsd-* on wheezy-backports
 
  -- Rene Engelhard <rene@debian.org>  Tue, 03 Sep 2013 18:05:31 +0200
 
diff --git a/control b/control
index 1d99bb0..be1e980 100644
--- a/control
+++ b/control
@@ -170,7 +170,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
diff --git a/rules b/rules
index edef869..40a1249 100755
--- a/rules
+++ b/rules
@@ -158,8 +158,14 @@ ifeq "$(ENABLE_JAVA)" "y"
   endif
   ifneq "$(JDK)" "default"
     JAVA_MAINVER=7
-    ifneq (,$(filter hppa, $(DEB_HOST_ARCH)))
+    ifeq "$(WHEEZY_BACKPORT)" "y"
+      ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
+      JDK=gcj-jdk
+      endif
+    else
+      ifneq (,$(filter hppa, $(DEB_HOST_ARCH)))
       JDK=gcj-jdk
+      endif
     endif
   endif
 endif
@@ -452,6 +458,9 @@ ifeq "$(JDK)" "default"
 OOO_GCJ_JDK_ARCHS := $(filter $(OOO_ARCHS),$(filter-out $(java7_architectures) kfreebsd%,$(filter-out $(java6_architectures),$(java5_architectures))))
 else
 OOO_GCJ_JDK_ARCHS := hppa
+ifeq "$(WHEEZY_BACKPORT)" "y"
+OOO_GCJ_JDK_ARCHS += kfreebsd-i386 kfreebsd-amd64
+endif
 endif
 OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
 $(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git