Package: khmerconverter
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 5f6fbc911b7cad929d7392451703fb8f283b9b5e Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 14:16:49 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{search-dir.dpatch => search-dir.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
8 files changed, 17 insertions(+), 13 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{search-dir.dpatch => search-dir.patch} (84%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 028abd3..5adf293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+khmerconverter (1.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.
+
+ -- Jari Aalto <[email protected]> Tue, 28 Feb 2012 14:13:59 -0500
+
khmerconverter (1.4-1) unstable; urgency=low
* Package adopted from Paul Wise
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 6c0f3dd..d0aff3c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: khmerconverter
Section: text
Priority: optional
Maintainer: Soputtra San <[email protected]>
-Build-Depends: debhelper (>= 5.0.37.2), dpatch (>= 2.0.27)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: imagemagick, help2man, python (>= 2.3), python-support (>= 0.3)
-Standards-Version: 3.7.2
+Standards-Version: 3.9.3
Package: khmerconverter
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 966f5a9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-search-dir.dpatch
diff --git a/debian/patches/search-dir.dpatch b/debian/patches/search-dir.patch
similarity index 84%
rename from debian/patches/search-dir.dpatch
rename to debian/patches/search-dir.patch
index fab002d..a26d7f2 100644
--- a/debian/patches/search-dir.dpatch
+++ b/debian/patches/search-dir.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## search-dir.dpatch by Soputtra San <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Search for the modules and data in /usr/share/khmerconverter
+From: Soputtra San <[email protected]>
+Subject: Search for the modules and data in /usr/share/khmerconverter
-@DPATCH@
diff -urNad khmerconverter-1.4~/khmerconverter.py khmerconverter-1.4/khmerconverter.py
--- khmerconverter-1.4~/khmerconverter.py 2007-09-11 16:12:07.000000000 +1000
+++ khmerconverter-1.4/khmerconverter.py 2007-09-11 16:14:14.000000000 +1000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9c2d7fd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+search-dir.patch
diff --git a/debian/rules b/debian/rules
index acbebd6..36c05ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,9 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
mkdir build
@@ -43,7 +42,7 @@ build-stamp: patch-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf khmerconverter build build-stamp modules/*.pyc modules/__version__.py
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.9
