[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1-1-8-g5e923f8

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

The following commit has been merged in the debian-experimental-3.6 branch:
commit 90dab11ec998a33374c9bfc76e31a3f85dc39a89
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Sep 10 18:37:09 2012 +0200

    +    - fix native-hars dependeny to depend on install-common ...
    +    - ... but as this doesn't build then disable it for now...

diff --git a/changelog b/changelog
index b9826a3..3d4786b 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,9 @@ libreoffice (1:3.6.1-2) UNRELEASED; urgency=low
   * debian/control.in:
     - make -core break libreoffice-common (<< 1:3.6.1~rc1) as "unopkg sync"
       ran in the triggers is gone (closes: #686666)
+  * debian/rules:
+    - fix native-hars dependeny to depend on install-common ... 
+    - ... but as this doesn't build then disable it for now...
 
  -- Rene Engelhard <rene@debian.org>  Wed, 05 Sep 2012 14:26:21 +0200
 
diff --git a/control b/control
index 8c3fdca..41c2048 100644
--- a/control
+++ b/control
@@ -3084,20 +3084,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: libreoffice-ogltrans
 Section: graphics
 Priority: extra
diff --git a/rules b/rules
index 0a1accd..5b2c597 100755
--- a/rules
+++ b/rules
@@ -459,7 +459,7 @@ ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
   endif
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
-	BUILD_JARS_NATIVE=y
+	BUILD_JARS_NATIVE=n
 endif
 
 ifeq "$(PACKAGE_NSPLUGIN)" "y"
@@ -1386,10 +1386,10 @@ endif
 		>> debian/control < debian/control.ure.in
 ifeq "$(ENABLE_JAVA)" "y"
   ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
-#    ifeq "$(BUILD_JARS_NATIVE)" "y"
+    ifeq "$(BUILD_JARS_NATIVE)" "y"
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
 		>> debian/control < debian/control.gcj.in
- #   endif
+    endif
   endif
 endif
 ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
@@ -1974,7 +1974,7 @@ endif
 	touch $@
 
 native-jars: $(STAMP_NATIVE_JARS)
-$(STAMP_NATIVE_JARS): $(STAMP_DIR)/install
+$(STAMP_NATIVE_JARS): $(STAMP_DIR)/install-common
 ifeq "$(BUILD_JARS_NATIVE)" "y"
 	rm -rf debian/tmp/native-jars
 	mkdir -p debian/tmp/native-jars/gcj

-- 
LibreOffice packaging repository