Hi,
As we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From e536db17c3ed47874177fcee7dba1d6f7b70d4f0 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 24 Feb 2012 12:46:37 -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 | 2 --
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
.../{01_Makefile.dpatch => 01_Makefile.patch} | 8 ++------
.../{02_mapages.dpatch => 02_mapages.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 5 ++---
debian/source/format | 1 +
10 files changed, 20 insertions(+), 22 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_Makefile.dpatch => 01_Makefile.patch} (65%)
rename debian/patches/{02_mapages.dpatch => 02_mapages.patch} (89%)
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 9a1a2c9..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This package uses dpatch to fix some errors.
-To know more about dpatch see /usr/share/doc/dpatch/README.source.gz file.
diff --git a/debian/changelog b/debian/changelog
index 59a2e9f..6274ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bittwist (1.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove 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> Fri, 24 Feb 2012 11:44:20 -0500
+
bittwist (1.1-1) unstable; urgency=low
* New upstream release.
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 89b1fec..167180c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: bittwist
Section: net
Priority: optional
Maintainer: Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
-Build-Depends: debhelper (>= 7), dpatch, libpcap-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), libpcap-dev
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/bittwist
Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/bittwist
Homepage: http://bittwist.sourceforge.net
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 837bb5e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_Makefile.dpatch
-02_mapages.dpatch
diff --git a/debian/patches/01_Makefile.dpatch b/debian/patches/01_Makefile.patch
similarity index 65%
rename from debian/patches/01_Makefile.dpatch
rename to debian/patches/01_Makefile.patch
index d81523b..4c4c2cc 100644
--- a/debian/patches/01_Makefile.dpatch
+++ b/debian/patches/01_Makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile.dpatch by Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes Makefile compliant with Debian.
+From: Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
+Subject: Makes Makefile compliant with Debian.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bittwist-1.1~/Makefile bittwist-1.1/Makefile
--- bittwist-1.1~/Makefile 2010-02-19 06:16:54.000000000 -0200
+++ bittwist-1.1/Makefile 2010-02-27 22:29:15.266305296 -0300
diff --git a/debian/patches/02_mapages.dpatch b/debian/patches/02_mapages.patch
similarity index 89%
rename from debian/patches/02_mapages.dpatch
rename to debian/patches/02_mapages.patch
index fef8e74..d862ea6 100644
--- a/debian/patches/02_mapages.dpatch
+++ b/debian/patches/02_mapages.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_mapages.dpatch by Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adjust hyphens used as minus sign in manpages.
+From: Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
+Subject: Adjust hyphens used as minus sign in manpages.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bittwist-1.1~/doc/bittwist.1 bittwist-1.1/doc/bittwist.1
--- bittwist-1.1~/doc/bittwist.1 2010-02-19 06:16:54.000000000 -0200
+++ bittwist-1.1/doc/bittwist.1 2010-02-27 22:43:42.710311119 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d66130a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_Makefile.patch
+02_mapages.patch
diff --git a/debian/rules b/debian/rules
index 3d1765a..fdbfaa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -15,12 +14,12 @@ endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
