[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.3_rc2-1-21-g3fb6da9



The following commit has been merged in the debian-experimental-3.5 branch:
commit acc1326572a4c03a5fdf017f60657f68475ea553
Author: Rene Engelhard <rene@debian.org>
Date:   Wed May 2 00:45:05 2012 +0200

    Revert "temporarily stop building -gcj even on kfreebsd-* to be able to get into testing"
    
    This reverts commit aa92d25ed5a3a309f2b76a8a694c45e588341470.

diff --git a/changelog b/changelog
index 281c256..0ba46ba 100644
--- a/changelog
+++ b/changelog
@@ -10,13 +10,11 @@ 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>  Sun, 29 Apr 2012 16:35:07 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri, 27 Apr 2012 23:38:14 +0200
 
 libreoffice (1:3.5.3~rc2-1) experimental; urgency=low
 
diff --git a/rules b/rules
index 4c0777d..00c3d0f 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=n
+	BUILD_JARS_NATIVE=y
 endif
 
 ifeq "$(PACKAGE_NSPLUGIN)" "y"

-- 
LibreOffice packaging repository


Reply to: