The following commit has been merged in the master branch:
commit cc5326462f648b9adddc353a062f71455872d6e8
Author: Rene Engelhard <[email protected]>
Date: Fri Jul 20 09:46:30 2012 +0200
remove ifeq preventing -gcj to be actually in control..
diff --git a/control b/control
index 6fecc8c..bf6a5a6 100644
--- a/control
+++ b/control
@@ -3114,6 +3114,20 @@ 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 629ffc3..939fef0 100755
--- a/rules
+++ b/rules
@@ -1377,10 +1377,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)" ""
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]