r13506 - in /trunk/libimage-exif-perl/debian: changelog libimage-exif-perl.examples rules
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Fri Jan 25 10:31:41 UTC 2008
Author: dmn
Date: Fri Jan 25 10:31:40 2008
New Revision: 13506
URL: http://svn.debian.org/wsvn/?sc=1&rev=13506
Log:
* debian/rules: more cleanup
* -Wall is in $(CFLAGS) already. No need to add it to OPTIMIZE="..."
* use $(TMP) as convenient shortcut to debian/lbimage-exif-perl
* Do not ignore distclean errors
+ as upstream ships broker Makefile, before invoking $(MAKE) distclean,
invoke $(PERL) Makefile.PL to re-generate Makefile.
* remove unused dh_installdirs and dh_installman
* move debian/libimage-exif-perl.examples's contents to arguments of
dh_installexamples
Removed:
trunk/libimage-exif-perl/debian/libimage-exif-perl.examples
Modified:
trunk/libimage-exif-perl/debian/changelog
trunk/libimage-exif-perl/debian/rules
Modified: trunk/libimage-exif-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/changelog?rev=13506&op=diff
==============================================================================
--- trunk/libimage-exif-perl/debian/changelog (original)
+++ trunk/libimage-exif-perl/debian/changelog Fri Jan 25 10:31:40 2008
@@ -30,7 +30,15 @@
* debian/rules: leave nostrip support to dh_strip
[ Damyan Ivanov ]
- * -Wall is in $(CFLAGS) already. No need to add it to OPTIMIZE="..."
+ * debian/rules: more cleanup
+ * -Wall is in $(CFLAGS) already. No need to add it to OPTIMIZE="..."
+ * use $(TMP) as convenient shortcut to debian/lbimage-exif-perl
+ * Do not ignore distclean errors
+ + as upstream ships broker Makefile, before invoking $(MAKE) distclean,
+ invoke $(PERL) Makefile.PL to re-generate Makefile.
+ * remove unused dh_installdirs and dh_installman
+ * move debian/libimage-exif-perl.examples's contents to arguments of
+ dh_installexamples
-- gregor herrmann <gregor+debian at comodo.priv.at> Fri, 25 Jan 2008 00:05:33 +0100
Modified: trunk/libimage-exif-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/rules?rev=13506&op=diff
==============================================================================
--- trunk/libimage-exif-perl/debian/rules (original)
+++ trunk/libimage-exif-perl/debian/rules Fri Jan 25 10:31:40 2008
@@ -20,6 +20,9 @@
PERL = /usr/bin/perl
endif
+PACKAGE=$(shell dh_listpackages)
+TMP=$(CURDIR)/debian/$(PACKAGE)
+
build: build-stamp
build-stamp: $(QUILT_STAMPFN)
dh_testdir
@@ -35,25 +38,27 @@
dh_clean build-stamp install-stamp
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
- rm -f Makefile.old
+ # upstream ships broken Makefile. We re-create it here so the
+ # distclean can work
+ # http://rt.cpan.org/Public/Bug/Display.html?id=32641
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ [ ! -e Makefile ] || \
+ ( $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) distclean )
install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
+ dh_clean -k
# Add here commands to install the package into debian/libimage-exif/usr
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libimage-exif-perl PREFIX=/usr
- [ ! -d $(CURDIR)/debian/libimage-exif-perl/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(CURDIR)/debian/libimage-exif-perl/usr/share/perl5
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5
- rm $(CURDIR)/debian/libimage-exif-perl/usr/lib/perl5/Image/rename.pl
- rm $(CURDIR)/debian/libimage-exif-perl/usr/lib/perl5/Image/t.pl
- rm $(CURDIR)/debian/libimage-exif-perl/usr/lib/perl5/Image/create_web_gallery.pl
+ rm $(TMP)/usr/lib/perl5/Image/rename.pl
+ rm $(TMP)/usr/lib/perl5/Image/t.pl
+ rm $(TMP)/usr/lib/perl5/Image/create_web_gallery.pl
# Build architecture-independent files here.
binary-indep: build install
@@ -65,8 +70,7 @@
dh_testroot
dh_installchangelogs Changes
dh_installdocs
- dh_installexamples
- dh_installman
+ dh_installexamples rename.pl create_web_gallery.pl
dh_strip
dh_compress
dh_fixperms
More information about the Pkg-perl-cvs-commits
mailing list