[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5-1-19-g6fe3f1c
The following commit has been merged in the debian-experimental-3.6 branch:
commit 6fe3f1c96f7ea83b14e5b3ae78eb8b242287f0d5
Author: Rene Engelhard <rene@debian.org>
Date: Wed Mar 6 02:20:08 2013 +0100
avoid uneeded dpkg-architecture calls, we use architecture.mk anyway
diff --git a/rules b/rules
index c192841..a4af993 100755
--- a/rules
+++ b/rules
@@ -302,7 +302,7 @@ PACKAGE_UNOWINREG_DLL=y
ifeq "$(DEB_VENDOR)" "Debian"
BUILD_UNOWINREG_DLL=y
endif
-FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+FAKEROOT_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/libfakeroot
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -578,7 +578,7 @@ endif
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
BUILD_DEPS += , libssl-dev
- DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libssl.so | cut -d"." -f3,4,5)-dbg
+ DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
endif
ifneq "$(ENABLE_RSVG)" "y"
@@ -766,7 +766,7 @@ 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-//)
- GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
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: