[pkg-db-commits] [SCM] Berkeley DB v4.7 Debian packaging branch, debian-sid, updated. debian/4.7.25-16-7-ge698e5a

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit e698e5a64f51fb4e019c5d701d7f8aa763988759
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue May 3 16:32:04 2011 +0200

    Sync debian/rules with db4.x

diff --git a/debian/rules b/debian/rules
index d3eb64a..dc3742c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 INSTALL_PROGRAM += -s
 endif
 
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" 
@@ -101,7 +96,7 @@ endif
 	        debian/lib$(package)-dev/usr/lib
 	mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib
 
-	# Remove -ldb from libdb4.7-dev package
+	# Remove -ldb from libdb*-dev package
 	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
 	rm -f debian/lib$(package)-dev/usr/lib/libdb.so
 	rm -f debian/lib$(package)-dev/usr/lib/libdb-4.so

-- 
Berkeley DB v4.7 Debian packaging