[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.3_rc2-1-17-gaa92d25
The following commit has been merged in the debian-experimental-3.5 branch:
commit aa92d25ed5a3a309f2b76a8a694c45e588341470
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 30 00:55:19 2012 +0200
temporarily stop building -gcj even on kfreebsd-* to be able to get into testing
diff --git a/changelog b/changelog
index 4bdaef6..b04e674 100644
--- a/changelog
+++ b/changelog
@@ -10,11 +10,13 @@ libreoffice (1:3.5.3~rc2-2) UNRELEASED; urgency=low
* debian/rules:
- guard libdbalo.so mv with feq PACKAGE_BASE=y...
- use make -k check
+ - (temporarily) stop building -gcj even on kfreebsd-* to be able to get into
+ testing (otherwise gcc-defaults is blocking...)
[ Björn Michaelsen ]
* add missing mimetypes to impress.desktop (LP: #904212)
- -- Rene Engelhard <rene@debian.org> Fri, 27 Apr 2012 23:38:14 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 29 Apr 2012 16:35:07 +0200
libreoffice (1:3.5.3~rc2-1) experimental; urgency=low
diff --git a/rules b/rules
index 00c3d0f..4c0777d 100755
--- a/rules
+++ b/rules
@@ -451,7 +451,7 @@ ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
endif
ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=y
+ BUILD_JARS_NATIVE=n
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
--
LibreOffice packaging repository
Reply to: