Package: libproc-pid-file-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 a5b7d2eecd860b842e97eb96501f2fbe25027e18 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 5 May 2012 19:21:56 +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 | 12 +++++++
debian/compat | 2 +-
debian/control | 8 ++---
debian/copyright | 7 ++--
debian/libproc-pid-file-perl.docs | 1 -
debian/patches/00list | 1 -
debian/patches/{01taint.dpatch => 01-taint.patch} | 8 ++---
debian/patches/series | 1 +
debian/rules | 11 +++---
debian/source/format | 1 +
11 files changed, 31 insertions(+), 59 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/libproc-pid-file-perl.docs
delete mode 100644 debian/patches/00list
rename debian/patches/{01taint.dpatch => 01-taint.patch} (76%)
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 5aa6e74..31991e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libproc-pid-file-perl (1.27-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 required build-arch and build-indep targets to rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix binary-control-field-duplicates-source priority section (Lintian).
+ * Fix spelling-error-in-copyright (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 05 May 2012 19:19:36 +0300
+
libproc-pid-file-perl (1.27-1) unstable; urgency=low
* New upstream release
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 3668186..e1d0794 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,13 @@ Source: libproc-pid-file-perl
Maintainer: Alexander Zangerl <a...@debian.org>
Priority: optional
Section: perl
-Build-Depends: debhelper (>=4), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: perl, procps [!hurd-i386]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Package: libproc-pid-file-perl
Architecture: all
-Priority: optional
-Section: perl
-Depends: perl
+Depends: ${misc:Depends}, perl
Recommends: procps
Homepage: http://search.cpan.org/~ecalder/Proc-PID-File/
Description: Perl module for managing process id files
diff --git a/debian/copyright b/debian/copyright
index 98bafe9..168ec9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,9 @@ Upstream Author: Erick Calder <ecal...@cpan.org>
Copyright:
-"Copyright (C) 2001-2003 Erick Calder
-This utility is free and distributed under GPL, the Gnu Public License."
+Copyright (C) 2001-2003 Erick Calder
+
+"This utility is free and distributed under GPL"
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'.
diff --git a/debian/libproc-pid-file-perl.docs b/debian/libproc-pid-file-perl.docs
deleted file mode 100644
index 5323396..0000000
--- a/debian/libproc-pid-file-perl.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/README.source
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 043cf22..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01taint
\ No newline at end of file
diff --git a/debian/patches/01taint.dpatch b/debian/patches/01-taint.patch
similarity index 76%
rename from debian/patches/01taint.dpatch
rename to debian/patches/01-taint.patch
index 75e79f5..a03f144 100644
--- a/debian/patches/01taint.dpatch
+++ b/debian/patches/01-taint.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01taint.dpatch by <a...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: save and restore path before modifying it (to survive taint checks)
+From: <a...@debian.org>
+Subject: save and restore path before modifying it (to survive taint checks)
-@DPATCH@
diff -urNad libproc-pid-file-perl-1.27~/File.pm libproc-pid-file-perl-1.27/File.pm
--- libproc-pid-file-perl-1.27~/File.pm 2010-04-25 14:36:00.000000000 +1000
+++ libproc-pid-file-perl-1.27/File.pm 2010-04-25 15:04:05.011672928 +1000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a66393f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-taint.patch
diff --git a/debian/rules b/debian/rules
index d89b6b2..da17377 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,20 @@
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-.PHONY: patch unpatch
+.PHONY:
PACKAGE=libproc-pid-file-perl
-include /usr/share/dpatch/dpatch.make
-configure: patch Makefile
+configure: Makefile
Makefile: Makefile.PL
dh_testdir
perl Makefile.PL INSTALLDIRS=vendor
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure
@@ -19,7 +22,7 @@ build-stamp: configure
$(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
