r20615 - in /trunk/libi18n-charset-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jun  1 17:57:45 2008
New Revision: 20615

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20615
Log:
Refresh debian/rules, no functional changes.

Modified:
    trunk/libi18n-charset-perl/debian/changelog
    trunk/libi18n-charset-perl/debian/rules

Modified: trunk/libi18n-charset-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/debian/changelog?rev=20615&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/changelog (original)
+++ trunk/libi18n-charset-perl/debian/changelog Sun Jun  1 17:57:45 2008
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Refresh patch t_utf8.patch.
+  * Refresh debian/rules, no functional changes.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 01 Jun 2008 18:03:28 +0200
 

Modified: trunk/libi18n-charset-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/debian/rules?rev=20615&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/rules (original)
+++ trunk/libi18n-charset-perl/debian/rules Sun Jun  1 17:57:45 2008
@@ -1,63 +1,56 @@
 #!/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
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
 include /usr/share/quilt/quilt.make
 
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
-
 	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-
 	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) realclean
 
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	#As this is a architecture independent package, we are not supposed to install
-	#stuff to /usr/lib. MakeMaker creates the dirs, we delete them from the deb:
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
-
-	# We don't want this alongside the Perl module.
-	$(RM) -r $(TMP)/usr/share/perl5/I18N/Charset
-
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
 	touch $@
 
 binary-arch:
-# We have nothing to do.
+# We have nothing to do here for an architecture-independent package
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
+	dh_installchangelogs Changes
 	dh_perl
-	dh_installchangelogs Changes
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -66,4 +59,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install