Package: nana
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 086dc39666d61612a2487184cfaf46be8890cf8c Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 08:09:22 -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 | 13 -------------
..._L_macro.dpatch => 088_add_no-op_L_macro.patch} | 9 +++------
..._acinclude.dpatch => 090_quote_acinclude.patch} | 7 ++-----
...bin.dpatch => 092_move_nanafilter_to_bin.patch} | 7 ++-----
...ary.dpatch => 100_man_hack_not_necessary.patch} | 7 ++-----
...o_section.dpatch => 110_add_info_section.patch} | 7 ++-----
...dd_html_docs.dpatch => 130_add_html_docs.patch} | 7 ++-----
...h => 140_fix_nana-c++lg_install_location.patch} | 7 ++-----
...sfg_path.dpatch => 150_fix_nana-sfg_path.patch} | 7 ++-----
...ge.dpatch => 160_fix_nana-sfg_next_usage.patch} | 7 ++-----
...atch => 170_nana-trace_fix_gdb_pat_match.patch} | 12 +++++-------
...80_dl_user_fcn.dpatch => 180_dl_user_fcn.patch} | 8 ++------
...data.dpatch => 190_nana-run_path_to_data.patch} | 7 ++-----
... => 200_hyphen_used_as_minus_sign_in_man.patch} | 7 ++-----
debian/patches/series | 13 +++++++++++++
debian/rules | 20 ++++----------------
debian/source/format | 1 +
20 files changed, 59 insertions(+), 101 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{088_add_no-op_L_macro.dpatch => 088_add_no-op_L_macro.patch} (54%)
rename debian/patches/{090_quote_acinclude.dpatch => 090_quote_acinclude.patch} (88%)
rename debian/patches/{092_move_nanafilter_to_bin.dpatch => 092_move_nanafilter_to_bin.patch} (81%)
rename debian/patches/{100_man_hack_not_necessary.dpatch => 100_man_hack_not_necessary.patch} (78%)
rename debian/patches/{110_add_info_section.dpatch => 110_add_info_section.patch} (67%)
rename debian/patches/{130_add_html_docs.dpatch => 130_add_html_docs.patch} (71%)
rename debian/patches/{140_fix_nana-c++lg_install_location.dpatch => 140_fix_nana-c++lg_install_location.patch} (67%)
rename debian/patches/{150_fix_nana-sfg_path.dpatch => 150_fix_nana-sfg_path.patch} (66%)
rename debian/patches/{160_fix_nana-sfg_next_usage.dpatch => 160_fix_nana-sfg_next_usage.patch} (90%)
rename debian/patches/{170_nana-trace_fix_gdb_pat_match.dpatch => 170_nana-trace_fix_gdb_pat_match.patch} (58%)
rename debian/patches/{180_dl_user_fcn.dpatch => 180_dl_user_fcn.patch} (92%)
rename debian/patches/{190_nana-run_path_to_data.dpatch => 190_nana-run_path_to_data.patch} (72%)
rename debian/patches/{200_hyphen_used_as_minus_sign_in_man.dpatch => 200_hyphen_used_as_minus_sign_in_man.patch} (93%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index a491d23..28a4eeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nana (2.5-12.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 08:06:16 -0500
+
nana (2.5-12) unstable; urgency=low
* Acknowledge NMU 2.5-9.1
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index b934285..c748ec7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: nana
Section: devel
Priority: extra
Maintainer: Kurt B. Kaiser <[email protected]>
-Build-Depends: debhelper (>= 6), dpatch, automake, texinfo
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), automake, texinfo
+Standards-Version: 3.9.3
Homepage: http://savannah.gnu.org/projects/nana/
Package: nana
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 40cb51a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,13 +0,0 @@
-088_add_no-op_L_macro
-090_quote_acinclude
-092_move_nanafilter_to_bin
-100_man_hack_not_necessary
-110_add_info_section
-130_add_html_docs
-140_fix_nana-c++lg_install_location
-150_fix_nana-sfg_path
-160_fix_nana-sfg_next_usage
-170_nana-trace_fix_gdb_pat_match
-180_dl_user_fcn
-190_nana-run_path_to_data
-200_hyphen_used_as_minus_sign_in_man
diff --git a/debian/patches/088_add_no-op_L_macro.dpatch b/debian/patches/088_add_no-op_L_macro.patch
similarity index 54%
rename from debian/patches/088_add_no-op_L_macro.dpatch
rename to debian/patches/088_add_no-op_L_macro.patch
index 736928a..ca479b4 100644
--- a/debian/patches/088_add_no-op_L_macro.dpatch
+++ b/debian/patches/088_add_no-op_L_macro.patch
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 088_add_no-op_L_macro.dpatch by Brent A. Fulgham <[email protected]>
-##
-## DP: Add no-op definition for L macro in non-nana case - 08Jun01
-## DP: Thanks for the long-lost bug report by [email protected]
+From: Brent A. Fulgham <[email protected]>
+Subject: Add no-op definition for L macro in non-nana case - 08Jun01
+ Thanks for the long-lost bug report by [email protected]
-@DPATCH@
diff -urNad nana~/src/L.h nana/src/L.h
--- nana~/src/L.h 2008-05-03 22:52:14.000000000 -0400
+++ nana/src/L.h 2008-05-03 22:54:06.000000000 -0400
diff --git a/debian/patches/090_quote_acinclude.dpatch b/debian/patches/090_quote_acinclude.patch
similarity index 88%
rename from debian/patches/090_quote_acinclude.dpatch
rename to debian/patches/090_quote_acinclude.patch
index 3f1287f..1ee4878 100644
--- a/debian/patches/090_quote_acinclude.dpatch
+++ b/debian/patches/090_quote_acinclude.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 090-quote-acinclude.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Properly quote the variables to fix automake complaint.
+From: Kurt B. Kaiser <[email protected]>
+Subject: Properly quote the variables to fix automake complaint.
-@DPATCH@
diff -urNad nana~/acinclude.m4 nana/acinclude.m4
--- nana~/acinclude.m4 2006-11-26 01:02:28.000000000 -0500
+++ nana/acinclude.m4 2008-04-30 19:37:55.000000000 -0400
diff --git a/debian/patches/092_move_nanafilter_to_bin.dpatch b/debian/patches/092_move_nanafilter_to_bin.patch
similarity index 81%
rename from debian/patches/092_move_nanafilter_to_bin.dpatch
rename to debian/patches/092_move_nanafilter_to_bin.patch
index a35a4e1..0ef903d 100644
--- a/debian/patches/092_move_nanafilter_to_bin.dpatch
+++ b/debian/patches/092_move_nanafilter_to_bin.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 092_move_nanafilter_to_bin.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Move nanafilter to bin; incorporates old direct patches to source
+From: Kurt B. Kaiser <[email protected]>
+Subject: Move nanafilter to bin; incorporates old direct patches to source
-@DPATCH@
diff -urNad nana~/src/Makefile.am nana/src/Makefile.am
--- nana~/src/Makefile.am 2008-05-03 23:55:57.000000000 -0400
+++ nana/src/Makefile.am 2008-05-03 23:55:58.000000000 -0400
diff --git a/debian/patches/100_man_hack_not_necessary.dpatch b/debian/patches/100_man_hack_not_necessary.patch
similarity index 78%
rename from debian/patches/100_man_hack_not_necessary.dpatch
rename to debian/patches/100_man_hack_not_necessary.patch
index 3643e46..5b26875 100644
--- a/debian/patches/100_man_hack_not_necessary.dpatch
+++ b/debian/patches/100_man_hack_not_necessary.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 100_man_hack_not_necessary.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: automake currently installs nana.1 w/o upstream patching
+From: Kurt B. Kaiser <[email protected]>
+Subject: automake currently installs nana.1 w/o upstream patching
-@DPATCH@
diff -urNad nana~/man/Makefile.am nana/man/Makefile.am
--- nana~/man/Makefile.am 2006-11-26 01:02:28.000000000 -0500
+++ nana/man/Makefile.am 2008-05-01 16:54:24.000000000 -0400
diff --git a/debian/patches/110_add_info_section.dpatch b/debian/patches/110_add_info_section.patch
similarity index 67%
rename from debian/patches/110_add_info_section.dpatch
rename to debian/patches/110_add_info_section.patch
index a5c4404..54f62f5 100644
--- a/debian/patches/110_add_info_section.dpatch
+++ b/debian/patches/110_add_info_section.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 110_add_info_section.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Add specification for the info dir file section
+From: Kurt B. Kaiser <[email protected]>
+Subject: Add specification for the info dir file section
-@DPATCH@
diff -urNad nana~/doc/nana.texi nana/doc/nana.texi
--- nana~/doc/nana.texi 2006-11-26 01:02:28.000000000 -0500
+++ nana/doc/nana.texi 2006-11-28 01:13:11.000000000 -0500
diff --git a/debian/patches/130_add_html_docs.dpatch b/debian/patches/130_add_html_docs.patch
similarity index 71%
rename from debian/patches/130_add_html_docs.dpatch
rename to debian/patches/130_add_html_docs.patch
index 4cb3aa2..3c23550 100644
--- a/debian/patches/130_add_html_docs.dpatch
+++ b/debian/patches/130_add_html_docs.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 130_add_html_docs.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Enable building html docs
+From: Kurt B. Kaiser <[email protected]>
+Subject: Enable building html docs
-@DPATCH@
diff -urNad nana~/doc/Makefile.am nana/doc/Makefile.am
--- nana~/doc/Makefile.am 2008-05-02 10:35:52.000000000 -0400
+++ nana/doc/Makefile.am 2008-05-02 10:37:10.000000000 -0400
diff --git a/debian/patches/140_fix_nana-c++lg_install_location.dpatch b/debian/patches/140_fix_nana-c++lg_install_location.patch
similarity index 67%
rename from debian/patches/140_fix_nana-c++lg_install_location.dpatch
rename to debian/patches/140_fix_nana-c++lg_install_location.patch
index 45a36cb..f2323f1 100644
--- a/debian/patches/140_fix_nana-c++lg_install_location.dpatch
+++ b/debian/patches/140_fix_nana-c++lg_install_location.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 140_fix_nana-c++lg_install_location.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Add vars necessary to build path to nana-clg. (Closes: #122236)
+From: Kurt B. Kaiser <[email protected]>
+Subject: Add vars necessary to build path to nana-clg. (Closes: #122236)
-@DPATCH@
diff -urNad nana~/src/nana-c++lg.in nana/src/nana-c++lg.in
--- nana~/src/nana-c++lg.in 2006-11-29 02:42:21.000000000 -0500
+++ nana/src/nana-c++lg.in 2006-11-29 02:45:54.000000000 -0500
diff --git a/debian/patches/150_fix_nana-sfg_path.dpatch b/debian/patches/150_fix_nana-sfg_path.patch
similarity index 66%
rename from debian/patches/150_fix_nana-sfg_path.dpatch
rename to debian/patches/150_fix_nana-sfg_path.patch
index 926c3de..81c3a1e 100644
--- a/debian/patches/150_fix_nana-sfg_path.dpatch
+++ b/debian/patches/150_fix_nana-sfg_path.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 150_fix_nana-sfg_path.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Fix bad path to nana-sfg /usr//usr/bin/nana-sfg (Closes: #109892)
+From: Kurt B. Kaiser <[email protected]>
+Subject: Fix bad path to nana-sfg /usr//usr/bin/nana-sfg (Closes: #109892)
-@DPATCH@
diff -urNad nana~/shortform/nana-sfdir.in nana/shortform/nana-sfdir.in
--- nana~/shortform/nana-sfdir.in 2006-11-29 02:47:02.000000000 -0500
+++ nana/shortform/nana-sfdir.in 2006-11-29 02:47:40.000000000 -0500
diff --git a/debian/patches/160_fix_nana-sfg_next_usage.dpatch b/debian/patches/160_fix_nana-sfg_next_usage.patch
similarity index 90%
rename from debian/patches/160_fix_nana-sfg_next_usage.dpatch
rename to debian/patches/160_fix_nana-sfg_next_usage.patch
index 659e6df..2e6aa43 100644
--- a/debian/patches/160_fix_nana-sfg_next_usage.dpatch
+++ b/debian/patches/160_fix_nana-sfg_next_usage.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 160_fix_nana-sfg_next_usage.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: mawk: next doesn't work in function (anymore?)(Closes: #109893)
+From: Kurt B. Kaiser <[email protected]>
+Subject: mawk: next doesn't work in function (anymore?)(Closes: #109893)
-@DPATCH@
diff -urNad nana~/shortform/nana-sfg.in nana/shortform/nana-sfg.in
--- nana~/shortform/nana-sfg.in 2006-11-26 01:02:28.000000000 -0500
+++ nana/shortform/nana-sfg.in 2006-11-29 12:12:19.000000000 -0500
diff --git a/debian/patches/170_nana-trace_fix_gdb_pat_match.dpatch b/debian/patches/170_nana-trace_fix_gdb_pat_match.patch
similarity index 58%
rename from debian/patches/170_nana-trace_fix_gdb_pat_match.dpatch
rename to debian/patches/170_nana-trace_fix_gdb_pat_match.patch
index 2414f7f..d33e10b 100644
--- a/debian/patches/170_nana-trace_fix_gdb_pat_match.dpatch
+++ b/debian/patches/170_nana-trace_fix_gdb_pat_match.patch
@@ -1,11 +1,9 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 170_nana-trace_fix_gdb_pat_match.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: nana-trace was failing because gdb started outputting
-## DP: main () { instead of main() {
-## DP: Also, nana-trace was not printing the first line of code.
+From: Kurt B. Kaiser <[email protected]>
+Subject: Fix trace
+ nana-trace was failing because gdb started outputting main () {
+ instead of main() { Also, nana-trace was not printing the first line
+ of code.
-@DPATCH@
diff -urNad nana~/gdb/nana-trace.in nana/gdb/nana-trace.in
--- nana~/gdb/nana-trace.in 2006-12-02 15:55:55.000000000 -0500
+++ nana/gdb/nana-trace.in 2006-12-02 15:56:15.000000000 -0500
diff --git a/debian/patches/180_dl_user_fcn.dpatch b/debian/patches/180_dl_user_fcn.patch
similarity index 92%
rename from debian/patches/180_dl_user_fcn.dpatch
rename to debian/patches/180_dl_user_fcn.patch
index 9e1a63d..dd06c69 100644
--- a/debian/patches/180_dl_user_fcn.dpatch
+++ b/debian/patches/180_dl_user_fcn.patch
@@ -1,10 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 180_dl_user_fcn.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Implement the user function facility in DL.h and document.
-## DP: (Closes #58910)
+From: Kurt B. Kaiser <[email protected]>
+Subject: Implement the user function facility in DL.h and document (#58910)
-@DPATCH@
diff -urNad nana~/doc/nana.texi nana/doc/nana.texi
--- nana~/doc/nana.texi 2006-12-05 02:16:20.000000000 -0500
+++ nana/doc/nana.texi 2006-12-05 02:16:20.000000000 -0500
diff --git a/debian/patches/190_nana-run_path_to_data.dpatch b/debian/patches/190_nana-run_path_to_data.patch
similarity index 72%
rename from debian/patches/190_nana-run_path_to_data.dpatch
rename to debian/patches/190_nana-run_path_to_data.patch
index 735f85d..60cc513 100644
--- a/debian/patches/190_nana-run_path_to_data.dpatch
+++ b/debian/patches/190_nana-run_path_to_data.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 190_nana-run_path_to_data.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Correct variable access: path to /usr/share/nana/
+From: Kurt B. Kaiser <[email protected]>
+Subject: Correct variable access: path to /usr/share/nana/
-@DPATCH@
diff -urNad nana~/src/nana-run.in nana/src/nana-run.in
--- nana~/src/nana-run.in 2006-11-26 01:02:28.000000000 -0500
+++ nana/src/nana-run.in 2006-12-05 13:17:30.000000000 -0500
diff --git a/debian/patches/200_hyphen_used_as_minus_sign_in_man.dpatch b/debian/patches/200_hyphen_used_as_minus_sign_in_man.patch
similarity index 93%
rename from debian/patches/200_hyphen_used_as_minus_sign_in_man.dpatch
rename to debian/patches/200_hyphen_used_as_minus_sign_in_man.patch
index 514cc5b..aa373eb 100644
--- a/debian/patches/200_hyphen_used_as_minus_sign_in_man.dpatch
+++ b/debian/patches/200_hyphen_used_as_minus_sign_in_man.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 200_hyphen_used_as_minus_sign_in_man.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## DP: Escape minus signs used to indicate program options.
+From: Kurt B. Kaiser <[email protected]>
+Subject: Escape minus signs used to indicate program options.
-@DPATCH@
diff -urNad nana~/man/DI.3 nana/man/DI.3
--- nana~/man/DI.3 2006-11-26 01:02:28.000000000 -0500
+++ nana/man/DI.3 2008-05-03 16:24:07.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a6616a8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,13 @@
+088_add_no-op_L_macro.patch
+090_quote_acinclude.patch
+092_move_nanafilter_to_bin.patch
+100_man_hack_not_necessary.patch
+110_add_info_section.patch
+130_add_html_docs.patch
+140_fix_nana-c++lg_install_location.patch
+150_fix_nana-sfg_path.patch
+160_fix_nana-sfg_next_usage.patch
+170_nana-trace_fix_gdb_pat_match.patch
+180_dl_user_fcn.patch
+190_nana-run_path_to_data.patch
+200_hyphen_used_as_minus_sign_in_man.patch
diff --git a/debian/rules b/debian/rules
index 7267285..3139fde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
# Running aclocal, automake, and autoconf...
dh_testdir
aclocal && automake --gnu -a -c && autoconf
@@ -32,9 +32,8 @@ build-stamp: patch-stamp
sed -i '/ALWAYS_INCLUDE_MALLOC/ s/1/0/' src/nana-config.h
touch build-stamp
-clean: clean-patched unpatch
-clean-patched: patch-stamp
- # Cleaning patched tree...
+clean:
+ # Cleaninged tree...
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
@@ -79,18 +78,7 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-patch: patch-stamp
-patch-stamp:
- # Patching source...
- dpatch apply-all
- touch patch-stamp
-
-unpatch:
- # Unpatching source...
- -dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install \
- clean-patched patch unpatch
+ clean-patched
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
