[SCM] libgd-perl Debian packaging branch, master, updated. debian/1%2.46-3.1-160-gfbaad52

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit bcea73a285056397a5313caaeeffa42723b421d7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 24 20:36:43 2013 +0200

    Tidy rules file: List build-dependencies early, and wrap at 72 chars. Tighten package-specific CDBS variables and targets (and drop obsolete ones).

diff --git a/debian/rules b/debian/rules
index 426d301..7afa271 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,31 +21,32 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/perl-makemaker.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+pkg = $(DEB_SOURCE_PACKAGE)
+
 DEB_UPSTREAM_PACKAGE = GD
 DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-authors/id/LDS/
 DEB_UPSTREAM_TARBALL_MD5 = c58b6556bddbe147c41f4e17a0de9bea
 
+# Needed by upstream build process
+CDBS_BUILD_DEPENDS +=, libgd2-dev | libgd2-xpm-dev, libjpeg-dev
+CDBS_BUILD_DEPENDS +=, libpng12-dev, libz-dev, libfreetype6-dev
+CDBS_BUILD_DEPENDS +=, libxpm-dev, libx11-dev
+
 # Suppress some graphics (in addition to default stuff)
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(demos/font_list\.png|t/test.out.*|debian/(changelog|copyright(|_hints|_newhints)))$
 
 DEB_INSTALL_DOCS_ALL += README.unix README.QUICKDRAW
 DEB_INSTALL_EXAMPLES_ALL = demos bdf_scripts qd.pl
-DEB_INSTALL_EXAMPLES_libgd-gd2-perl = $(DEB_INSTALL_EXAMPLES_ALL)
-DEB_INSTALL_EXAMPLES_libgd-gd2-noxpm-perl = $(DEB_INSTALL_EXAMPLES_ALL)
 
 # qd.pl and bdf2gdfont.pl are installed as example scripts instead
-common-binary-post-install-arch::
+binary-post-install/$(pkg)::
 	find "$(DEB_DESTDIR)" -type f -and '(' -name '*qd.pl*' -or -name '*bdf2gdfont.pl*' ')' -and -not -path '*/usr/share/doc/*' -exec rm -r '{}' ';'
 
 # Remove stray empty dirs (due to MakeMaker stupidity and above cleanup)
-common-binary-post-install-arch::
+binary-post-install/$(pkg)::
 	find "$(DEB_DESTDIR)" -empty -depth -exec rm -rf '{}' ';'
 	find "$(DEB_DESTDIR)" -type f -exec sed -i 's,/usr/local/bin/perl,/usr/bin/perl,' '{}' ';'
 
 # Manually clean leftovers
 clean::
 	rm -f GD.html pod2html* pod2htmd.tmp pod2htmi.tmp .config.cache GD/Image.pm bdf_scripts/bdf2gdfont.pl Makefile.old
-
-
-# Needed for by upstream build process
-CDBS_BUILD_DEPENDS += , libgd2-dev|libgd2-xpm-dev, libjpeg-dev, libpng12-dev, libz-dev, libfreetype6-dev, libxpm-dev, libx11-dev

-- 
libgd-perl Debian packaging