Package: libterm-readline-zoid-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 5a806f341b71ec12400a1c4e03e74aa3d83b4ddd Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 28 Apr 2012 14:36:38 +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/changelog                                       |   13 +++++++++++++
 debian/compat                                          |    2 +-
 debian/control                                         |    9 +++++----
 debian/copyright                                       |    2 +-
 debian/patches/00list                                  |    1 -
 ...ch => 10-return-feature-hash-instead-of-list.patch} |   10 +++-------
 debian/patches/series                                  |    1 +
 debian/rules                                           |   16 +++++++++-------
 debian/source/format                                   |    1 +
 9 files changed, 34 insertions(+), 21 deletions(-)
 delete mode 100644 debian/patches/00list
 rename debian/patches/{10_return_feature_hash_instead_of_list.dpatch => 10-return-feature-hash-instead-of-list.patch} (59%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index e78c37c..1f0b8b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libterm-readline-zoid-perl (0.07-2.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; use dh_prep in rules file.
+  * Fix copyright-refers-to-symlink-license (Lintian).
+  * Fix debian-control-has-unusual-field-spacing (Lintian).
+  * Fix package-installs-packlist (Lintian).
+  * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net>  Sat, 28 Apr 2012 14:36:21 +0300
+
 libterm-readline-zoid-perl (0.07-2) unstable; urgency=low
 
   * debian/{control,rules,patches}: dpatchified.
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 f37ad71..1b7486d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,17 @@
 Source: libterm-readline-zoid-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4.0.2)
-Build-Depends-Indep: perl (>= 5.8.0-7), libmodule-build-perl, libterm-readkey-perl, dpatch
+Build-Depends: debhelper (>= 9)
+Build-Depends-Indep: perl (>= 5.8.0-7), libmodule-build-perl, libterm-readkey-perl
 Maintainer: Marc 'HE' Brockschmidt <h...@debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.9.3
+Homepage: http://search.cpan.org/~pardus/Term-ReadLine-Zoid
 
 Package: libterm-readline-zoid-perl
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, libterm-readkey-perl
 Recommends: perl-modules (>= 5.8) | libfile-temp-perl
-Description:  Pure Perl implementation of Readline libraries
+Description: pure Perl implementation of Readline libraries
  libterm-readline-zoid-perl provides a set of modules that form an
  interactive input buffer written in plain perl with minimal 
  dependencies.  It features almost all key-bindings described in the
diff --git a/debian/copyright b/debian/copyright
index 0f350fd..84fdc59 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,5 +9,5 @@ modify it under the same terms as Perl itself.
 
 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/patches/00list b/debian/patches/00list
deleted file mode 100644
index f19ef40..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_return_feature_hash_instead_of_list.dpatch
diff --git a/debian/patches/10_return_feature_hash_instead_of_list.dpatch b/debian/patches/10-return-feature-hash-instead-of-list.patch
similarity index 59%
rename from debian/patches/10_return_feature_hash_instead_of_list.dpatch
rename to debian/patches/10-return-feature-hash-instead-of-list.patch
index cbcfc7b..7b1a61b 100644
--- a/debian/patches/10_return_feature_hash_instead_of_list.dpatch
+++ b/debian/patches/10-return-feature-hash-instead-of-list.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_return_feature_hash_instead_of_list.dpatch by Roderick Schertler <roder...@ibcinc.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add a "retur"n to ensure that a hash ref is returned, not a list
-## DP: {} alone is a block, so the return value is a list of values from this block
+From: Roderick Schertler <roder...@ibcinc.com>
+Subject: Add a "retur"n to ensure that a hash ref is returned, not a list
+ {} alone is a block, so the return value is a list of values from this block
 
-@DPATCH@
 
 diff -Nwru Term-ReadLine-Zoid-0.07/lib/Term/ReadLine/Zoid.pm Term-ReadLine-Zoid-0.07.new/lib/Term/ReadLine/Zoid.pm
 --- Term-ReadLine-Zoid-0.07/lib/Term/ReadLine/Zoid.pm	2005-04-30 19:22:26.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4839d02
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-return-feature-hash-instead-of-list.patch
diff --git a/debian/rules b/debian/rules
index 7bdb3b5..38acda1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
 
 # If set to a true value then MakeMaker's prompt function will
 # always return the default without waiting for user input.
@@ -14,7 +13,11 @@ endif
 
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
-build: patch build-stamp
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
 build-stamp:
 	dh_testdir
 	
@@ -24,27 +27,26 @@ build-stamp:
 
 	touch build-stamp
 
-clean: unpatch clean-unpatched
-clean-unpatched:
+clean:
 	dh_testdir
 	dh_testroot
 
 	# Add here commands to clean up after the build process.
 	-$(PERL) Build clean
-	rm -rf _build build-stamp Build
+	rm -rf _build build-stamp Build MYMETA.json MYMETA.yml
 
 	dh_clean
 
 install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
 	$(PERL) Build test
 	$(PERL) Build install destdir=$(TMP)
-
+	find debian -name .packlist | xargs -r rm -f
 
 # Build architecture-dependent files here.
 binary-arch: build install
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

Reply via email to