[pkg-db-commits] [db] 02/04: Cleanup rules after package redux

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch debian-sid
in repository db.

commit ec1519a9b38d94407807d98b1fc91a97fff2fb8c
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Feb 19 14:51:19 2014 +0100

    Cleanup rules after package redux
---
 debian/rules | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8177644..64e7ffc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,13 +64,12 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 	dh_auto_clean -Ddist -Bbuild
-	rm -f $(CURDIR)/debian/build_signature.txt
 
 override_dh_auto_test:
 	:
 
 override_dh_auto_install:
-	dh_auto_install -Ddist -Bbuild
+	dh_auto_install -Ddist -Bbuild --destdir=$(CURDIR)/debian/tmp
 
 # Remove .la files
 	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
@@ -78,39 +77,13 @@ override_dh_auto_install:
 # Remove libdb*-5.so from all packages, we don't provide generic libdb5 packages
 	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb*5.so
 
-	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
-	ln -s libdb-$(bdbversion).a $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
-
-# only works for the native build
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-# Compare built-in signature and fail build if it is different
-	cc -o$(CURDIR)/debian/db_signature \
-	   -I$(CURDIR)/debian/tmp/usr/include \
-	     $(CURDIR)/debian/db_signature.c \
-	     $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
-
-	$(CURDIR)/debian/db_signature > $(CURDIR)/debian/build_signature_$(DEB_HOST_ARCH).txt
-
-	echo -n "Berkeley DB signature is:"; $(CURDIR)/debian/db_signature
-
-	if [ -f $(CURDIR)/debian/saved_signature_$(DEB_HOST_ARCH).txt ]; then \
-	    cmp $(CURDIR)/debian/saved_signature_$(DEB_HOST_ARCH).txt         \
-	        $(CURDIR)/debian/build_signature_$(DEB_HOST_ARCH).txt         \
-	    || ( echo "Region environment signatures differ."; exit 1; );     \
-	fi
-endif
-
-	rm $(CURDIR)/debian/tmp/usr/bin/dbsql
-	rm -f $(CURDIR)/debian/tmp/usr/bin/sqlite3
+# Remove extra files from reduced build
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
 
 	for i in $(CURDIR)/debian/tmp/usr/bin/db_*; do \
 	  mv $$i $$(echo $$i | sed -e 's{usr/bin/db_{usr/bin/$(package)_{'); \
 	done
 
-override_dh_install:
-	dh_install -a -Xusr/doc --list-missing
-	tcltk-depends
-
 override_dh_clean:
 	rm -rf build
 	rm -f $(CURDIR)/debian/db_signature

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db.git