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

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

Author: ntyni-guest
Date: Thu Nov 29 21:16:18 2007
New Revision: 10002

URL: http://svn.debian.org/wsvn/?sc=1&rev=10002
Log:
* Minor improvements and cleanups to debian/rules.

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

Modified: trunk/mime-tools/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/mime-tools/debian/changelog?rev=10002&op=diff
==============================================================================
--- trunk/mime-tools/debian/changelog (original)
+++ trunk/mime-tools/debian/changelog Thu Nov 29 21:16:18 2007
@@ -12,8 +12,9 @@
   * Update debian/watch
   * Complete the import of the new upstream release.
   * Upgrade the libio-stringy-perl dependency to (>= 2.110)
-
- -- Niko Tyni <ntyni at iki.fi>  Thu, 29 Nov 2007 14:30:22 +0200
+  * Minor improvements and cleanups to debian/rules.
+
+ -- Niko Tyni <ntyni at iki.fi>  Thu, 29 Nov 2007 15:21:51 +0200
 
 mime-tools (5.420-2) unstable; urgency=low
 

Modified: trunk/mime-tools/debian/rules
URL: http://svn.debian.org/wsvn/trunk/mime-tools/debian/rules?rev=10002&op=diff
==============================================================================
--- trunk/mime-tools/debian/rules (original)
+++ trunk/mime-tools/debian/rules Thu Nov 29 21:16:18 2007
@@ -5,23 +5,15 @@
 PERL	?= /usr/bin/perl
 
 package	:= $(firstword $(shell dh_listpackages))
-prefix	:= $(CURDIR)/debian/$(package)/usr
-html	:= usr/share/doc/$(package)/html
-
-version	:= $(shell dpkg-parsechangelog | \
-			sed -ne 's/^Version: *\([0-9]\+:\)*//p')
-
-tag:
-	cvs tag -c -F $(subst .,_,debian_version_$(version))
-ifeq ($(findstring -,$(version)),)
-	cvs tag -c -F $(subst .,_,upstream_version_$(version))
-endif
+TMP		:= $(CURDIR)/debian/$(package)
 
 build:	build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
-	$(MAKE) LD_RUN_PATH=
+	$(PERL) Makefile.PL INSTALLDIRS=vendor \
+                INSTALLVENDORARCH=/usr/share/perl5/ \
+                VENDORARCHEXP=/usr/share/perl5/
+	$(MAKE)
 	$(MAKE) test
 	touch $@
 
@@ -30,14 +22,13 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean testout/*
 
-binary-indep:	checkroot build
-	dh_clean
+install: install-stamp
+install-stamp: checkroot build-stamp
+	dh_clean -k
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+
+binary-indep:	checkroot build install
 	dh_installdirs
-
-	$(MAKE) pure_install PREFIX=$(prefix)
-	rm -f $(prefix)/share/perl5/set-version.pl
-	rmdir --parents --ignore-fail-on-non-empty $(prefix)/lib/perl5
-
 	dh_installdocs README README-OR-DIE
 	dh_installexamples examples/*
 	dh_installchangelogs
@@ -50,7 +41,8 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-arch:	checkroot build
+binary-arch:
+	# Nothing to do.
 
 binary:	binary-indep binary-arch
 
@@ -58,4 +50,4 @@
 	dh_testdir
 	dh_testroot
 
-.PHONY:	binary binary-arch binary-indep clean checkroot build
+.PHONY:	binary binary-arch binary-indep clean checkroot build install