The following commit has been merged in the debian-experimental-3.5 branch:
commit f0010a78356c8b457a75abbb7820a6b7b9ac4e47
Author: Rene Engelhard <[email protected]>
Date: Wed Mar 6 02:20:08 2013 +0100
avoid uneeded dpkg-architecture calls, we use architecture.mk anyway
Conflicts:
rules
diff --git a/rules b/rules
index b9caa33..5de4a1e 100755
--- a/rules
+++ b/rules
@@ -575,7 +575,7 @@ ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
ifeq "$(SQUEEZE_BACKPORT)" "y"
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut
-d"." -f3,4,5)-dbg
else
- 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
endif
@@ -754,7 +754,7 @@ ifeq "$(ENABLE_JAVA)" "y"
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_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/)
endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e
s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
