[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-191-g4da21b1

["Bjoern Michaelsen" <bjoern.michaelsen@canonical.com>]

The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 327aeec84a1bab99f1c9d00acb8a4a861f1e4022
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Aug 31 11:14:47 2011 +0200

    use default jdk

diff --git a/changelog b/changelog
index ee7b9bc..cba74b5 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ libreoffice (1:3.4.2-2ubuntu3) UNRELEASED; urgency=low
 
   * also patch libgcc_s magic on powerpc
   * further tweaking for stdlibs on ppc and armel (LP: #832121)
+  * use default jdk
 
  -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 26 Aug 2011 18:18:52 +0200
 
diff --git a/rules b/rules
index 4d305f2..ee4186d 100755
--- a/rules
+++ b/rules
@@ -494,6 +494,9 @@ ifeq "$(DIST)" "Ubuntu"
   ifeq ($(DISTREL),natty)
     ENABLE_SDBC_POSTGRESQL=y
   endif
+  ifeq ($(JDK),openjdk)
+     JDK=default
+  endif
 endif
 
 ifeq "$(L10N_SEPARATE_SOURCE)" "y"

-- 
LibreOffice packaging repository