[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-5-5-ga930094
The following commit has been merged in the master branch:
commit a93009464666336c97bfb56241f7dbfcd9d7d060
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 19 11:13:46 2012 +0200
re-enable -gcj
diff --git a/changelog b/changelog
index 2164945..8ac2821 100644
--- a/changelog
+++ b/changelog
@@ -9,8 +9,9 @@ libreoffice (1:3.5.4-6) UNRELEASED; urgency=high
* debian/control.in: make -filter-mobiledev Break libreoffice-core
(<< 1:3.5~) (closes: #633929)
* debian/control.mediawiki.in: add missing epoch to -core dependency
+ * debian/rules: re-enable -gcj
- -- Rene Engelhard <rene@debian.org> Wed, 20 Jun 2012 23:29:13 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Jul 2012 20:21:31 +0200
libreoffice (1:3.5.4-5) unstable; urgency=low
diff --git a/rules b/rules
index 4a018d0..629ffc3 100755
--- a/rules
+++ b/rules
@@ -443,7 +443,7 @@ ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
endif
endif
ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=n
+ BUILD_JARS_NATIVE=y
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
--
LibreOffice packaging repository
Reply to: