Package: nvi
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 680734145033804ed46be87a0212e1fc1f887bbd Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Thu, 8 Mar 2012 09:43:09 -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/README.source | 28 --------------------
debian/changelog | 8 +++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 27 -------------------
...ata.dpatch => 01additional_upstream_data.patch} | 11 +++-----
debian/patches/{03db4.dpatch => 03db4.patch} | 7 +---
.../{04confdefs.dpatch => 04confdefs.patch} | 7 +---
...ime.dpatch => 06default_value_escapetime.patch} | 7 +---
.../{07flush_cache.dpatch => 07flush_cache.patch} | 7 +---
debian/patches/{08lfs.dpatch => 08lfs.patch} | 7 +---
.../{08safe_printf.dpatch => 08safe_printf.patch} | 7 +---
...empfile_umask.dpatch => 08tempfile_umask.patch} | 7 +---
.../patches/{09casting.dpatch => 09casting.patch} | 7 +---
...ne_visual.dpatch => 10no_one_line_visual.patch} | 7 +---
...ing.dpatch => 11backward_sentence_moving.patch} | 7 +---
...oll_count.dpatch => 12horiz_scroll_count.patch} | 7 +---
...har_horrors.dpatch => 13widechar_horrors.patch} | 25 ++++++++----------
...ex_fixes.dpatch => 14private_regex_fixes.patch} | 7 +---
.../{15search_word.dpatch => 15search_word.patch} | 9 ++----
...anpage_errors.dpatch => 16manpage_errors.patch} | 7 +---
...utorial_typos.dpatch => 17tutorial_typos.patch} | 7 +---
...binpower.dpatch => 18dbpagesize_binpower.patch} | 9 ++----
...nclude_term_h.dpatch => 19include_term_h.patch} | 7 +---
...as_grantpt.dpatch => 20glibc_has_grantpt.patch} | 9 ++----
...check.dpatch => 21exrc_writability_check.patch} | 7 +---
...rnatives.dpatch => 23debian_alternatives.patch} | 9 ++----
...b_term.dpatch => 24fallback_to_dumb_term.patch} | 7 +---
...ped_F.dpatch => 25manpage_note_dropped_F.patch} | 9 ++----
...g_tab_segv.dpatch => 26trailing_tab_segv.patch} | 9 ++----
...rt_C_locale.dpatch => 27support_C_locale.patch} | 7 +---
...egex_widechar.dpatch => 28regex_widechar.patch} | 11 +++-----
.../{29file_backup.dpatch => 29file_backup.patch} | 9 ++----
debian/patches/series | 27 +++++++++++++++++++
debian/rules | 2 -
debian/source/format | 1 +
36 files changed, 115 insertions(+), 220 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01additional_upstream_data.dpatch => 01additional_upstream_data.patch} (99%)
rename debian/patches/{03db4.dpatch => 03db4.patch} (81%)
rename debian/patches/{04confdefs.dpatch => 04confdefs.patch} (62%)
rename debian/patches/{06default_value_escapetime.dpatch => 06default_value_escapetime.patch} (74%)
rename debian/patches/{07flush_cache.dpatch => 07flush_cache.patch} (88%)
rename debian/patches/{08lfs.dpatch => 08lfs.patch} (83%)
rename debian/patches/{08safe_printf.dpatch => 08safe_printf.patch} (72%)
rename debian/patches/{08tempfile_umask.dpatch => 08tempfile_umask.patch} (85%)
rename debian/patches/{09casting.dpatch => 09casting.patch} (84%)
rename debian/patches/{10no_one_line_visual.dpatch => 10no_one_line_visual.patch} (78%)
rename debian/patches/{11backward_sentence_moving.dpatch => 11backward_sentence_moving.patch} (74%)
rename debian/patches/{12horiz_scroll_count.dpatch => 12horiz_scroll_count.patch} (77%)
rename debian/patches/{13widechar_horrors.dpatch => 13widechar_horrors.patch} (74%)
rename debian/patches/{14private_regex_fixes.dpatch => 14private_regex_fixes.patch} (83%)
rename debian/patches/{15search_word.dpatch => 15search_word.patch} (75%)
rename debian/patches/{16manpage_errors.dpatch => 16manpage_errors.patch} (99%)
rename debian/patches/{17tutorial_typos.dpatch => 17tutorial_typos.patch} (96%)
rename debian/patches/{18dbpagesize_binpower.dpatch => 18dbpagesize_binpower.patch} (71%)
rename debian/patches/{19include_term_h.dpatch => 19include_term_h.patch} (79%)
rename debian/patches/{20glibc_has_grantpt.dpatch => 20glibc_has_grantpt.patch} (76%)
rename debian/patches/{21exrc_writability_check.dpatch => 21exrc_writability_check.patch} (90%)
rename debian/patches/{23debian_alternatives.dpatch => 23debian_alternatives.patch} (80%)
rename debian/patches/{24fallback_to_dumb_term.dpatch => 24fallback_to_dumb_term.patch} (81%)
rename debian/patches/{25manpage_note_dropped_F.dpatch => 25manpage_note_dropped_F.patch} (81%)
rename debian/patches/{26trailing_tab_segv.dpatch => 26trailing_tab_segv.patch} (61%)
rename debian/patches/{27support_C_locale.dpatch => 27support_C_locale.patch} (82%)
rename debian/patches/{28regex_widechar.dpatch => 28regex_widechar.patch} (54%)
rename debian/patches/{29file_backup.dpatch => 29file_backup.patch} (75%)
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 7b653ab..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,28 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- dpatch apply-all
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "dpatch deapply-all" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
- -- Axel Beckert <[email protected]>, Sat, 14 May 2011 18:52:01 +0200
diff --git a/debian/changelog b/debian/changelog
index b6fa474..26c50e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nvi (1.81.6-8.3) 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]> Thu, 08 Mar 2012 09:11:43 -0500
+
nvi (1.81.6-8.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index bbd95a9..e2d2e23 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: nvi
Section: editors
Priority: optional
Maintainer: Jan Christoph Nordholz <[email protected]>
-Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 7), libncurses5-dev, libncursesw5-dev, autotools-dev, dpatch, libdb-dev
+Standards-Version: 3.9.3.1
+Build-Depends: debhelper (>= 9), libncurses5-dev, libncursesw5-dev, autotools-dev, libdb-dev
Homepage: http://www.kotnet.org/~skimo/nvi/
Package: nvi
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c15d9f5..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,27 +0,0 @@
-01additional_upstream_data
-03db4
-04confdefs
-06default_value_escapetime
-07flush_cache
-08lfs
-08safe_printf
-08tempfile_umask
-09casting
-10no_one_line_visual
-11backward_sentence_moving
-12horiz_scroll_count
-13widechar_horrors
-14private_regex_fixes
-15search_word
-16manpage_errors
-17tutorial_typos
-18dbpagesize_binpower
-19include_term_h
-20glibc_has_grantpt
-21exrc_writability_check
-23debian_alternatives
-24fallback_to_dumb_term
-25manpage_note_dropped_F
-26trailing_tab_segv
-27support_C_locale
-29file_backup
diff --git a/debian/patches/01additional_upstream_data.dpatch b/debian/patches/01additional_upstream_data.patch
similarity index 99%
rename from debian/patches/01additional_upstream_data.dpatch
rename to debian/patches/01additional_upstream_data.patch
index 4b9cec6..2517bbb 100644
--- a/debian/patches/01additional_upstream_data.dpatch
+++ b/debian/patches/01additional_upstream_data.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01additional_upstream_data.dpatch by <[email protected]>
-##
-## DP: A few documentation files cherry-picked from the last stable
-## DP: release tarball, because they are missing in later development
-## DP: branch releases.
+From: <[email protected]>
+Subject: A few documentation files cherry-picked from the last stable
+ release tarball, because they are missing in later development
+ branch releases.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/nvi-1.79/FAQ nvi-1.81.6/nvi-1.79/FAQ
--- nvi-1.81.6.orig/nvi-1.79/FAQ 1970-01-01 01:00:00.000000000 +0100
+++ nvi-1.81.6/nvi-1.79/FAQ 1996-10-14 15:52:46.000000000 +0200
diff --git a/debian/patches/03db4.dpatch b/debian/patches/03db4.patch
similarity index 81%
rename from debian/patches/03db4.dpatch
rename to debian/patches/03db4.patch
index dcf2feb..474011b 100644
--- a/debian/patches/03db4.dpatch
+++ b/debian/patches/03db4.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03db4.dpatch by <[email protected]>
-##
-## DP: libdb4 compatibility adjustments.
+From: <[email protected]>
+Subject: libdb4 compatibility adjustments.
-@DPATCH@
--- nvi-1.81.6.orig/common/msg.c 2009-02-26 14:26:58.350336128 +0100
+++ nvi-1.81.6/common/msg.c 2009-02-26 14:29:05.235335829 +0100
@@ -724,9 +724,18 @@
diff --git a/debian/patches/04confdefs.dpatch b/debian/patches/04confdefs.patch
similarity index 62%
rename from debian/patches/04confdefs.dpatch
rename to debian/patches/04confdefs.patch
index 06b2aad..d5dd21b 100644
--- a/debian/patches/04confdefs.dpatch
+++ b/debian/patches/04confdefs.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04confdefs.dpatch by <[email protected]>
-##
-## DP: Help configure by decreeing that some headers are present.
+From: <[email protected]>
+Subject: Help configure by decreeing that some headers are present.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/build/confdefs.h nvi-1.81.6/build/confdefs.h
--- nvi-1.81.6.orig/build/confdefs.h 1970-01-01 01:00:00.000000000 +0100
+++ nvi-1.81.6/build/confdefs.h 2008-05-01 18:05:00.000000000 +0200
diff --git a/debian/patches/06default_value_escapetime.dpatch b/debian/patches/06default_value_escapetime.patch
similarity index 74%
rename from debian/patches/06default_value_escapetime.dpatch
rename to debian/patches/06default_value_escapetime.patch
index 1800c0c..a551d42 100644
--- a/debian/patches/06default_value_escapetime.dpatch
+++ b/debian/patches/06default_value_escapetime.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06default_value_escapetime.dpatch by <[email protected]>
-##
-## DP: Increase the default 'escapetime' setting to accommodate slow lines.
+From: <[email protected]>
+Subject: Increase the default 'escapetime' setting to accommodate slow lines.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/common/options.c nvi-1.81.6/common/options.c
--- nvi-1.81.6.orig/common/options.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/common/options.c 2008-05-01 18:06:18.000000000 +0200
diff --git a/debian/patches/07flush_cache.dpatch b/debian/patches/07flush_cache.patch
similarity index 88%
rename from debian/patches/07flush_cache.dpatch
rename to debian/patches/07flush_cache.patch
index 0f06dba..7479177 100644
--- a/debian/patches/07flush_cache.dpatch
+++ b/debian/patches/07flush_cache.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07flush_cache.dpatch by <[email protected]>
-##
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/common/db1.c nvi-1.81.6/common/db1.c
--- nvi-1.81.6.orig/common/db1.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/common/db1.c 2008-05-01 18:07:58.000000000 +0200
diff --git a/debian/patches/08lfs.dpatch b/debian/patches/08lfs.patch
similarity index 83%
rename from debian/patches/08lfs.dpatch
rename to debian/patches/08lfs.patch
index 2ab85d9..e5d9399 100644
--- a/debian/patches/08lfs.dpatch
+++ b/debian/patches/08lfs.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08lfs.dpatch by <[email protected]>
-##
-## DP: Insert a safety check to save large files from being overwritten.
+From: <[email protected]>
+Subject: Insert a safety check to save large files from being overwritten.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/common/exf.c nvi-1.81.6/common/exf.c
--- nvi-1.81.6.orig/common/exf.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/common/exf.c 2008-05-01 18:09:55.000000000 +0200
diff --git a/debian/patches/08safe_printf.dpatch b/debian/patches/08safe_printf.patch
similarity index 72%
rename from debian/patches/08safe_printf.dpatch
rename to debian/patches/08safe_printf.patch
index 0e1cf83..13ef3e1 100644
--- a/debian/patches/08safe_printf.dpatch
+++ b/debian/patches/08safe_printf.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08safe_printf.dpatch by <[email protected]>
-##
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/common/exf.c nvi-1.81.6/common/exf.c
--- nvi-1.81.6.orig/common/exf.c 2008-05-01 18:10:20.000000000 +0200
+++ nvi-1.81.6/common/exf.c 2008-05-01 18:10:30.000000000 +0200
diff --git a/debian/patches/08tempfile_umask.dpatch b/debian/patches/08tempfile_umask.patch
similarity index 85%
rename from debian/patches/08tempfile_umask.dpatch
rename to debian/patches/08tempfile_umask.patch
index 6cebc90..3debcb7 100644
--- a/debian/patches/08tempfile_umask.dpatch
+++ b/debian/patches/08tempfile_umask.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08tempfile_umask.dpatch by <[email protected]>
-##
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/common/exf.c nvi-1.81.6/common/exf.c
--- nvi-1.81.6.orig/common/exf.c 2008-05-01 18:10:45.000000000 +0200
+++ nvi-1.81.6/common/exf.c 2008-05-01 18:13:23.000000000 +0200
diff --git a/debian/patches/09casting.dpatch b/debian/patches/09casting.patch
similarity index 84%
rename from debian/patches/09casting.dpatch
rename to debian/patches/09casting.patch
index 6e19ae7..9f0b217 100644
--- a/debian/patches/09casting.dpatch
+++ b/debian/patches/09casting.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09casting.dpatch by <[email protected]>
-##
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/vi/v_ch.c nvi-1.81.6/vi/v_ch.c
--- nvi-1.81.6.orig/vi/v_ch.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/vi/v_ch.c 2008-05-01 18:14:03.000000000 +0200
diff --git a/debian/patches/10no_one_line_visual.dpatch b/debian/patches/10no_one_line_visual.patch
similarity index 78%
rename from debian/patches/10no_one_line_visual.dpatch
rename to debian/patches/10no_one_line_visual.patch
index 1718091..41a638d 100644
--- a/debian/patches/10no_one_line_visual.dpatch
+++ b/debian/patches/10no_one_line_visual.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10no_one_line_visual.dpatch by <[email protected]>
-##
-## DP: Catch segfaults when the screen is only one line high.
+From: <[email protected]>
+Subject: Catch segfaults when the screen is only one line high.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/vi/vi.c nvi-1.81.6/vi/vi.c
--- nvi-1.81.6.orig/vi/vi.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/vi/vi.c 2008-05-01 18:15:14.000000000 +0200
diff --git a/debian/patches/11backward_sentence_moving.dpatch b/debian/patches/11backward_sentence_moving.patch
similarity index 74%
rename from debian/patches/11backward_sentence_moving.dpatch
rename to debian/patches/11backward_sentence_moving.patch
index 9a89aec..d3b563b 100644
--- a/debian/patches/11backward_sentence_moving.dpatch
+++ b/debian/patches/11backward_sentence_moving.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11backward_sentence_moving.dpatch by <[email protected]>
-##
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/vi/v_sentence.c nvi-1.81.6/vi/v_sentence.c
--- nvi-1.81.6.orig/vi/v_sentence.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/vi/v_sentence.c 2008-05-01 18:15:37.000000000 +0200
diff --git a/debian/patches/12horiz_scroll_count.dpatch b/debian/patches/12horiz_scroll_count.patch
similarity index 77%
rename from debian/patches/12horiz_scroll_count.dpatch
rename to debian/patches/12horiz_scroll_count.patch
index aece3e0..cad4958 100644
--- a/debian/patches/12horiz_scroll_count.dpatch
+++ b/debian/patches/12horiz_scroll_count.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12horiz_scroll_count.dpatch by <[email protected]>
-##
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/vi/vs_refresh.c nvi-1.81.6/vi/vs_refresh.c
--- nvi-1.81.6.orig/vi/vs_refresh.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/vi/vs_refresh.c 2008-05-01 18:16:01.000000000 +0200
diff --git a/debian/patches/13widechar_horrors.dpatch b/debian/patches/13widechar_horrors.patch
similarity index 74%
rename from debian/patches/13widechar_horrors.dpatch
rename to debian/patches/13widechar_horrors.patch
index 21cdb48..d6b5f33 100644
--- a/debian/patches/13widechar_horrors.dpatch
+++ b/debian/patches/13widechar_horrors.patch
@@ -1,18 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13widechar_horrors.dpatch by <[email protected]>
-##
-## DP: This patch tries to cope with the fact that widechar support
-## DP: in nvi is at best rudimentary.
-## DP: Hunk 1)
-## DP: * Due to "ch = *t", this code is not wide-char aware, so
-## DP: cast the value to a proper type so the KEY_ macros make
-## DP: the right choice.
-## DP: Hunk 2)
-## DP: * Printing of the in-/decreased number back into the screen
-## DP: buffer is not widechar-aware, either. Add a dirty fix.
-## DP: Cf. #497349.
+From: <[email protected]>
+Subject: This patch tries to cope with the fact that widechar support
+in nvi is at best rudimentary.
+Hunk 1)
+* Due to "ch = *t", this code is not wide-char aware, so
+cast the value to a proper type so the KEY_ macros make
+the right choice.
+Hunk 2)
+* Printing of the in-/decreased number back into the screen
+buffer is not widechar-aware, either. Add a dirty fix.
+Cf. #497349.
-@DPATCH@
--- nvi-1.81.6.orig/vi/vs_msg.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/vi/vs_msg.c 2009-03-01 14:51:08.211414132 +0100
@@ -472,10 +472,10 @@
diff --git a/debian/patches/14private_regex_fixes.dpatch b/debian/patches/14private_regex_fixes.patch
similarity index 83%
rename from debian/patches/14private_regex_fixes.dpatch
rename to debian/patches/14private_regex_fixes.patch
index 8ed783d..b98f553 100644
--- a/debian/patches/14private_regex_fixes.dpatch
+++ b/debian/patches/14private_regex_fixes.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14private_regex_fixes.dpatch by <[email protected]>
-##
-## DP: Fixes to the private regex library; includes fix for #523934.
+From: <[email protected]>
+Subject: Fixes to the private regex library; includes fix for #523934.
-@DPATCH@
diff -Naur regex.orig/regcomp.c regex/regcomp.c
--- nvi-1.81.6.orig/regex/regcomp.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/regex/regcomp.c 2008-05-01 18:37:57.000000000 +0200
diff --git a/debian/patches/15search_word.dpatch b/debian/patches/15search_word.patch
similarity index 75%
rename from debian/patches/15search_word.dpatch
rename to debian/patches/15search_word.patch
index 38c914b..6bd7395 100644
--- a/debian/patches/15search_word.dpatch
+++ b/debian/patches/15search_word.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15search_word.dpatch by Al Viro <[email protected]>
-##
-## DP: Fix {^A} command. (End-of-word was not included in search
-## DP: regexp leading to false positives.)
+From: Al Viro <[email protected]>
+Subject: Fix {^A} command. (End-of-word was not included in search
+regexp leading to false positives.)
-@DPATCH@
--- nvi-1.81.6.orig/vi/v_search.c 2007-11-18 11:41:42.000000000 -0500
+++ nvi-1.81.6/vi/v_search.c 2009-03-05 15:37:37.000000000 -0500
@@ -322,16 +322,17 @@
diff --git a/debian/patches/16manpage_errors.dpatch b/debian/patches/16manpage_errors.patch
similarity index 99%
rename from debian/patches/16manpage_errors.dpatch
rename to debian/patches/16manpage_errors.patch
index 2c7be51..e167c5f 100644
--- a/debian/patches/16manpage_errors.dpatch
+++ b/debian/patches/16manpage_errors.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16manpage_errors.dpatch by <[email protected]>
-##
-## DP: Fix a truckload of roff markup glitches.
+From: <[email protected]>
+Subject: Fix a truckload of roff markup glitches.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/docs/vi.man/vi.1 nvi-1.81.6/docs/vi.man/vi.1
--- nvi-1.81.6.orig/docs/vi.man/vi.1 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/docs/vi.man/vi.1 2008-05-01 18:17:59.000000000 +0200
diff --git a/debian/patches/17tutorial_typos.dpatch b/debian/patches/17tutorial_typos.patch
similarity index 96%
rename from debian/patches/17tutorial_typos.dpatch
rename to debian/patches/17tutorial_typos.patch
index f45aa80..a7b002d 100644
--- a/debian/patches/17tutorial_typos.dpatch
+++ b/debian/patches/17tutorial_typos.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17tutorial_typos.dpatch
-##
-## DP: Fix typos in the nvi tutorial.
+From: Unknown
+Subject: Fix typos in the nvi tutorial.
-@DPATCH@
--- nvi-1.81.6.orig/nvi-1.79/docs/tutorial/vi.beginner
+++ nvi-1.81.6/nvi-1.79/docs/tutorial/vi.beginner
@@ -505,7 +505,7 @@
diff --git a/debian/patches/18dbpagesize_binpower.dpatch b/debian/patches/18dbpagesize_binpower.patch
similarity index 71%
rename from debian/patches/18dbpagesize_binpower.dpatch
rename to debian/patches/18dbpagesize_binpower.patch
index 0fabbc6..ec04504 100644
--- a/debian/patches/18dbpagesize_binpower.dpatch
+++ b/debian/patches/18dbpagesize_binpower.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18dbpagesize_binpower.dpatch by <[email protected]>
-##
-## DP: Make sure that the pagesize passed to db__set_pagesize() is
-## DP: a power of two.
+From: <[email protected]>
+Subject: Make sure that the pagesize passed to db__set_pagesize() is
+a power of two.
-@DPATCH@
--- nvi-1.81.6.orig/common/exf.c 2009-03-09 01:48:01.695862889 +0100
+++ nvi-1.81.6/common/exf.c 2009-03-09 10:42:41.147866272 +0100
@@ -249,11 +249,10 @@
diff --git a/debian/patches/19include_term_h.dpatch b/debian/patches/19include_term_h.patch
similarity index 79%
rename from debian/patches/19include_term_h.dpatch
rename to debian/patches/19include_term_h.patch
index a4e4698..bb774e0 100644
--- a/debian/patches/19include_term_h.dpatch
+++ b/debian/patches/19include_term_h.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19include_term_h.dpatch by <[email protected]>
-##
-## DP: Add <term.h> to the include list to suppress a few warnings.
+From: <[email protected]>
+Subject: Add <term.h> to the include list to suppress a few warnings.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/cl/cl_funcs.c nvi-1.81.6/cl/cl_funcs.c
--- nvi-1.81.6.orig/cl/cl_funcs.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/cl/cl_funcs.c 2008-05-01 18:23:08.000000000 +0200
diff --git a/debian/patches/20glibc_has_grantpt.dpatch b/debian/patches/20glibc_has_grantpt.patch
similarity index 76%
rename from debian/patches/20glibc_has_grantpt.dpatch
rename to debian/patches/20glibc_has_grantpt.patch
index 967951e..bebad86 100644
--- a/debian/patches/20glibc_has_grantpt.dpatch
+++ b/debian/patches/20glibc_has_grantpt.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20glibc_has_grantpt.dpatch by <[email protected]>
-##
-## DP: glibc has grantpt(), so only hceck for HAVE_SYS5_PTY
-## DP: on non-glibc installations.
+From: <[email protected]>
+Subject: glibc has grantpt(), so only hceck for HAVE_SYS5_PTY
+ on non-glibc installations.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/ex/ex_script.c nvi-1.81.6/ex/ex_script.c
--- nvi-1.81.6.orig/ex/ex_script.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/ex/ex_script.c 2008-05-01 18:24:06.000000000 +0200
diff --git a/debian/patches/21exrc_writability_check.dpatch b/debian/patches/21exrc_writability_check.patch
similarity index 90%
rename from debian/patches/21exrc_writability_check.dpatch
rename to debian/patches/21exrc_writability_check.patch
index a93dbc5..e310931 100644
--- a/debian/patches/21exrc_writability_check.dpatch
+++ b/debian/patches/21exrc_writability_check.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21exrc_writability_check.dpatch by <[email protected]>
-##
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/ex/ex_init.c nvi-1.81.6/ex/ex_init.c
--- nvi-1.81.6.orig/ex/ex_init.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/ex/ex_init.c 2008-05-01 18:24:45.000000000 +0200
diff --git a/debian/patches/23debian_alternatives.dpatch b/debian/patches/23debian_alternatives.patch
similarity index 80%
rename from debian/patches/23debian_alternatives.dpatch
rename to debian/patches/23debian_alternatives.patch
index 5614041..38681eb 100644
--- a/debian/patches/23debian_alternatives.dpatch
+++ b/debian/patches/23debian_alternatives.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 23debian_alternatives.dpatch by <[email protected]>
-##
-## DP: Adapt the internal program name if nvi was called via one of
-## DP: the Debian alternative symlinks.
+From: <[email protected]>
+Subject: Adapt the internal program name if nvi was called via one of
+ the Debian alternative symlinks.
-@DPATCH@
diff -Naur nvi-1.81.6.orig/common/gs.c nvi-1.81.6/common/gs.c
--- nvi-1.81.6.orig/common/gs.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/common/gs.c 2008-05-01 18:28:44.000000000 +0200
diff --git a/debian/patches/24fallback_to_dumb_term.dpatch b/debian/patches/24fallback_to_dumb_term.patch
similarity index 81%
rename from debian/patches/24fallback_to_dumb_term.dpatch
rename to debian/patches/24fallback_to_dumb_term.patch
index 29e356a..60aa4cc 100644
--- a/debian/patches/24fallback_to_dumb_term.dpatch
+++ b/debian/patches/24fallback_to_dumb_term.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 24fallback_to_dumb_term.dpatch by <[email protected]>
-##
-## DP: If there's no $TERM around, just fall back to "dumb".
+From: <[email protected]>
+Subject: If there's no $TERM around, just fall back to "dumb".
-@DPATCH@
diff -Naur nvi-1.81.6.orig/cl/cl_main.c nvi-1.81.6/cl/cl_main.c
--- nvi-1.81.6.orig/cl/cl_main.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/cl/cl_main.c 2008-05-01 18:29:13.000000000 +0200
diff --git a/debian/patches/25manpage_note_dropped_F.dpatch b/debian/patches/25manpage_note_dropped_F.patch
similarity index 81%
rename from debian/patches/25manpage_note_dropped_F.dpatch
rename to debian/patches/25manpage_note_dropped_F.patch
index 2087e7d..9eb68c1 100644
--- a/debian/patches/25manpage_note_dropped_F.dpatch
+++ b/debian/patches/25manpage_note_dropped_F.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25manpage_note_dropped_F.dpatch by <[email protected]>
-##
-## DP: Replace the manpage paragraph about the '-F' commandline option
-## DP: with a notice that is has been dropped.
+From: <[email protected]>
+Subject: Replace the manpage paragraph about the '-F' commandline option
+ with a notice that is has been dropped.
-@DPATCH@
--- nvi-1.81.6+debian-1.orig/docs/vi.man/vi.1 2008-06-13 00:52:45.000000000 +0200
+++ nvi-1.81.6+debian-1/docs/vi.man/vi.1 2008-06-13 00:55:40.000000000 +0200
@@ -17,7 +17,7 @@
diff --git a/debian/patches/26trailing_tab_segv.dpatch b/debian/patches/26trailing_tab_segv.patch
similarity index 61%
rename from debian/patches/26trailing_tab_segv.dpatch
rename to debian/patches/26trailing_tab_segv.patch
index bf3653b..d6c5a90 100644
--- a/debian/patches/26trailing_tab_segv.dpatch
+++ b/debian/patches/26trailing_tab_segv.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 26trailing_tab_segv.dpatch by <[email protected]>
-##
-## DP: Prevent a segfault if a trailing tab is pushed to a new line by inserting
-## DP: characters before it if 'set number' is in effect.
+From: <[email protected]>
+Subject: Prevent a segfault if a trailing tab is pushed to a new line by inserting
+characters before it if 'set number' is in effect.
-@DPATCH@
--- nvi-1.81.6+debian.orig/vi/vs_relative.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6+debian/vi/vs_relative.c 2008-06-13 03:22:55.000000000 +0200
@@ -133,7 +133,7 @@
diff --git a/debian/patches/27support_C_locale.dpatch b/debian/patches/27support_C_locale.patch
similarity index 82%
rename from debian/patches/27support_C_locale.dpatch
rename to debian/patches/27support_C_locale.patch
index 24663d1..97d2141 100644
--- a/debian/patches/27support_C_locale.dpatch
+++ b/debian/patches/27support_C_locale.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 27support_C_locale.dpatch by <[email protected]>
-##
-## DP: Allow users to edit 8-bit files even under LC_CTYPE=C.
+From: <[email protected]>
+Subject: Allow users to edit 8-bit files even under LC_CTYPE=C.
-@DPATCH@
--- nvi-1.81.6.orig/common/conv.c 2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/common/conv.c 2009-03-09 16:45:37.812022582 +0100
@@ -322,11 +322,16 @@
diff --git a/debian/patches/28regex_widechar.dpatch b/debian/patches/28regex_widechar.patch
similarity index 54%
rename from debian/patches/28regex_widechar.dpatch
rename to debian/patches/28regex_widechar.patch
index 4fc50d8..5c1f62e 100644
--- a/debian/patches/28regex_widechar.dpatch
+++ b/debian/patches/28regex_widechar.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 28regex_widechar.dpatch by <[email protected]>
-##
-## DP: Fix an overflow check to properly mask off the undesired bits
-## DP: instead of casting (and accidentally sign-extending) the value.
-## DP: Bugfix for #523934.
+From: <[email protected]>
+Subject: Fix an overflow check to properly mask off the undesired bits
+ instead of casting (and accidentally sign-extending) the value.
+ Bugfix for #523934.
-@DPATCH@
--- nvi-1.81.6.orig/regex/regcomp.c 2009-06-03 22:44:27.530015032 +0200
+++ nvi-1.81.6/regex/regcomp.c 2009-06-05 02:15:01.021006288 +0200
@@ -607,7 +607,7 @@
diff --git a/debian/patches/29file_backup.dpatch b/debian/patches/29file_backup.patch
similarity index 75%
rename from debian/patches/29file_backup.dpatch
rename to debian/patches/29file_backup.patch
index e168105..52b1e92 100644
--- a/debian/patches/29file_backup.dpatch
+++ b/debian/patches/29file_backup.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 29file_backup.dpatch by <[email protected]>
-##
-## DP: Save the intermediate CHAR2INT conversion pointer because
-## DP: that pointer is reused by later conversions in calls below.
+From: <[email protected]>
+Subject: Save the intermediate CHAR2INT conversion pointer because
+ that pointer is reused by later conversions in calls below.
-@DPATCH@
--- nvi-1.81.6.orig/common/exf.c 2009-07-24 11:30:05.962060755 +0200
+++ nvi-1.81.6/common/exf.c 2009-07-24 12:09:57.511311177 +0200
@@ -1092,8 +1092,8 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9944f0d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,27 @@
+01additional_upstream_data.patch
+03db4.patch
+04confdefs.patch
+06default_value_escapetime.patch
+07flush_cache.patch
+08lfs.patch
+08safe_printf.patch
+08tempfile_umask.patch
+09casting.patch
+10no_one_line_visual.patch
+11backward_sentence_moving.patch
+12horiz_scroll_count.patch
+13widechar_horrors.patch
+14private_regex_fixes.patch
+15search_word.patch
+16manpage_errors.patch
+17tutorial_typos.patch
+18dbpagesize_binpower.patch
+19include_term_h.patch
+20glibc_has_grantpt.patch
+21exrc_writability_check.patch
+23debian_alternatives.patch
+24fallback_to_dumb_term.patch
+25manpage_note_dropped_F.patch
+26trailing_tab_segv.patch
+27support_C_locale.patch
+29file_backup.patch
diff --git a/debian/rules b/debian/rules
index 6d37a37..f7ba7f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,13 +26,11 @@ clean:
rm -f dist/config.sub dist/config.guess
[ ! -f build.unix/Makefile ] || make -C build.unix distclean
find build.unix -type f -and -not -name 'README*' -print0 | xargs -0 rm -f
- dpatch deapply-all
dh_clean
build: build-stamp
build-stamp:
dh_testdir
- dpatch apply-all
# BUILD NVI
cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub dist/
cd build.unix && \
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.1
