Package: file-kanji
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 c696a78e68a2e0556a9eadef6d2315e4cda972cd Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 27 Feb 2012 14:44:30 -0500
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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 5 -----
...JISX0208-1983.dpatch => 10_JISX0208-1983.patch} | 8 ++------
...correct-spell.dpatch => 20_correct-spell.patch} | 8 ++------
...0_correct-loop.dpatch => 30_correct-loop.patch} | 8 ++------
...0_support-utf8.dpatch => 40_support-utf8.patch} | 8 ++------
.../{50_exec-file.dpatch => 50_exec-file.patch} | 8 ++------
debian/patches/series | 5 +++++
debian/rules | 16 ++--------------
debian/source/format | 1 +
12 files changed, 29 insertions(+), 52 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_JISX0208-1983.dpatch => 10_JISX0208-1983.patch} (74%)
rename debian/patches/{20_correct-spell.dpatch => 20_correct-spell.patch} (87%)
rename debian/patches/{30_correct-loop.dpatch => 30_correct-loop.patch} (82%)
rename debian/patches/{40_support-utf8.dpatch => 40_support-utf8.patch} (92%)
rename debian/patches/{50_exec-file.dpatch => 50_exec-file.patch} (84%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 1def7de..37b4e34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+file-kanji (1.1-15.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 <jari.aa...@cante.net> Mon, 27 Feb 2012 14:44:05 -0500
+
file-kanji (1.1-15) unstable; urgency=low
* New maintainer, acknowledged by predecessor maintainer Kenshi Muto.
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 411b69a..0b7b6ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: file-kanji
Section: misc
Priority: optional
Maintainer: Hiroyuki Yamamoto <yama1...@gmail.com>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: file-kanji
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ab9ab5e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-10_JISX0208-1983
-20_correct-spell
-30_correct-loop
-40_support-utf8
-50_exec-file
diff --git a/debian/patches/10_JISX0208-1983.dpatch b/debian/patches/10_JISX0208-1983.patch
similarity index 74%
rename from debian/patches/10_JISX0208-1983.dpatch
rename to debian/patches/10_JISX0208-1983.patch
index 76222f0..fc4e3ca 100644
--- a/debian/patches/10_JISX0208-1983.dpatch
+++ b/debian/patches/10_JISX0208-1983.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_JISX0208-1983.dpatch by <yama1...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Hiroyuki Yamamoto <yama1...@gmail.com>
+Subject: Change kanji_in_type
-@DPATCH@
diff -urNad file-kanji-1.1~/file2.c file-kanji-1.1/file2.c
--- file-kanji-1.1~/file2.c 1993-08-19 23:46:38.000000000 +0900
+++ file-kanji-1.1/file2.c 2007-10-20 02:35:24.000000000 +0900
diff --git a/debian/patches/20_correct-spell.dpatch b/debian/patches/20_correct-spell.patch
similarity index 87%
rename from debian/patches/20_correct-spell.dpatch
rename to debian/patches/20_correct-spell.patch
index ca3b4e6..e1aaa3e 100644
--- a/debian/patches/20_correct-spell.dpatch
+++ b/debian/patches/20_correct-spell.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_correct-spell.dpatch by <yama1...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Hiroyuki Yamamoto <yama1...@gmail.com>
+Subject: Correct spelling
-@DPATCH@
diff -urNad file-kanji-1.1~/HEADER file-kanji-1.1/HEADER
--- file-kanji-1.1~/HEADER 1995-08-04 20:33:08.000000000 +0900
+++ file-kanji-1.1/HEADER 2007-10-20 03:06:26.000000000 +0900
diff --git a/debian/patches/30_correct-loop.dpatch b/debian/patches/30_correct-loop.patch
similarity index 82%
rename from debian/patches/30_correct-loop.dpatch
rename to debian/patches/30_correct-loop.patch
index de0d15c..eaf00cd 100644
--- a/debian/patches/30_correct-loop.dpatch
+++ b/debian/patches/30_correct-loop.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_correct-loop.dpatch by <yama1...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Hiroyuki Yamamoto <yama1...@gmail.com>
+Subject: Correct indexing in loops
-@DPATCH@
diff -urNad file-kanji-1.1~/file2.c file-kanji-1.1/file2.c
--- file-kanji-1.1~/file2.c 2007-10-20 02:52:57.000000000 +0900
+++ file-kanji-1.1/file2.c 2007-10-20 02:59:22.000000000 +0900
diff --git a/debian/patches/40_support-utf8.dpatch b/debian/patches/40_support-utf8.patch
similarity index 92%
rename from debian/patches/40_support-utf8.dpatch
rename to debian/patches/40_support-utf8.patch
index 95228f4..37eba03 100644
--- a/debian/patches/40_support-utf8.dpatch
+++ b/debian/patches/40_support-utf8.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_support-utf8.dpatch by <yama1...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Hiroyuki Yamamoto <yama1...@gmail.com>
+Subject: Add UTF-8 support
-@DPATCH@
diff -urNad file-kanji-1.1~/file2.c file-kanji-1.1/file2.c
--- file-kanji-1.1~/file2.c 2007-10-31 11:37:07.000000000 +0900
+++ file-kanji-1.1/file2.c 2007-10-31 11:39:35.000000000 +0900
diff --git a/debian/patches/50_exec-file.dpatch b/debian/patches/50_exec-file.patch
similarity index 84%
rename from debian/patches/50_exec-file.dpatch
rename to debian/patches/50_exec-file.patch
index 07da7a9..f65eac4 100644
--- a/debian/patches/50_exec-file.dpatch
+++ b/debian/patches/50_exec-file.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_exec-file.dpatch by <yama1...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Hiroyuki Yamamoto <yama1...@gmail.com>
+Subject: Improve encoding detection.
-@DPATCH@
diff -urNad file-kanji-1.1~/file2.c file-kanji-1.1/file2.c
--- file-kanji-1.1~/file2.c 2007-11-03 08:39:59.000000000 +0900
+++ file-kanji-1.1/file2.c 2007-11-03 08:47:29.000000000 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..924682b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+10_JISX0208-1983.patch
+20_correct-spell.patch
+30_correct-loop.patch
+40_support-utf8.patch
+50_exec-file.patch
diff --git a/debian/rules b/debian/rules
index b5c75c3..5435b70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
# Add here commands to configure the package.
@@ -29,7 +29,7 @@ build-stamp: configure-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -89,18 +89,6 @@ binary-arch: build install
dh_builddeb
#####################################################################
-# add dpatch style
-# - for more detail, see /usr/share/doc/dpatch/examples/rules/rules.new.dh.gz
-
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary 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.9
