[pkg-db-commits] [SCM] Berkeley DB Debian packaging branch, debian-sid, updated. debian/5.1.25-10-12-gd1c2ac9

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit da4ecbaa06ae34eac86e81cb3589a6e71972c604
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 28 14:26:03 2011 +0200

    Generated db_signature is different on each arch

diff --git a/debian/rules b/debian/rules
index c6840e7..7284f5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,13 +136,14 @@ override_dh_auto_install:
 	     $(CURDIR)/debian/db_signature.c \
 	     $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
 
-	$(CURDIR)/debian/db_signature > $(CURDIR)/debian/build_signature.txt
+	$(CURDIR)/debian/db_signature > $(CURDIR)/debian/build_signature_$(DEB_HOST_ARCH).txt
 
 	echo -n "Berkeley DB signature is:"; $(CURDIR)/debian/db_signature
 
-	cmp $(CURDIR)/debian/saved_signature.txt \
-	    $(CURDIR)/debian/build_signature.txt || \
-	( echo "Region environment signatures differ."; exit 1; )
+	[ -f $(CURDIR)/debian/saved_signature_$(DEB_HOST_ARCH).txt ] && ( \
+	  ( cmp $(CURDIR)/debian/saved_signature_$(DEB_HOST_ARCH).txt \
+	        $(CURDIR)/debian/build_signature_$(DEB_HOST_ARCH).txt || \
+	    ( echo "Region environment signatures differ."; exit 1; ); )
 
 	mv $(CURDIR)/debian/tmp/usr/bin/dbsql $(CURDIR)/debian/tmp/usr/bin/db_sql
 	rm -f $(CURDIR)/debian/tmp/usr/bin/sqlite3
diff --git a/debian/saved_signature.txt b/debian/saved_signature_amd64.txt
similarity index 100%
rename from debian/saved_signature.txt
rename to debian/saved_signature_amd64.txt

-- 
Berkeley DB Debian packaging