r16465 - in /trunk/libpdf-report-perl: ./ debian/ debian/patches/
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Tue Mar 4 05:56:44 UTC 2008
Author: rra
Date: Tue Mar 4 05:56:43 2008
New Revision: 16465
URL: http://svn.debian.org/wsvn/?sc=1&rev=16465
Log:
* Switch to quilt from dpatch.
* debian/rules cleanup:
- Use $(CURDIR) instead of `pwd`.
- Add build-arch and build-indep targets.
- Add an install-stamp file and touch $@ instead of the stamp name.
- Reorganize and reformat.
Added:
trunk/libpdf-report-perl/debian/patches/example-paths (contents, props changed)
- copied, changed from r16461, trunk/libpdf-report-perl/debian/patches/30examples.dpatch
trunk/libpdf-report-perl/debian/patches/fix-addImgScaled (contents, props changed)
- copied, changed from r16461, trunk/libpdf-report-perl/debian/patches/50addimgscaled.dpatch
trunk/libpdf-report-perl/debian/patches/pod-fixes (contents, props changed)
- copied, changed from r16461, trunk/libpdf-report-perl/debian/patches/20pod.dpatch
trunk/libpdf-report-perl/debian/patches/scale-barcodes (contents, props changed)
- copied, changed from r16461, trunk/libpdf-report-perl/debian/patches/10scale.dpatch
trunk/libpdf-report-perl/debian/patches/series
trunk/libpdf-report-perl/debian/patches/uninitialized-warnings (contents, props changed)
- copied, changed from r16461, trunk/libpdf-report-perl/debian/patches/40warnings.dpatch
Removed:
trunk/libpdf-report-perl/debian/patches/00list
trunk/libpdf-report-perl/debian/patches/10scale.dpatch
trunk/libpdf-report-perl/debian/patches/20pod.dpatch
trunk/libpdf-report-perl/debian/patches/30examples.dpatch
trunk/libpdf-report-perl/debian/patches/40warnings.dpatch
trunk/libpdf-report-perl/debian/patches/50addimgscaled.dpatch
Modified:
trunk/libpdf-report-perl/ (props changed)
trunk/libpdf-report-perl/debian/changelog
trunk/libpdf-report-perl/debian/control
trunk/libpdf-report-perl/debian/rules
Propchange: trunk/libpdf-report-perl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 4 05:56:43 2008
@@ -1,0 +1,1 @@
+.pc
Modified: trunk/libpdf-report-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/changelog?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/changelog (original)
+++ trunk/libpdf-report-perl/debian/changelog Tue Mar 4 05:56:43 2008
@@ -10,6 +10,12 @@
(Closes: #467843)
[ Russ Allbery ]
+ * Switch to quilt from dpatch.
+ * debian/rules cleanup:
+ - Use $(CURDIR) instead of `pwd`.
+ - Add build-arch and build-indep targets.
+ - Add an install-stamp file and touch $@ instead of the stamp name.
+ - Reorganize and reformat.
* debian/control: Wrap Uploaders and Depends.
* Update standards version to 3.7.3 (no changes required).
Modified: trunk/libpdf-report-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/control?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/control (original)
+++ trunk/libpdf-report-perl/debian/control Tue Mar 4 05:56:43 2008
@@ -1,8 +1,8 @@
Source: libpdf-report-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9)
-Build-Depends-Indep: perl (>= 5.8.0), libpdf-api2-perl (>=0.2.3.8)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
+Build-Depends-Indep: perl (>= 5.8.0), libpdf-api2-perl (>= 0.2.3.8)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>, Allard Hoeve <allard at byte.nl>,
Niko Tyni <ntyni at iki.fi>, Russ Allbery <rra at debian.org>,
Copied: trunk/libpdf-report-perl/debian/patches/example-paths (from r16461, trunk/libpdf-report-perl/debian/patches/30examples.dpatch)
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/patches/example-paths?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/patches/30examples.dpatch (original)
+++ trunk/libpdf-report-perl/debian/patches/example-paths Tue Mar 4 05:56:43 2008
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30examples.dpatch by Niko Tyni <ntyni at iki.fi>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix examples module paths for installation.
-## DP: Originally by Gunnar Wolf <gwolf at debian.org>
+Fix examples module paths for installation.
+Originally by Gunnar Wolf <gwolf at debian.org>
- at DPATCH@
-diff -urNad trunk~/examples/barcode trunk/examples/barcode
---- trunk~/examples/barcode 2005-03-04 23:37:12.000000000 +0200
-+++ trunk/examples/barcode 2006-03-17 22:26:35.439563184 +0200
+--- libpdf-report-perl.orig/examples/barcode
++++ libpdf-report-perl/examples/barcode
@@ -1,4 +1,5 @@
-require "../Report.pm";
+#!/usr/bin/perl
@@ -16,9 +10,8 @@
my $pdf = new PDF::Report(
PageSize => letter,
-diff -urNad trunk~/examples/footer trunk/examples/footer
---- trunk~/examples/footer 2003-10-20 19:43:32.000000000 +0300
-+++ trunk/examples/footer 2006-03-17 22:26:35.440563012 +0200
+--- libpdf-report-perl.orig/examples/footer
++++ libpdf-report-perl/examples/footer
@@ -1,4 +1,5 @@
-require "../Report.pm";
+#!/usr/bin/perl
@@ -26,9 +19,8 @@
my $pdf = new PDF::Report(
PageSize => LETTER,
-diff -urNad trunk~/examples/image trunk/examples/image
---- trunk~/examples/image 2005-03-04 23:14:13.000000000 +0200
-+++ trunk/examples/image 2006-03-17 22:27:14.200897478 +0200
+--- libpdf-report-perl.orig/examples/image
++++ libpdf-report-perl/examples/image
@@ -1,4 +1,5 @@
-require "../Report.pm";
+#!/usr/bin/perl
@@ -36,9 +28,8 @@
my $pdf = new PDF::Report(
PageSize => LETTER,
-diff -urNad trunk~/examples/openpdf trunk/examples/openpdf
---- trunk~/examples/openpdf 2003-04-24 19:23:08.000000000 +0300
-+++ trunk/examples/openpdf 2006-03-17 22:26:35.440563012 +0200
+--- libpdf-report-perl.orig/examples/openpdf
++++ libpdf-report-perl/examples/openpdf
@@ -1,4 +1,5 @@
-require "../Report.pm";
+#!/usr/bin/perl
@@ -46,9 +37,8 @@
my $file = $ARGV[0];
print "Pass me a PDF file." if ! -e $file;
-diff -urNad trunk~/examples/paragraph trunk/examples/paragraph
---- trunk~/examples/paragraph 2005-01-31 21:43:09.000000000 +0200
-+++ trunk/examples/paragraph 2006-03-17 22:26:35.440563012 +0200
+--- libpdf-report-perl.orig/examples/paragraph
++++ libpdf-report-perl/examples/paragraph
@@ -1,4 +1,5 @@
-require "../Report.pm";
+#!/usr/bin/perl
@@ -56,9 +46,8 @@
my $pdf = new PDF::Report(
PageSize => letter,
-diff -urNad trunk~/examples/piegraph trunk/examples/piegraph
---- trunk~/examples/piegraph 2003-04-24 00:03:32.000000000 +0300
-+++ trunk/examples/piegraph 2006-03-17 22:26:35.441562840 +0200
+--- libpdf-report-perl.orig/examples/piegraph
++++ libpdf-report-perl/examples/piegraph
@@ -1,4 +1,5 @@
-require "../Report.pm";
+#!/usr/bin/perl
@@ -66,9 +55,8 @@
my $pdf = new PDF::Report(
PageSize => letter,
-diff -urNad trunk~/examples/rotate trunk/examples/rotate
---- trunk~/examples/rotate 2005-01-26 16:13:09.000000000 +0200
-+++ trunk/examples/rotate 2006-03-17 22:26:35.441562840 +0200
+--- libpdf-report-perl.orig/examples/rotate
++++ libpdf-report-perl/examples/rotate
@@ -1,4 +1,5 @@
-require "../Report.pm";
+#!/usr/bin/perl
Copied: trunk/libpdf-report-perl/debian/patches/fix-addImgScaled (from r16461, trunk/libpdf-report-perl/debian/patches/50addimgscaled.dpatch)
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/patches/fix-addImgScaled?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/patches/50addimgscaled.dpatch (original)
+++ trunk/libpdf-report-perl/debian/patches/fix-addImgScaled Tue Mar 4 05:56:43 2008
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50addimgscaled.dpatch by <gregor+debian at comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Fix addImgScaled() (#365471)
+Patch originally from David Pottage.
- at DPATCH@
-diff -urNad libpdf-report-perl~/Report.pm libpdf-report-perl/Report.pm
---- libpdf-report-perl~/Report.pm 2006-04-30 22:09:30.000000000 +0200
-+++ libpdf-report-perl/Report.pm 2006-04-30 22:09:30.000000000 +0200
+--- libpdf-report-perl.orig/Report.pm
++++ libpdf-report-perl/Report.pm
@@ -580,6 +580,18 @@
sub addImg {
my ( $self, $file, $x, $y ) = @_;
@@ -15,7 +10,7 @@
+ $self->addImgScaled($file, $x, $y, 1);
+}
+
-+=item $pdf->addImgScaled($file, $x, $y, $scale);
++=item $pdf->addImgScaled($file, $x, $y, $scale);
+
+Add image $file to the current page at position ($x, $y) scaled to $scale.
+
Copied: trunk/libpdf-report-perl/debian/patches/pod-fixes (from r16461, trunk/libpdf-report-perl/debian/patches/20pod.dpatch)
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/patches/pod-fixes?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/patches/20pod.dpatch (original)
+++ trunk/libpdf-report-perl/debian/patches/pod-fixes Tue Mar 4 05:56:43 2008
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20pod.dpatch by Niko Tyni <ntyni at iki.fi>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix some POD errors in the PDF::Report documentation.
-## DP: Originally by Russ Allbery <rra at debian.org>
+Fix some POD errors in the PDF::Report documentation.
+Originally by Russ Allbery <rra at debian.org>
- at DPATCH@
-diff -urNad libpdf-report-perl-1.30-4~/Report.pm libpdf-report-perl-1.30-4/Report.pm
---- libpdf-report-perl-1.30-4~/Report.pm 2006-03-17 22:14:21.946729018 +0200
-+++ libpdf-report-perl-1.30-4/Report.pm 2006-03-17 22:14:22.025715428 +0200
+--- libpdf-report-perl.orig/Report.pm
++++ libpdf-report-perl/Report.pm
@@ -67,6 +67,8 @@
=head1 METHODS
@@ -25,7 +19,7 @@
-=item PDF::API2 Removes all space between every word in the string you pass
+=pod
+
-+PDF::API2 Removes all space between every word in the string you pass
++PDF::API2 Removes all space between every word in the string you pass
and then rejoins each word with one space. If you want to use a string with
more than one space between words for formatting purposes, you can either use
the hack below or change PDF::API2 (that's what I did ;). The code below may
@@ -56,7 +50,7 @@
+ } else {
+ $new.=$nbsp . $nbsp;
+ }
-+ }
++ }
+ chop($new);
+ return $new;
}
Copied: trunk/libpdf-report-perl/debian/patches/scale-barcodes (from r16461, trunk/libpdf-report-perl/debian/patches/10scale.dpatch)
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/patches/scale-barcodes?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/patches/10scale.dpatch (original)
+++ trunk/libpdf-report-perl/debian/patches/scale-barcodes Tue Mar 4 05:56:43 2008
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10scale.dpatch by Niko Tyni <ntyni at iki.fi>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Scale barcodes correctly. (#343937)
-## DP: Originally by <jim at short.circuit.com>.
+Scale barcodes correctly. (#343937)
+Originally by <jim at short.circuit.com>.
- at DPATCH@
-diff -urNad libpdf-report-perl-1.30-4~/Report.pm libpdf-report-perl-1.30-4/Report.pm
---- libpdf-report-perl-1.30-4~/Report.pm 2006-03-17 22:10:27.000000000 +0200
-+++ libpdf-report-perl-1.30-4/Report.pm 2006-03-17 22:15:50.634471069 +0200
+--- libpdf-report-perl.orig/Report.pm
++++ libpdf-report-perl/Report.pm
@@ -918,7 +918,7 @@
$gfx->fillcolor('#ffffff');
$gfx->linewidth(0.1);
Added: trunk/libpdf-report-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/patches/series?rev=16465&op=file
==============================================================================
--- trunk/libpdf-report-perl/debian/patches/series (added)
+++ trunk/libpdf-report-perl/debian/patches/series Tue Mar 4 05:56:43 2008
@@ -1,0 +1,5 @@
+scale-barcodes
+pod-fixes
+example-paths
+uninitialized-warnings
+fix-addImgScaled
Copied: trunk/libpdf-report-perl/debian/patches/uninitialized-warnings (from r16461, trunk/libpdf-report-perl/debian/patches/40warnings.dpatch)
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/patches/uninitialized-warnings?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/patches/40warnings.dpatch (original)
+++ trunk/libpdf-report-perl/debian/patches/uninitialized-warnings Tue Mar 4 05:56:43 2008
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40warnings.dpatch by Niko Tyni <ntyni at iki.fi>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix several 'use of uninitialized value' warnings. (#354679)
+Fix several 'use of uninitialized value' warnings. (#354679)
- at DPATCH@
-diff -urNad libpdf-report-perl-1.30-4~/Report.pm libpdf-report-perl-1.30-4/Report.pm
---- libpdf-report-perl-1.30-4~/Report.pm 2006-03-17 22:11:02.073099583 +0200
-+++ libpdf-report-perl-1.30-4/Report.pm 2006-03-17 22:11:02.169083078 +0200
+--- libpdf-report-perl.orig/Report.pm
++++ libpdf-report-perl/Report.pm
@@ -149,7 +149,7 @@
__font_cache => {},
};
@@ -44,7 +38,7 @@
# This will print a footer if no $callback is passed for backwards
# compatibility
- } elsif ($callback !~ /none/i) {
-+ } elsif (defined $callback && $callback !~ /none/i) {
++ } elsif (defined $callback && $callback !~ /none/i) {
&gen_page_footer($self, $total, $callback);
}
Modified: trunk/libpdf-report-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libpdf-report-perl/debian/rules?rev=16465&op=diff
==============================================================================
--- trunk/libpdf-report-perl/debian/rules (original)
+++ trunk/libpdf-report-perl/debian/rules Tue Mar 4 05:56:43 2008
@@ -7,45 +7,43 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+# Use quilt to manage patches.
+include /usr/share/quilt/quilt.make
-PACKAGE=$(shell dh_listpackages)
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+PERL ?= /usr/bin/perl
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP =`pwd`/debian/$(PACKAGE)
-
-build: patch build-stamp
-build-stamp:
+build: build-arch build-indep
+build-arch:
+build-indep: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
$(MAKE) test
- touch build-stamp
+ touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp install-stamp
[ ! -e Makefile ] || $(MAKE) distclean
dh_clean
-install:
+install: install-stamp
+install-stamp:
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
$(MAKE) install PREFIX=$(TMP)/usr
[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+ touch $@
-# Build architecture-independent files here.
-binary-indep: build install
+binary: binary-arch binary-indep
+binary-arch:
+binary-indep: build-stamp install-stamp
dh_testdir
dh_testroot
dh_installdocs -XChanges
@@ -60,11 +58,7 @@
dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb --destdir=$(DESTDIR)
+ dh_builddeb
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: binary binary-arch binary-indep build build-arch build-indep clean
+.PHONY: install
More information about the Pkg-perl-cvs-commits
mailing list