r18005 - in /trunk/mime-tools/debian: changelog rules

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Wed Mar 26 19:37:23 2008
New Revision: 18005

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18005
Log:
Refresh debian/changelog with dh-make-perl's help.

Modified:
    trunk/mime-tools/debian/changelog
    trunk/mime-tools/debian/rules

Modified: trunk/mime-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/debian/changelog?rev=18005&op=diff
==============================================================================
--- trunk/mime-tools/debian/changelog (original)
+++ trunk/mime-tools/debian/changelog Wed Mar 26 19:37:23 2008
@@ -4,8 +4,9 @@
   * debian/control:
     - bump dependency on libfile-temp-perl to 0.18
     - add /me to Uploaders
-
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 26 Mar 2008 20:26:59 +0100
+  * Refresh debian/changelog with dh-make-perl's help.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 26 Mar 2008 20:32:51 +0100
 
 mime-tools (5.425-2) unstable; urgency=low
 

Modified: trunk/mime-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/debian/rules?rev=18005&op=diff
==============================================================================
--- trunk/mime-tools/debian/rules (original)
+++ trunk/mime-tools/debian/rules Wed Mar 26 19:37:23 2008
@@ -1,6 +1,8 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-# debian/rules file for libmime-perl
+#!/usr/bin/make -f
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -9,17 +11,14 @@
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
 
-PERL	?= /usr/bin/perl
+PERL   ?= /usr/bin/perl
+PACKAGE = $(firstword $(shell dh_listpackages))
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-PACKAGE	:= $(firstword $(shell dh_listpackages))
-TMP	:= $(CURDIR)/debian/$(PACKAGE)
-
-build:	build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor \
-                INSTALLVENDORARCH=/usr/share/perl5/ \
-                VENDORARCHEXP=/usr/share/perl5/
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
 	touch $@
@@ -36,17 +35,19 @@
 	dh_testroot
 	dh_clean -k
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
 	touch $@
 
 binary-arch:
-	# Nothing to do.
+# We have nothing to do here for an architecture-independent package
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdirs
+	dh_installexamples examples/*
 	dh_installdocs
-	dh_installexamples examples/*
 	dh_installchangelogs ChangeLog
 	dh_perl
 	dh_compress
@@ -56,6 +57,5 @@
 	dh_md5sums
 	dh_builddeb
 
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install