r1976 - packages/libfont-ttf-perl/trunk/debian

[Russ Allbery]

Author: rra
Date: 2006-01-17 03:35:27 +0000 (Tue, 17 Jan 2006)
New Revision: 1976

Modified:
   packages/libfont-ttf-perl/trunk/debian/changelog
   packages/libfont-ttf-perl/trunk/debian/control
   packages/libfont-ttf-perl/trunk/debian/rules
Log:
Bleh.  Upstream ships a bogus Makefile with the package, so we really do
need to rebuild Makefile during make clean.  (Or at least that's the
cleanest way to also not ignore failures from make distclean and still
work with regular build tools.)  Move Perl to Build-Depends as well since
it's also needed for debian/rules clean.


Modified: packages/libfont-ttf-perl/trunk/debian/changelog
===================================================================
--- packages/libfont-ttf-perl/trunk/debian/changelog	2006-01-17 03:29:47 UTC (rev 1975)
+++ packages/libfont-ttf-perl/trunk/debian/changelog	2006-01-17 03:35:27 UTC (rev 1976)
@@ -4,14 +4,14 @@
   * General rules cleanup.
     - Remove the dh_compress exceptions; the example scripts are now in a
       separate scripts package.
-    - Only run make distclean if Makefile exists.
     - Remove commented-out and unnecessary programs.
     - Remove empty /usr/lib/perl5 directory.
   * Update to debhelper compatibility level V4.
-  * Move debhelper dependency to build-depends since clean requires it.
+  * Move debhelper and perl dependency to build-depends since clean
+    requires them.
   * Update standards version to 3.6.2 (no changes required).
 
- -- Russ Allbery <rra at debian.org>  Mon, 16 Jan 2006 19:29:18 -0800
+ -- Russ Allbery <rra at debian.org>  Mon, 16 Jan 2006 19:33:58 -0800
 
 libfont-ttf-perl (0.35-1) unstable; urgency=low
 

Modified: packages/libfont-ttf-perl/trunk/debian/control
===================================================================
--- packages/libfont-ttf-perl/trunk/debian/control	2006-01-17 03:29:47 UTC (rev 1975)
+++ packages/libfont-ttf-perl/trunk/debian/control	2006-01-17 03:35:27 UTC (rev 1976)
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>, Russ Allbery <rra at debian.org>
-Build-Depends: debhelper (>= 4.0.2)
-Build-Depends-Indep: perl (>= 5.8.0-19)
+Build-Depends: debhelper (>= 4.0.2), perl (>= 5.8.0-19)
 Standards-Version: 3.6.2
 
 Package: libfont-ttf-perl

Modified: packages/libfont-ttf-perl/trunk/debian/rules
===================================================================
--- packages/libfont-ttf-perl/trunk/debian/rules	2006-01-17 03:29:47 UTC (rev 1975)
+++ packages/libfont-ttf-perl/trunk/debian/rules	2006-01-17 03:35:27 UTC (rev 1976)
@@ -24,7 +24,10 @@
 	dh_testdir
 	dh_testroot
 	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
+	# Upstream ships a bogus Makefile, so rebuilding the Makefile is
+	# the most reliable way of being able to run make distclean.
+	$(PERL) Makefile.PL
+	$(MAKE) distclean
 	dh_clean build-stamp
 
 binary-arch: build