[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.4-2-3-g661fbd3
The following commit has been merged in the master branch:
commit 661fbd3b6f3d050a910a23d41f9727389550ddf9
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 29 14:35:16 2011 +0000
we don't need to run dh_nativejava if ENABLE_JAVA=n
diff --git a/changelog b/changelog
index 6575f5f..d96720c 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,9 @@ libreoffice (1:3.3.4-3) UNRELEASED; urgency=low
* debian/rules:
- fix SYSTEM_STUFF for ENABLE_JAVA=n
+ - don't try to run dh_nativejava if ENABLE_JAVA=n
- -- Rene Engelhard <rene@debian.org> Sun, 28 Aug 2011 19:46:28 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 29 Aug 2011 14:33:47 +0000
libreoffice (1:3.3.4-2) unstable; urgency=medium
diff --git a/rules b/rules
index d98732d..6b65c2a 100755
--- a/rules
+++ b/rules
@@ -123,9 +123,6 @@ else
export PYTHON=python$(PYTHON_VERSION)
endif
PACKAGE_TTF_OPENSYMBOL=y
-ifeq (,$(filter $(ARCH), powerpc powerpcspe ppc64))
- BUILD_JARS_NATIVE=y
-endif
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
@@ -194,6 +191,9 @@ ifeq "$(ENABLE_JAVA)" "y"
# for UOF, but still for e.g. M$.
#SYSTEM_STUFF += saxon
SYSTEM_STUFF += lucene
+ ifeq (,$(filter $(ARCH), powerpc powerpcspe ppc64))
+ BUILD_JARS_NATIVE=y
+ endif
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
@@ -3193,8 +3193,10 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
dh_installchangelogs -s -k
dh_installmime -s
dh_installmenu -s
-ifeq "$(BUILD_JARS_NATIVE)" "y"
+ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
dh_nativejava -plibreoffice$(VER)-gcj -o
+ endif
endif
ifeq ($(PYTHON_HELPER),dh_python2)
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
--
LibreOffice packaging repository
Reply to: