r11859 - in /trunk/libdatetime-astro-sunrise-perl/debian: changelog control patches/ patches/drop_stray_debug.patch patches/series rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sun Dec 30 18:23:05 2007
New Revision: 11859

URL: http://svn.debian.org/wsvn/?sc=1&rev=11859
Log:
* Add patch dropping leftover debug. Closes: #485299 -- debugging cruft on
  stderr
* debian/rules:
  + add quilt support
  + add build-stamp and install-stamp targets, make build and install depend
    on them
  + add explicit $(MAKE) invocation
* debian/control:
  + add quilt to Build-Depends

Added:
    trunk/libdatetime-astro-sunrise-perl/debian/patches/
    trunk/libdatetime-astro-sunrise-perl/debian/patches/drop_stray_debug.patch
    trunk/libdatetime-astro-sunrise-perl/debian/patches/series
Modified:
    trunk/libdatetime-astro-sunrise-perl/debian/changelog
    trunk/libdatetime-astro-sunrise-perl/debian/control
    trunk/libdatetime-astro-sunrise-perl/debian/rules

Modified: trunk/libdatetime-astro-sunrise-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdatetime-astro-sunrise-perl/debian/changelog?rev=11859&op=diff
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/changelog (original)
+++ trunk/libdatetime-astro-sunrise-perl/debian/changelog Sun Dec 30 18:23:05 2007
@@ -1,7 +1,19 @@
 libdatetime-astro-sunrise-perl (0.01.01-3) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * Use dist-based URL in debian/watch.
   * Don't install empty /usr/lib/perl5 directory.
+
+  [ Damyan Ivanov ]
+  * Add patch dropping leftover debug. Closes: #485299 -- debugging cruft on
+    stderr
+  * debian/rules:
+    + add quilt support
+    + add build-stamp and install-stamp targets, make build and install depend
+      on them
+    + add explicit $(MAKE) invocation
+  * debian/control:
+    + add quilt to Build-Depends
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 01 Dec 2007 23:33:34 +0100
 

Modified: trunk/libdatetime-astro-sunrise-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libdatetime-astro-sunrise-perl/debian/control?rev=11859&op=diff
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/control (original)
+++ trunk/libdatetime-astro-sunrise-perl/debian/control Sun Dec 30 18:23:05 2007
@@ -1,7 +1,7 @@
 Source: libdatetime-astro-sunrise-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt
 Build-Depends-Indep: perl (>= 5.8.0-7), libdatetime-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Joey Hess <joeyh at debian.org>

Added: trunk/libdatetime-astro-sunrise-perl/debian/patches/drop_stray_debug.patch
URL: http://svn.debian.org/wsvn/trunk/libdatetime-astro-sunrise-perl/debian/patches/drop_stray_debug.patch?rev=11859&op=file
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/patches/drop_stray_debug.patch (added)
+++ trunk/libdatetime-astro-sunrise-perl/debian/patches/drop_stray_debug.patch Sun Dec 30 18:23:05 2007
@@ -1,0 +1,14 @@
+# BTS #458299
+# http://rt.cpan.org/Public/Bug/Display.html?id=32007
+Index: libdatetime-astro-sunrise-perl/Sunrise.pm
+===================================================================
+--- libdatetime-astro-sunrise-perl.orig/Sunrise.pm	2007-12-30 17:04:33.000000000 +0200
++++ libdatetime-astro-sunrise-perl/Sunrise.pm	2007-12-30 17:05:36.000000000 +0200
+@@ -101,7 +101,6 @@
+         }
+ 
+         my ( $hour_rise, $min_rise, $hour_set, $min_set ) = convert_hour($tmp_rise_3,$tmp_set_3);
+-	print STDERR "me\n";
+         my $rise_time = DateTime->new(
+           year      => $dt->year,
+           month     => $dt->month,

Added: trunk/libdatetime-astro-sunrise-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libdatetime-astro-sunrise-perl/debian/patches/series?rev=11859&op=file
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/patches/series (added)
+++ trunk/libdatetime-astro-sunrise-perl/debian/patches/series Sun Dec 30 18:23:05 2007
@@ -1,0 +1,1 @@
+drop_stray_debug.patch

Modified: trunk/libdatetime-astro-sunrise-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libdatetime-astro-sunrise-perl/debian/rules?rev=11859&op=diff
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/rules (original)
+++ trunk/libdatetime-astro-sunrise-perl/debian/rules Sun Dec 30 18:23:05 2007
@@ -1,24 +1,40 @@
 #!/usr/bin/make -f
 
-build:
+include /usr/share/quilt/quilt.make
+
+PKG = $(shell dh_list_packages)
+TMP = $(CURDIR)/debian/$(PKG)
+
+ifndef PERL
+    PERL = /usr/bin/perl
+endif
+
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
+	
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE)
+	$(MAKE) test
+	
+	touch $@
 
-	perl Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) test
-
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
 	if [ -e Makefile ]; then $(MAKE) distclean; fi
-	dh_clean
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
-	$(MAKE) install DESTDIR=debian/libdatetime-astro-sunrise-perl PREFIX=/usr
-	rmdir --parents --ignore-fail-on-non-empty $(CURDIR)/debian/libdatetime-astro-sunrise-perl/usr/lib/perl5
+	
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+	    rmdir -p --ignore-fail-on-non-empty $(TMP)/usr/lib/perl5
+	touch $@
 
 binary-arch:
 
@@ -28,7 +44,6 @@
 	dh_installdocs README
 	dh_installchangelogs Changes
 	dh_perl
-	dh_link
 	dh_compress
 	dh_fixperms
 	dh_installdeb