[pkg-db-commits] [SCM] Berkeley DB v4.7 Debian packaging branch, debian-sid, updated. debian/4.8.30-8-9-g27e464e

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 47b25d8ffd0c54dfef9b32c9d805cfc2d6b94ef4
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 28 10:24:17 2011 +0200

    Apply MultiArch patch (Courtesy of Steve Langasek) (Closes: #631352)

diff --git a/debian/control b/debian/control
index c3d730c..4af18e4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Berkeley DB Group <pkg-db-devel at lists.alioth.debian.org>
 Uploaders: Ondřej Surý <ondrej at debian.org>
 Standards-Version: 3.9.2
-Build-Depends: procps [!hurd-i386], tcl-dev
+Build-Depends: procps [!hurd-i386], tcl-dev, dpkg-dev (>= 1.16.0)
 Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html
 Vcs-Browser: http://git.debian.org/?p=pkg-db/db4.8.git
 Vcs-Git: git://git.debian.org/pkg-db/db4.8/db.git
@@ -19,6 +19,8 @@ Description: Berkeley v4.8 Database Libraries [development]
 
 Package: libdb4.8
 Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}
 Description: Berkeley v4.8 Database Libraries [runtime]
  This is the runtime package for programs that use the v4.8 Berkeley
@@ -26,6 +28,7 @@ Description: Berkeley v4.8 Database Libraries [runtime]
 
 Package: db4.8-util
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}
 Description: Berkeley v4.8 Database Utilities
  This package provides different tools for manipulating databases
diff --git a/debian/rules b/debian/rules
index 56319cc..d959515 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,12 +18,14 @@ endif
 
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" 
 CONFIGURE_SWITCHES =    --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--localstatedir=/var \
 			--sysconfdir=/etc \
+			--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 			--libexecdir=/usr/lib \
 			--disable-cxx \
 			--enable-compat185 \
@@ -82,7 +84,7 @@ install-stamp: build
 	rm -rf debian/tmp
 	$(INSTALL_DIR) debian/tmp
 
-	cd obj && $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+	cd obj && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	touch install-stamp
 
@@ -90,40 +92,40 @@ binary-arch: checkroot build install-stamp
 	$(checkdir)
 
 	rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package)
-	$(INSTALL_DIR) debian/lib$(package)-dev/usr/lib \
+	$(INSTALL_DIR) debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH) \
 			debian/$(package)-util/usr/share/man/man1 \
-			debian/lib$(package)/usr/lib
+			debian/lib$(package)/usr/lib/$(DEB_HOST_MULTIARCH)
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	strip --remove-section=.note --remove-section=.comment \
-	      debian/tmp/usr/lib/*.so debian/tmp/usr/bin/*
-	strip --strip-debug debian/tmp/usr/lib/*.a
+	      debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/bin/*
+	strip --strip-debug debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a
 endif
 
-	chmod 644 debian/tmp/usr/lib/*.so debian/tmp/usr/include/*.h
+	chmod 644 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/include/*.h
 	chmod 755 debian/tmp/usr/bin/*
 
 	rm -f debian/tmp/usr/include/db_cxx.h
 	cp -a debian/tmp/usr/include debian/lib$(package)-dev/usr
 	cp -a debian/tmp/usr/bin debian/$(package)-util/usr
-	cp -a debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a \
-	        debian/lib$(package)-dev/usr/lib
-	mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib
+	cp -a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a \
+	        debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so debian/lib$(package)/usr/lib/$(DEB_HOST_MULTIARCH)
 
 	# Remove extra TCL library
-	rm -f debian/lib$(package)-dev/usr/lib/*tcl*
+	rm -f debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*tcl*
 
 	# Remove -ldb from libdb*-dev packages
 	#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
-	rm -f debian/lib$(package)++-dev/usr/lib/libdb_cxx.a
-	rm -f debian/lib$(package)++-dev/usr/lib/libdb_cxx.so
-	rm -f debian/lib$(package)++-dev/usr/lib/libdb_cxx-4.so
-	rm -f debian/lib$(package)-java-dev/usr/lib/libdb_java.so
-	rm -f debian/lib$(package)-java-dev/usr/lib/libdb_java-4.so
-	rm -f debian/lib$(package)-tcl/usr/lib/libdb_tcl.so
-	rm -f debian/lib$(package)-tcl/usr/lib/libdb_tcl-4.so
+	rm -f debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-4.so
+	rm -f debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx.a
+	rm -f debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx.so
+	rm -f debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx-4.so
+	rm -f debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java.so
+	rm -f debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java-4.so
+	rm -f debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_tcl.so
+	rm -f debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_tcl-4.so
 
 	cd debian/$(package)-util/usr/bin && for i in * ; \
 	 do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \

-- 
Berkeley DB v4.7 Debian packaging