Package: pmk
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 a234ba5375a9598ed2dc04729df85c33b6fc435e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 28 Apr 2012 14:57:16 +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 | 9 +++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
debian/patches/{25_pmksetup.dpatch => 25-pmksetup.patch} | 11 ++++-------
debian/patches/series | 1 +
debian/rules | 12 +++++++-----
debian/source/format | 1 +
8 files changed, 25 insertions(+), 16 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{25_pmksetup.dpatch => 25-pmksetup.patch} (95%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 50aaed6..30a40a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pmk (0.10.4-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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 28 Apr 2012 14:51:47 +0300
+
pmk (0.10.4-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 773107b..c19f92e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: pmk
Section: devel
Priority: optional
Maintainer: Magnus Holmgren <holmg...@debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.kibibyte.se/pmk/trunk
Vcs-Browser: http://svn.kibibyte.se/pmk
Homepage: http://pmk.sourceforge.net
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5c558fd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-25_pmksetup
diff --git a/debian/patches/25_pmksetup.dpatch b/debian/patches/25-pmksetup.patch
similarity index 95%
rename from debian/patches/25_pmksetup.dpatch
rename to debian/patches/25-pmksetup.patch
index b5dd77b..ee0844b 100644
--- a/debian/patches/25_pmksetup.dpatch
+++ b/debian/patches/25-pmksetup.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_pmksetup.dpatch by Magnus Holmgren <mag...@kibibyte.se>
-##
-## DP: Adds -s parameter to pmksetup, which outputs config to standard
-## DP: output, as well as -g, which forces data gathering to take place
-## DP: immediately.
+From: Magnus Holmgren <mag...@kibibyte.se>
+Subject: Adds -s parameter to pmksetup, which outputs config to standard
+ output, as well as -g, which forces data gathering to take place
+ immediately.
-@DPATCH@
diff -urNad trunk~/pmksetup.c trunk/pmksetup.c
--- trunk~/pmksetup.c 2006-10-15 00:31:11.000000000 +0200
+++ trunk/pmksetup.c 2007-08-05 15:17:25.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0528f94
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+25-pmksetup.patch
diff --git a/debian/rules b/debian/rules
index 7f89322..300a449 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -pipe -Wall -g -DTMPDIR=\"\\\"/tmp\\\"\"
@@ -31,16 +30,19 @@ configure-stamp:
./pmkcfg.sh -p /usr
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch configure-stamp
+build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
$(MAKE) PREMAKE=pmk
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -53,7 +55,7 @@ clean-patched:
install: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/pmk.
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
