Package: sniffit
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 fec9da128d819c20a74118ac291af95817e0df0a Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 05:53:38 -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/README.source                               |   38 --------------------
 debian/changelog                                   |    8 ++++
 debian/compat                                      |    2 +-
 debian/control                                     |    4 +-
 debian/patches/00list                              |    5 ---
 .../{01_diffpatch.dpatch => 01_diffpatch.patch}    |    7 +---
 .../{02_headers.dpatch => 02_headers.patch}        |    9 ++---
 ...{03_fixmanpages.dpatch => 03_fixmanpages.patch} |    7 +---
 ...4_sniffit+kbsd.dpatch => 04_sniffit+kbsd.patch} |    7 +---
 ...h => 05_fix_segfaults_on_amd64_bts644978.patch} |    9 +----
 debian/patches/series                              |    5 +++
 debian/rules                                       |    5 +--
 debian/source/format                               |    1 +
 13 files changed, 30 insertions(+), 77 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01_diffpatch.dpatch => 01_diffpatch.patch} (99%)
 rename debian/patches/{02_headers.dpatch => 02_headers.patch} (93%)
 rename debian/patches/{03_fixmanpages.dpatch => 03_fixmanpages.patch} (96%)
 rename debian/patches/{04_sniffit+kbsd.dpatch => 04_sniffit+kbsd.patch} (73%)
 rename debian/patches/{05_fix_segfaults_on_amd64_bts644978.dpatch => 05_fix_segfaults_on_amd64_bts644978.patch} (56%)
 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 fc98b3d..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,38 +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:
-
-    debian/rules patch
-
-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, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
---- 
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <dan...@debian.org>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index 404cc96..e6bed03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sniffit (0.3.7.beta-15.2) 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>  Wed, 29 Feb 2012 05:49:41 -0500
+
 sniffit (0.3.7.beta-15.1) 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 eb2e51f..b49b55d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sniffit
 Section: net
 Priority: optional
 Maintainer: William Vera <bi...@billy.com.mx>
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), libpcap-dev, libncurses5-dev, autotools-dev, dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), libpcap-dev, libncurses5-dev, autotools-dev
 Homepage: http://reptile.rug.ac.be/~coder/sniffit/
 
 Package: sniffit
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9e9fcd7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_diffpatch
-02_headers.dpatch  
-03_fixmanpages.dpatch
-04_sniffit+kbsd.dpatch
-05_fix_segfaults_on_amd64_bts644978.dpatch
diff --git a/debian/patches/01_diffpatch.dpatch b/debian/patches/01_diffpatch.patch
similarity index 99%
rename from debian/patches/01_diffpatch.dpatch
rename to debian/patches/01_diffpatch.patch
index f104581..bd0f32e 100644
--- a/debian/patches/01_diffpatch.dpatch
+++ b/debian/patches/01_diffpatch.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_diffpatch.dpatch by William Vera <bi...@billy.com.mx>
-##
-## DP: New patch generated from sniffit 0.3.7.beta-13 diff.gz
+From: William Vera <bi...@billy.com.mx>
+Subject: New patch generated from sniffit 0.3.7.beta-13 diff.gz
 
-@DPATCH@
 
 --- sniffit-0.3.7.beta.orig/sn_interface.c
 +++ sniffit-0.3.7.beta/sn_interface.c
diff --git a/debian/patches/02_headers.dpatch b/debian/patches/02_headers.patch
similarity index 93%
rename from debian/patches/02_headers.dpatch
rename to debian/patches/02_headers.patch
index fb744b9..3be8169 100644
--- a/debian/patches/02_headers.dpatch
+++ b/debian/patches/02_headers.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-headers.dpatch by William Vera <bi...@billy.com.mx>
-##
-## DP: Include more headers, so that prototyes are correctly defined, avoiding 
-## DP: some chrashes by Karoly Segesdi
+From: William Vera <bi...@billy.com.mx>
+Subject: Include more headers, so that prototyes are correctly defined, avoiding 
+some chrashes by Karoly Segesdi
 
-@DPATCH@
 
 diff -u sniffit-0.3.7.beta/sniffit.0.3.7.c sniffit-0.3.7.beta/sniffit.0.3.7.c
 --- sniffit-0.3.7.beta/sniffit.0.3.7.c
diff --git a/debian/patches/03_fixmanpages.dpatch b/debian/patches/03_fixmanpages.patch
similarity index 96%
rename from debian/patches/03_fixmanpages.dpatch
rename to debian/patches/03_fixmanpages.patch
index 649fa68..9d8499e 100644
--- a/debian/patches/03_fixmanpages.dpatch
+++ b/debian/patches/03_fixmanpages.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-fixmanpages.dpatch by William Vera <bi...@billy.com.mx>
-##
-## DP: Format corrections on the man pages.
+From: William Vera <bi...@billy.com.mx>
+Subject: Format corrections on the man pages.
 
-@DPATCH@
 diff -urNad sniffit-0.3.7.beta~/sniffit.5 sniffit-0.3.7.beta/sniffit.5
 --- sniffit-0.3.7.beta~/sniffit.5	2009-06-11 13:20:37.000000000 -0500
 +++ sniffit-0.3.7.beta/sniffit.5	2009-06-11 13:20:38.000000000 -0500
diff --git a/debian/patches/04_sniffit+kbsd.dpatch b/debian/patches/04_sniffit+kbsd.patch
similarity index 73%
rename from debian/patches/04_sniffit+kbsd.dpatch
rename to debian/patches/04_sniffit+kbsd.patch
index c2c6415..f8660fa 100644
--- a/debian/patches/04_sniffit+kbsd.dpatch
+++ b/debian/patches/04_sniffit+kbsd.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_sniffit+kbsd.dpatch by Cyril Brulebois <k...@debian.org>
-##
-## DP: add support for GNU/kFreeBSD
+From: Cyril Brulebois <k...@debian.org>
+Subject: add support for GNU/kFreeBSD
 
-@DPATCH@
 
 --- sniffit-0.3.7.beta.orig/configure.in
 +++ sniffit-0.3.7.beta/configure.in
diff --git a/debian/patches/05_fix_segfaults_on_amd64_bts644978.dpatch b/debian/patches/05_fix_segfaults_on_amd64_bts644978.patch
similarity index 56%
rename from debian/patches/05_fix_segfaults_on_amd64_bts644978.dpatch
rename to debian/patches/05_fix_segfaults_on_amd64_bts644978.patch
index 7f29aa7..057daa5 100644
--- a/debian/patches/05_fix_segfaults_on_amd64_bts644978.dpatch
+++ b/debian/patches/05_fix_segfaults_on_amd64_bts644978.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_segfaults_on_amd64_bts644978.dpatch
-## by Sebastian Harl <tok...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix segfaults on amd64 (Closes: #644978)
+From: Sebastian Harl <tok...@debian.org>
+Subject: Fix segfaults on amd64 (Closes: #644978)
 
-@DPATCH@
 
 --- sniffit-0.3.7.beta/sn_logfile.c.orig	2011-11-10 12:59:58.000000000 +0900
 +++ sniffit-0.3.7.beta/sn_logfile.c	2011-11-10 13:00:22.000000000 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..496f422
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01_diffpatch.patch
+02_headers.patch
+03_fixmanpages.patch
+04_sniffit+kbsd.patch
+05_fix_segfaults_on_amd64_bts644978.patch
diff --git a/debian/rules b/debian/rules
index 122da99..a2292bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
 
 build: build-stamp
-build-stamp: patch-stamp 
+build-stamp: 
 	dh build --before configure
 	cp /usr/share/misc/config.guess .
 	cp /usr/share/misc/config.sub .
@@ -10,7 +9,7 @@ build-stamp: patch-stamp
 	$(MAKE) OBJ_OPT="" EXE_OPT="-lpcap"
 	dh build --after build
 
-clean: unpatch
+clean:
 	dh clean
 	rm -f config.sub config.guess
 
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

Reply via email to