Package: libfile-slurp-perl Severity: wishlist Tags: patch Hi,
The dpatch patch management system has been deprecated for some time. The Lintian currently flags use of dpatch packages as an error. The new 3.0 packaging format is an improved version which, among other things, contains patch management built-in. For more information, see: http://wiki.debian.org/Projects/DebSrc3.0 I had some free time; see attached patch to migrate to new package format. Note that all files in debian/patches/* are canocalized to *.patch. Let me know if there is anything that needs adjusting or if it is ok to upload this version in a NMU in case you are working on other issues needing attention. Thanks, Jari
>From 3e072a67519a88004a72f36236de46605bcba4f1 Mon Sep 17 00:00:00 2001 From: Jari Aalto <jari.aa...@cante.net> Date: Sat, 5 May 2012 19:14:37 +0300 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <jari.aa...@cante.net> --- debian/README.source | 38 -------------------- debian/changelog | 10 ++++++ debian/compat | 2 +- debian/control | 4 +-- debian/copyright | 2 +- debian/libfile-slurp-perl.docs | 2 +- debian/patches/00list | 3 -- .../{01_binmode.dpatch => 01-binmode.patch} | 8 ++--- debian/patches/series | 3 ++ debian/rules | 11 +++--- debian/source/format | 1 + 11 files changed, 28 insertions(+), 56 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/00list rename debian/patches/{01_binmode.dpatch => 01-binmode.patch} (94%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index fc98b3d..0000000 --- a/debian/README.source +++ /dev/null @@ -1,38 +0,0 @@ -This package uses dpatch to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To get the fully patched source after unpacking the source package, cd -to the root level of the source package and run: - - debian/rules patch - -Removing a patch is as simple as removing its entry from the -debian/patches/00list file, and please also remove the patch file -itself. - -Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" -where you should replace XX with a new number and patchname with a -descriptive shortname of the patch. You can then simply edit all the -files your patch wants to edit, and then simply "exit 0" from the shell -to actually create the patch file. - -To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" -and replace XX_patchname with the actual filename from debian/patches -you want to use. - -To clean up afterwards again, "debian/rules unpatch" will do the -work for you - or you can of course choose to call -"fakeroot debian/rules clean" all together. - - ---- - -this documentation is part of dpatch package, and may be used by -packages using dpatch to comply with policy on README.source. This -documentation is meant to be useful to users who are not proficient in -dpatch in doing work with dpatch-based packages. Please send any -improvements to the BTS of dpatch package. - -original text by Gerfried Fuchs, edited by Junichi Uekawa <dan...@debian.org> -10 Aug 2008. diff --git a/debian/changelog b/debian/changelog index 8889fae..f00f9da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libfile-slurp-perl (9999.19-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". + * Update to Standards-Version to 3.9.3 and debhelper to 9. + * Add build-arch and build-indep targets to rules file. + * Fix copyright-refers-to-symlink-license (Lintian). + + -- Jari Aalto <jari.aa...@cante.net> Sat, 05 May 2012 19:09:18 +0300 + libfile-slurp-perl (9999.19-1) unstable; urgency=low * New upstream release, diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 18eb688..4ce740f 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: libfile-slurp-perl Section: perl Priority: optional Maintainer: Alexander Zangerl <a...@debian.org> -Build-Depends: debhelper (>= 7.0.0), dpatch +Build-Depends: debhelper (>= 9) Build-Depends-Indep: perl, libtest-pod-coverage-perl, libtest-pod-perl -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Package: libfile-slurp-perl Architecture: all diff --git a/debian/copyright b/debian/copyright index cb5af76..413f399 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,5 +11,5 @@ Licensed the same as Perl." Perl is distributed under your choice of the GNU General Public License or the Artistic License. On Debian GNU/Linux systems, the complete text of the -GNU General Public License can be found in `/usr/share/common-licenses/GPL' +GNU General Public License can be found in `/usr/share/common-licenses/GPL-2' and the Artistic Licence in `/usr/share/common-licenses/Artistic'. diff --git a/debian/libfile-slurp-perl.docs b/debian/libfile-slurp-perl.docs index 0da37bf..ba8894c 100644 --- a/debian/libfile-slurp-perl.docs +++ b/debian/libfile-slurp-perl.docs @@ -1,2 +1,2 @@ README -debian/README.source + diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 06fca37..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,3 +0,0 @@ -01_binmode - - diff --git a/debian/patches/01_binmode.dpatch b/debian/patches/01-binmode.patch similarity index 94% rename from debian/patches/01_binmode.dpatch rename to debian/patches/01-binmode.patch index d794b5e..304c624 100644 --- a/debian/patches/01_binmode.dpatch +++ b/debian/patches/01-binmode.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_binmode.dpatch by <a...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: binmode fix for multibyte-encoded data +From: <a...@debian.org> +Subject: binmode fix for multibyte-encoded data -@DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libfile-slurp-perl-9999.19~/MANIFEST libfile-slurp-perl-9999.19/MANIFEST --- libfile-slurp-perl-9999.19~/MANIFEST 2011-05-24 15:16:12.000000000 +1000 +++ libfile-slurp-perl-9999.19/MANIFEST 2011-08-31 10:17:55.750011076 +1000 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0c5c49e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +01-binmode.patch + + diff --git a/debian/rules b/debian/rules index 9a383c4..d1d9680 100755 --- a/debian/rules +++ b/debian/rules @@ -2,22 +2,25 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -# to get the patch application targets -include /usr/share/dpatch/dpatch.make +# to get the application targets configure: Makefile Makefile: Makefile.PL dh_testdir perl Makefile.PL INSTALLDIRS=vendor + +build-arch: build +build-indep: build + build: build-stamp -build-stamp: patch configure +build-stamp: configure dh_testdir $(MAKE) OPTIMIZE="-O2 -g -Wall" touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.10