Package: wbox
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
Straluna, as we spoke before, here is the proposed NMU patch.
Please let me know if there is anything that needs adjusting or if it
is ok to upload with these changes.
Thanks,
Jari
>From b237a927b7d30ba2b1dd4d9ba74b36d5eb24505a Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 13:04:56 -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 | 3 ---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
...1_fix_makefile.dpatch => 01_fix_makefile.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 17 insertions(+), 16 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix_makefile.dpatch => 01_fix_makefile.patch} (62%)
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 04b5fcd..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-wbox for Debian
----------------
-This package build-depends on dpatch as patch system but needs no special handling instructions so simply take a look at /usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index 13de2ff..056c4f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wbox (5-1.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> Wed, 29 Feb 2012 13:00:47 -0500
+
wbox (5-1) unstable; urgency=low
* Initial release (Closes: #480981)
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 1620b04..5193722 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: wbox
Section: web
Priority: optional
Maintainer: Alberto Furia <stral...@email.it>
-Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.hping.org/wbox/
Package: wbox
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 75260c8..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_fix_makefile.dpatch
diff --git a/debian/patches/01_fix_makefile.dpatch b/debian/patches/01_fix_makefile.patch
similarity index 62%
rename from debian/patches/01_fix_makefile.dpatch
rename to debian/patches/01_fix_makefile.patch
index fcfc42c..b2dafa0 100644
--- a/debian/patches/01_fix_makefile.dpatch
+++ b/debian/patches/01_fix_makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_makefile.dpatch by Alberto Furia <stral...@email.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Added install target
+From: Alberto Furia <stral...@email.it>
+Subject: Added install target
-@DPATCH@
diff -urNad wbox-5~/Makefile wbox-5/Makefile
--- wbox-5~/Makefile 2009-12-10 10:35:39.000000000 +0100
+++ wbox-5/Makefile 2009-12-13 12:25:57.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f0167e2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix_makefile.patch
diff --git a/debian/rules b/debian/rules
index 4287fa2..d3c353d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,21 +2,20 @@
# debian/rules for wbox by Alberto Furia
# Written from scratch.
-include /usr/share/dpatch/dpatch.make
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_FLAGS += -s
endif
-build: patch-stamp build-stamp
+build: build-stamp
build-stamp:
$(MAKE) DESTDIR=$(CURDIR)/debian/wbox wbox
touch build-stamp
-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
