The following commit has been merged in the master branch:
commit 8324db15c19ce7e281f4d0130f119d06994e506d
Author: Rene Engelhard <r...@debian.org>
Date: Mon Jul 18 11:40:32 2011 +0000
fix build with make 3.82: remove space after, in $(call
diff --git a/changelog b/changelog
index 0508242..3b34cb7 100644
--- a/changelog
+++ b/changelog
@@ -9,12 +9,13 @@ libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
* debian/rules:
- don't try to change libreoffice-base when we don't built it
- build-depend on javahelper (>= 0.37) and use -s
+ - fix build with make 3.82: remove space after, in $(call
* debian/source.lintian-overrides:
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
- also -Xlibreoffice-dbg on jh_depends...
- -- Rene Engelhard <r...@debian.org> Mon, 11 Jul 2011 14:36:16 +0000
+ -- Rene Engelhard <r...@debian.org> Mon, 18 Jul 2011 11:39:49 +0000
libreoffice (1:3.3.3-4) unstable; urgency=low
diff --git a/rules b/rules
index 204967d..9b662de 100755
--- a/rules
+++ b/rules
@@ -349,29 +349,29 @@ ifeq "$(ENABLE_OPENGL)" "y"
ifeq (,$(filter $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
- $(eval $(call gen_no_archs, OOO_OGLTRANS_ARCHS))
+ $(eval $(call gen_no_archs,OOO_OGLTRANS_ARCHS))
endif
OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x,
$(OOO_ARCHS))
# Java...
OOO_JAVA_ARCHS = $(OOO_ARCHS)
-$(eval $(call gen_no_archs, OOO_JAVA_ARCHS))
+$(eval $(call gen_no_archs,OOO_JAVA_ARCHS))
# gcj does not work on ppc, so no need to build -gcj for it
OOO_GCJ_ARCHS = $(filter-out powerpc powerpcspe ppc64, $(OOO_JAVA_ARCHS))
-$(eval $(call gen_no_archs, OOO_GCJ_ARCHS))
+$(eval $(call gen_no_archs,OOO_GCJ_ARCHS))
OOO_GCJ_JDK_ARCHS := hppa ia64 kfreebsd-i386 kfreebsd-amd64
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
-$(eval $(call gen_no_archs, OOO_OPENJDK_ARCHS))
+$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
OOO_BASE_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
-$(eval $(call gen_no_archs, OOO_BASE_ARCHS))
+$(eval $(call gen_no_archs,OOO_BASE_ARCHS))
OOO_REPORTDESIGN_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
-$(eval $(call gen_no_archs, OOO_REPORTDESIGN_ARCHS))
+$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
PACKAGE_BASE=n
@@ -472,7 +472,7 @@ endif
# stuff like the xmlsecurity (which uses nss). For the plugin only,
# change the OOO_NPSOPLUGIN_ARCHS
OOO_MOZILLA_ARCHS = $(filter-out nothing, $(OOO_ARCHS))
-$(eval $(call gen_no_archs, OOO_MOZILLA_ARCHS))
+$(eval $(call gen_no_archs,OOO_MOZILLA_ARCHS))
ifeq "$(USE_SOURCE_TARBALLS)" "n"
BUILD_DEPS += , git, rsync
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qimat-0003na...@vasks.debian.org
