[libunicode-map-perl] 07/15: Use dh_auto_{configure, build, test, install, clean}

Axel Beckert abe at deuxchevaux.org
Fri Dec 13 23:03:43 UTC 2013


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

abe pushed a commit to branch master
in repository libunicode-map-perl.

commit 36ef837cb0273f583ae08275fc1a8c0d33301eb8
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Fri Dec 13 23:31:38 2013 +0100

    Use dh_auto_{configure,build,test,install,clean}
    
    Adapt debian/rules for different default install path and remove
    obsolete debian/libunicode-map-perl.install.
    
    Fixes the following lintian or blhc warnings:
    
    * debian-rules-makemaker-prefix-is-deprecated
    * hardening-no-relro
    * dpkg-buildflags-missing
---
 debian/changelog                   |  6 ++++++
 debian/libunicode-map-perl.install |  2 --
 debian/rules                       | 15 ++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9e8ef8..1c26aa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,12 @@ libunicode-map-perl (0.112-11) UNRELEASED; urgency=low
   * Revamp debian/rules:
     + Fix lintian warning debian-rules-missing-recommended-target
     + Replace "dh_clean -k" by "dh_prep"
+    + Use dh_auto_{configure,build,test,install,clean}
+      - Adapt debian/rules for different default install path and remove
+        obsolete debian/libunicode-map-perl.install
+      - Fixes lintian warning debian-rules-makemaker-prefix-is-deprecated
+      - Fixes lintian warning hardening-no-relro
+      - Fixes blhc warning dpkg-buildflags-missing
   * Also fix the following lintian warnings:
     + binary-control-field-duplicates-source (priority, section)
 
diff --git a/debian/libunicode-map-perl.install b/debian/libunicode-map-perl.install
deleted file mode 100644
index c691989..0000000
--- a/debian/libunicode-map-perl.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/share/man
diff --git a/debian/rules b/debian/rules
index e1f0125..09a8cca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 #export DH_VERBOSE=1
 
 ## ----------------------------------------------------------------------
-TMP_DIR		= debian/tmp
+TMP_DIR		= debian/libunicode-map-perl
 
 ## ----------------------------------------------------------------------
 ## targets
@@ -16,7 +16,7 @@ TMP_DIR		= debian/tmp
 clean:
 		dh_testdir
 		dh_testroot
-		[ ! -f Makefile ] || $(MAKE) realclean
+		dh_auto_clean
 		[ ! -f fix-big5-stamp ] || mv debian/BIG5.map.dist Map/EASTASIA/BIG5.map
 		rm -f build-stamp install-stamp fix-big5-stamp
 		dh_clean
@@ -26,9 +26,9 @@ build-arch: build-stamp
 build-indep: build-stamp
 build-stamp: fix-big5
 		dh_testdir
-		perl Makefile.PL INSTALLDIRS=vendor
-		$(MAKE) OPTIMIZE="-O2 -g -Wall"
-		$(MAKE) test
+		dh_auto_configure
+		dh_auto_build
+		dh_auto_test
 		touch build-stamp
 
 install:	build install-stamp
@@ -37,7 +37,9 @@ install-stamp:
 		dh_testroot
 		dh_prep
 		dh_installdirs
-		$(MAKE) install PREFIX=$(CURDIR)/$(TMP_DIR)/usr
+		dh_auto_install
+		# Don't install scripts
+		rm -rf $(CURDIR)/$(TMP_DIR)/usr/bin
 		[ ! -d $(CURDIR)/$(TMP_DIR)/usr/share/man/man1 ] || \
 			$(RM) -vr $(CURDIR)/$(TMP_DIR)/usr/share/man/man1
 		touch install-stamp
@@ -56,7 +58,6 @@ binary-indep:
 binary-arch:	build install
 		dh_testdir
 		dh_testroot
-		dh_install --sourcedir=$(TMP_DIR)
 		dh_installdocs
 		dh_installexamples
 		dh_installchangelogs Changes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libunicode-map-perl.git



More information about the Pkg-perl-cvs-commits mailing list