Package: asused
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.
See atatched patch for proposed changes. Please let me know how could I
best help to upgrade the package e.g. with NMU if you are working on
other issues needing attention
Thanks,
Jari
>From b377b91c1d8b77c3b89c376fe19e615865f6a1b6 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 2 Mar 2012 11:12:15 -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 | 5 -----
...ery_fix.dpatch => 01_whois_new_query_fix.patch} | 7 ++-----
.../{02_typo_fix.dpatch => 02_typo_fix.patch} | 7 ++-----
...rpreter_fix.dpatch => 03_interpreter_fix.patch} | 7 ++-----
...rk_tests.dpatch => 04_drop_network_tests.patch} | 7 ++-----
...x_priv_range.dpatch => 05_fix_priv_range.patch} | 7 ++-----
debian/patches/series | 5 +++++
debian/rules | 5 ++---
debian/source/format | 2 +-
13 files changed, 29 insertions(+), 40 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_whois_new_query_fix.dpatch => 01_whois_new_query_fix.patch} (73%)
rename debian/patches/{02_typo_fix.dpatch => 02_typo_fix.patch} (76%)
rename debian/patches/{03_interpreter_fix.dpatch => 03_interpreter_fix.patch} (67%)
rename debian/patches/{04_drop_network_tests.dpatch => 04_drop_network_tests.patch} (94%)
rename debian/patches/{05_fix_priv_range.dpatch => 05_fix_priv_range.patch} (81%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f0fe49a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-We use dpatch for patch handling inside our package(s). Please see
-/usr/share/doc/dpatch/README.source.gz (if you have installed dpatch) for
-documentation about dpatch.
diff --git a/debian/changelog b/debian/changelog
index e9f2d8a..5cc39f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+asused (3.72-9.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> Fri, 02 Mar 2012 11:10:06 -0500
+
asused (3.72-9) unstable; urgency=low
* Fix broken Vcs information
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 2ce6a97..f2e551d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: asused
Section: utils
Priority: optional
Maintainer: Jan Wagner <w...@cyconet.org>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: perl
Homepage: http://www.ripe.net/tools/
Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/asused
Vcs-Svn: https://scm.uncompleted.org/svn/debian/asused/trunk/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Package: asused
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index cc8fb9f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_whois_new_query_fix.dpatch
-02_typo_fix.dpatch
-03_interpreter_fix.dpatch
-04_drop_network_tests.dpatch
-05_fix_priv_range.dpatch
diff --git a/debian/patches/01_whois_new_query_fix.dpatch b/debian/patches/01_whois_new_query_fix.patch
similarity index 73%
rename from debian/patches/01_whois_new_query_fix.dpatch
rename to debian/patches/01_whois_new_query_fix.patch
index 2793eab..d3b64af 100644
--- a/debian/patches/01_whois_new_query_fix.dpatch
+++ b/debian/patches/01_whois_new_query_fix.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01_whois_new_query_fix.dpatch by Jan Wagner <w...@cyconet.org>
-##
-## DP: Make use of -B parameter of ripe whois.
+From: Jan Wagner <w...@cyconet.org>
+Subject: Make use of -B parameter of ripe whois.
-@DPATCH@
--- asused-3.72.orig/Whois/RipeWhois/RipeWhois.pm 2001-04-18 19:01:20.000000000 +0200
+++ asused-3.72/Whois/RipeWhois/RipeWhois.pm 2005-05-02 16:19:05.000000000 +0200
diff --git a/debian/patches/02_typo_fix.dpatch b/debian/patches/02_typo_fix.patch
similarity index 76%
rename from debian/patches/02_typo_fix.dpatch
rename to debian/patches/02_typo_fix.patch
index 9c9cdb2..5ad97b0 100644
--- a/debian/patches/02_typo_fix.dpatch
+++ b/debian/patches/02_typo_fix.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02_typo_fix.dpatch by Jan Wagner <w...@cyconet.org>
-##
-## DP: fix typo.
+From: Jan Wagner <w...@cyconet.org>
+Subject: fix typo.
-@DPATCH@
--- asused-3.72.orig/asused.PL 2003-10-07 17:46:23.000000000 +0200
+++ asused-3.72/asused.PL 2005-05-09 15:42:14.000000000 +0200
diff --git a/debian/patches/03_interpreter_fix.dpatch b/debian/patches/03_interpreter_fix.patch
similarity index 67%
rename from debian/patches/03_interpreter_fix.dpatch
rename to debian/patches/03_interpreter_fix.patch
index 4234a91..f5ca1ee 100644
--- a/debian/patches/03_interpreter_fix.dpatch
+++ b/debian/patches/03_interpreter_fix.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03_interpreter_fix.dpatch by Jan Wagner <w...@cyconet.org>
-##
-## DP: fix interpreter
+From: Jan Wagner <w...@cyconet.org>
+Subject: fix interpreter
-@DPATCH@
--- asused-3.72.orig/Reg/Asused/Asused.pm 2006-11-05 21:34:43.000000000 +0100
+++ asused-3.72/Reg/Asused/Asused.pm 2006-11-05 21:37:45.000000000 +0100
diff --git a/debian/patches/04_drop_network_tests.dpatch b/debian/patches/04_drop_network_tests.patch
similarity index 94%
rename from debian/patches/04_drop_network_tests.dpatch
rename to debian/patches/04_drop_network_tests.patch
index e2b2cde..10dee61 100644
--- a/debian/patches/04_drop_network_tests.dpatch
+++ b/debian/patches/04_drop_network_tests.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 04_drop_network_tests.dpatch by Jan Wagner <w...@cyconet.org>
-##
-## DP: disable tests requiring network access
+From: Jan Wagner <w...@cyconet.org>
+Subject: disable tests requiring network access
-@DPATCH@
diff -Nur asused-3.72.orig/Net/RIPEWhois/in/test.pl asused-3.72/Net/RIPEWhois/in/test.pl
--- asused-3.72.orig/Net/RIPEWhois/in/test.pl 2001-04-18 15:56:09.000000000 +0000
diff --git a/debian/patches/05_fix_priv_range.dpatch b/debian/patches/05_fix_priv_range.patch
similarity index 81%
rename from debian/patches/05_fix_priv_range.dpatch
rename to debian/patches/05_fix_priv_range.patch
index cefc87c..2e5b7af 100644
--- a/debian/patches/05_fix_priv_range.dpatch
+++ b/debian/patches/05_fix_priv_range.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_priv_range.dpatch by Jan Krajdl <s...@spamik.cz>
-##
-## DP: Fix detection of 10/8.
+From: Jan Krajdl <s...@spamik.cz>
+Subject: Fix detection of 10/8.
-@DPATCH@
diff -urNad asused-3.72~/ipv4pack/ipv4pack.pm asused-3.72/ipv4pack/ipv4pack.pm
--- asused-3.72~/ipv4pack/ipv4pack.pm 2001-10-10 17:23:32.000000000 +0200
+++ asused-3.72/ipv4pack/ipv4pack.pm 2009-11-23 20:18:44.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c4b8821
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01_whois_new_query_fix.patch
+02_typo_fix.patch
+03_interpreter_fix.patch
+04_drop_network_tests.patch
+05_fix_priv_range.patch
diff --git a/debian/rules b/debian/rules
index fb47575..738a321 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
PACKAGE=$(shell dh_listpackages)
@@ -18,7 +17,7 @@ endif
TMP =$(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -28,7 +27,7 @@ build-stamp: patch-stamp
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9
