Package: libpdl-netcdf-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 a5bc140c52ccd6a23282815169dc63298d578817 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 27 Apr 2012 22:52:15 +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 | 3 ---
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 7 ++++---
debian/patches/00list | 1 -
...010-OpenDAP_support.dpatch => 010-OpenDAP-support.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 11 +++++++----
debian/source/format | 1 +
10 files changed, 28 insertions(+), 20 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{010-OpenDAP_support.dpatch => 010-OpenDAP-support.patch} (89%)
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 0fc3b59..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-Patch system:
-This package uses dpatch to manage patches on top of the released
-tarballs, please check /usr/share/doc/dpatch/README.source.gz for details.
diff --git a/debian/changelog b/debian/changelog
index c25c3c2..68b3c56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libpdl-netcdf-perl (4.07-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; use dh_prep in rules file.
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 27 Apr 2012 22:51:42 +0300
+
libpdl-netcdf-perl (4.07-1) unstable; urgency=low
* new upstream version
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 72192ea..6c6b02c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: libpdl-netcdf-perl
Section: perl
Priority: optional
-Build-Depends: libnetcdf-dev, pdl, perl, debhelper (>=5), dpatch
+Build-Depends: libnetcdf-dev, pdl, perl, debhelper (>= 9)
Maintainer: Henning Glawe <gla...@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Homepage: http://search.cpan.org/dist/PDL-NetCDF/
Package: libpdl-netcdf-perl
diff --git a/debian/copyright b/debian/copyright
index 8bfcc0a..85080ad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,7 @@ terms as Perl itself. See /usr/share/common-licenses/Artistic
The upstream author is: Douglas Hunt (dh...@ucar.edu).
-The Debian packaging is (C) 2009, Heiko Klein <heiko.kl...@met.no> and
-(C) 2009, Henning Glawe <gla...@debian.org> and
-is licensed under the same terms as the software itself (see above).
+The Debian packaging is Copyright (C) 2009, Heiko Klein
+<heiko.kl...@met.no> and (C) 2009, Henning Glawe <gla...@debian.org>
+and is licensed under the same terms as the software itself (see
+above).
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a3bf5db..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-010-OpenDAP_support.dpatch
diff --git a/debian/patches/010-OpenDAP_support.dpatch b/debian/patches/010-OpenDAP-support.patch
similarity index 89%
rename from debian/patches/010-OpenDAP_support.dpatch
rename to debian/patches/010-OpenDAP-support.patch
index 19be762..3540ac0 100644
--- a/debian/patches/010-OpenDAP_support.dpatch
+++ b/debian/patches/010-OpenDAP-support.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 010-OpenDAP_support.dpatch by Henning Glawe <gla...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Henning Glawe <gla...@debian.org>
+Subject: Check OpenLDAP URL
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libpdl-netcdf-perl-4.07~/netcdf.pd libpdl-netcdf-perl-4.07/netcdf.pd
--- libpdl-netcdf-perl-4.07~/netcdf.pd 2010-12-31 00:01:19.000000000 +0100
+++ libpdl-netcdf-perl-4.07/netcdf.pd 2011-02-02 11:39:35.096109611 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b209445
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+010-OpenDAP-support.patch
diff --git a/debian/rules b/debian/rules
index b61fcad..d57f75b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-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.
export PERL_MM_USE_DEFAULT=1
@@ -30,7 +29,7 @@ else
endif
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
# Add here commands to configure the package
$(PERL) Makefile.PL INSTALLDIRS=vendor \
@@ -39,6 +38,10 @@ configure-stamp: patch-stamp
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure
dh_testdir
@@ -59,7 +62,7 @@ test-stamp: build-stamp
-$(MAKE) TEST_VERBOSE=1 DISPLAY="" test
touch test-stamp
-clean: clean-patched unpatch
+clean: clean-patched
clean-patched:
dh_testdir
dh_testroot
@@ -73,7 +76,7 @@ install: install-stamp
install-stamp: build-stamp test
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
# Add commands to install the package into debian/$PACKAGE_NAME here
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
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
