[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.3-1-2-g489cacf
The following commit has been merged in the master branch:
commit cf48669d500c87afd6f1c23f1f34c1418ad3afee
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 17 15:14:48 2011 +0200
make multiarch changes conditional and skip them for squeeze (Daniel Baumann)
diff --git a/changelog b/changelog
index 66d8b68..c2dbf80 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.3.3-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - make multiarch changes conditional and skip them for squeeze
+ (Daniel Baumann)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 17 Jun 2011 15:12:15 +0200
+
libreoffice (1:3.3.3-1) unstable; urgency=medium
* new upstream release
diff --git a/rules b/rules
index a79beee..bed96c8 100755
--- a/rules
+++ b/rules
@@ -703,7 +703,11 @@ ifeq "$(ENABLE_JAVA)" "y"
BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
+ifeq "$(SQUEEZE_BACKPORT)" "y"
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
+else
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_JDK_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
+endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
# ifneq (,$(GCJ_JAWT_DEPENDS))
--
LibreOffice packaging repository
Reply to: