[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-3-1-g680f50a

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

The following commit has been merged in the master branch:
commit 680f50a33b3a0db52c6ce494734f53fee0a76724
Author: Rene Engelhard <rene@debian.org>
Date:   Sun May 20 14:21:27 2012 +0200

    really disable -gcj package completely (not just empty package)

diff --git a/changelog b/changelog
index e3f00b9..2e50f43 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.5.3-4) UNRELEASED; urgency=low
+
+  * debian/rules: 
+    - really disable -gcj package completely (not just empty package) 
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 20 May 2012 14:20:49 +0200
+
 libreoffice (1:3.5.3-3) unstable; urgency=low
 
   [ Rene Engelhard ]
diff --git a/control b/control
index b105927..a68f623 100644
--- a/control
+++ b/control
@@ -3113,20 +3113,6 @@ Description: LibreOffice UNO runtime environment -- debug symbols
  .
  This package contains the (detached) debug symbols for the URE.
 
-Package: libreoffice-gcj
-Architecture: hppa kfreebsd-amd64 kfreebsd-i386
-Section: java
-Depends: ${shlibs:Depends}, gcj-jre, libreoffice-core (= ${binary:Version}), libreoffice-java-common (= ${source:Version}), ${java:Depends}, ${java-gcj-depends}, ${misc:Depends}
-Enhances: libreoffice-writer, libreoffice-base
-Description: office productivity suite -- Java libraries for GIJ
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the .jars from libreoffice-java-common compiled to
- native to make the Java features of LibreOffice faster when using gij.
- .
- This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-
 Package: mozilla-libreoffice
 Section: net
 Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 sparc kfreebsd-amd64 kfreebsd-i386
diff --git a/rules b/rules
index c233d81..3ebb072 100755
--- a/rules
+++ b/rules
@@ -1383,8 +1383,12 @@ endif
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
 		>> debian/control < debian/control.ure.in
 ifeq "$(ENABLE_JAVA)" "y"
+  ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
+    ifeq "$(BUILD_JARS_NATIVE)" "y"
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
 		>> debian/control < debian/control.gcj.in
+    endif
+  endif
 endif
 ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \

-- 
LibreOffice packaging repository