[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc2-2-9-gd44c359

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit d44c3595f0321f389b0358024be8a8bfd7fe51c4
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Apr 11 23:46:59 2013 +0200

    explicitely set JDK=openjdk again until default-jdk (>= 1:1.7-48) is in unstable

diff --git a/changelog b/changelog
index 461a916..346e3dc 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.2-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.2-1) experimental; urgency=low
 
   * LibreOffice 4.0.2 final release (identical to rc2)
 
@@ -9,8 +9,10 @@ libreoffice (1:4.0.2-1) UNRELEASED; urgency=low
     - Use internal clucene until clucene 2.x is in unstable. Remove
       arm* hack for internal clucene as it seems to work in the
       meanwhile
+    - explicitely set JDK=openjdk again until default-jdk (>= 1:1.7-48)
+      is in unstable (needed for ia64 defaulting to java7)
 
- -- Rene Engelhard <rene@debian.org>  Tue, 02 Apr 2013 12:39:08 +0200
+ -- Rene Engelhard <rene@debian.org>  Wed, 10 Apr 2013 23:15:27 +0200
 
 libreoffice (1:4.0.2~rc2-2) experimental; urgency=low
 
diff --git a/control b/control
index 55bbeaa..0c484f0 100644
--- a/control
+++ b/control
@@ -12,8 +12,6 @@ Build-Depends: ant (>= 1.7.0),
                bzip2,
                cpp-4.7,
                debhelper (>= 7.2.3~),
-               default-jdk,
-               default-jdk (>= 1:1.7-48) [ia64],
                dmake (>= 1:4.11),
                dpkg-dev (>= 1.16.1),
                fastjar,
@@ -103,6 +101,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],
                pkg-config,
                python (>= 2.6.6-3+squeeze4),
                python-dev (>= 2.6),
@@ -4415,7 +4415,6 @@ Depends: ant (>= 1.7.0),
          bzip2,
          cpp-4.7,
          debhelper (>= 7.2.3~),
-         default-jdk,
          dmake (>= 1:4.11),
          doxygen,
          dpkg-dev (>= 1.16.1),
@@ -4523,6 +4522,7 @@ 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),
          pkg-config,
          python (>= 2.6.6-3+squeeze4),
          python-dev (>= 2.6),
diff --git a/rules b/rules
index 97e45df..0443847 100755
--- a/rules
+++ b/rules
@@ -152,7 +152,7 @@ PACKAGE_TTF_OPENSYMBOL=y
 BUILD_ONLY_EN_US=n
 ENABLE_JAVA=y
 ifeq "$(ENABLE_JAVA)" "y"
-  JDK=default
+  JDK=openjdk
   JAVA_MAINVER=6
   ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
     JDK=gcj-jdk

-- 
LibreOffice packaging repository