Package: netdisco
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 0c94f4cee5f38e0c1ef5959aedf8ebe66846a36d Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 05:39:04 -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/changelog | 8 ++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 3 --
debian/patches/{01_fhs.dpatch => 01_fhs.patch} | 8 +---
...2_oui_location.dpatch => 02_oui_location.patch} | 10 ++----
debian/patches/03_getip_subnet.dpatch | 22 ------------
debian/patches/03_getip_subnet.patch | 18 +++++++++
...xtentry_size.dpatch => 04_textentry_size.patch} | 16 +++-----
..._defaults.dpatch => 05_graphviz_defaults.patch} | 10 ++----
...6_no_pg_vacuum.dpatch => 06_no_pg_vacuum.patch} | 14 +++-----
...erride.dpatch => 07_device_root_override.patch} | 8 +---
...device_routes.dpatch => 08_device_routes.patch} | 8 +---
...graphs_column.dpatch => 09_graphs_column.patch} | 8 +---
...mit.dpatch => 10_connected_devices_limit.patch} | 8 +---
debian/patches/series | 3 ++
debian/rules | 37 +++++++-------------
debian/source/format | 1 +
18 files changed, 73 insertions(+), 115 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fhs.dpatch => 01_fhs.patch} (98%)
rename debian/patches/{02_oui_location.dpatch => 02_oui_location.patch} (60%)
delete mode 100644 debian/patches/03_getip_subnet.dpatch
create mode 100644 debian/patches/03_getip_subnet.patch
rename debian/patches/{04_textentry_size.dpatch => 04_textentry_size.patch} (89%)
rename debian/patches/{05_graphviz_defaults.dpatch => 05_graphviz_defaults.patch} (72%)
rename debian/patches/{06_no_pg_vacuum.dpatch => 06_no_pg_vacuum.patch} (54%)
rename debian/patches/{07_device_root_override.dpatch => 07_device_root_override.patch} (87%)
rename debian/patches/{08_device_routes.dpatch => 08_device_routes.patch} (94%)
rename debian/patches/{09_graphs_column.dpatch => 09_graphs_column.patch} (85%)
rename debian/patches/{10_connected_devices_limit.dpatch => 10_connected_devices_limit.patch} (88%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 6a90fc9..1d29241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netdisco (1.0-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 05:37:30 -0500
+
netdisco (1.0-1) unstable; urgency=low
[ Oliver Gorwits ]
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 9786bec..889eca1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
Priority: extra
Maintainer: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
Uploaders: Christoph Martin <christoph.mar...@uni-mainz.de>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
XS-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/netdisco/
XS-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/netdisco/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b8b865f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_fhs
-02_oui_location
-05_graphviz_defaults
diff --git a/debian/patches/01_fhs.dpatch b/debian/patches/01_fhs.patch
similarity index 98%
rename from debian/patches/01_fhs.dpatch
rename to debian/patches/01_fhs.patch
index 0880734..ca9890f 100644
--- a/debian/patches/01_fhs.dpatch
+++ b/debian/patches/01_fhs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fhs.dpatch by Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make paths in NetDisco conform to Debian File Hierarchy Standard
+From: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
+Subject: Make paths in NetDisco conform to Debian File Hierarchy Standard
-@DPATCH@
diff -urN netdisco-1.0.orig/bin/catalyst_mac_vlan.pl netdisco-1.0/bin/catalyst_mac_vlan.pl
--- netdisco-1.0.orig/bin/catalyst_mac_vlan.pl 2003-05-13 20:20:08.000000000 +0100
diff --git a/debian/patches/02_oui_location.dpatch b/debian/patches/02_oui_location.patch
similarity index 60%
rename from debian/patches/02_oui_location.dpatch
rename to debian/patches/02_oui_location.patch
index 29a81a7..4b344d4 100644
--- a/debian/patches/02_oui_location.dpatch
+++ b/debian/patches/02_oui_location.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_oui_location.dpatch by Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make the -O option look for oui.txt in the cwd, rather than in the
-## DP: config dir, so it can be called by any user.
+From: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
+Subject: Make the -O option look for oui.txt in the cwd, rather than in the
+ config dir, so it can be called by any user.
-@DPATCH@
diff -urN netdisco-1.0.orig/netdisco netdisco-1.0/netdisco
--- netdisco-1.0.orig/netdisco 2009-06-20 18:45:13.000000000 +0100
diff --git a/debian/patches/03_getip_subnet.dpatch b/debian/patches/03_getip_subnet.dpatch
deleted file mode 100644
index b63dea0..0000000
--- a/debian/patches/03_getip_subnet.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_getip_subnet.dpatch by Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Although getip() is called as part of looking for hosts or IPs in the
-## DP: _only and _no config options, it cannot handle subnets (e.g. /20) which
-## DP: are also allowed, so this is a tiny hack to enable that.
-## DP: This bug is fixed in NetDisco 0.96
-
-@DPATCH@
-
---- trunk/netdisco.pm.orig 2007-03-18 01:50:48.000000000 +0000
-+++ trunk/netdisco.pm 2007-03-18 01:51:26.000000000 +0000
-@@ -481,7 +481,7 @@
-
- my $ip;
-
-- if ($hostname =~ /^\d+\.\d+\.\d+\.\d+$/) {
-+ if ($hostname =~ /^\d+\.\d+\.\d+\.\d+(?:\/\d+)?$/) {
- $ip = $hostname;
- } else {
- my $testhost = inet_aton($hostname);
diff --git a/debian/patches/03_getip_subnet.patch b/debian/patches/03_getip_subnet.patch
new file mode 100644
index 0000000..0c1598c
--- /dev/null
+++ b/debian/patches/03_getip_subnet.patch
@@ -0,0 +1,18 @@
+From: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
+Subject: Although getip() is called as part of looking for hosts or IPs in the
+ _only and _no config options, it cannot handle subnets (e.g. /20) which
+ are also allowed, so this is a tiny hack to enable that.
+ This bug is fixed in NetDisco 0.96
+
+
+--- trunk/netdisco.pm.orig 2007-03-18 01:50:48.000000000 +0000
++++ trunk/netdisco.pm 2007-03-18 01:51:26.000000000 +0000
+@@ -481,7 +481,7 @@
+
+ my $ip;
+
+- if ($hostname =~ /^\d+\.\d+\.\d+\.\d+$/) {
++ if ($hostname =~ /^\d+\.\d+\.\d+\.\d+(?:\/\d+)?$/) {
+ $ip = $hostname;
+ } else {
+ my $testhost = inet_aton($hostname);
diff --git a/debian/patches/04_textentry_size.dpatch b/debian/patches/04_textentry_size.patch
similarity index 89%
rename from debian/patches/04_textentry_size.dpatch
rename to debian/patches/04_textentry_size.patch
index e59dd0c..bcfee3d 100644
--- a/debian/patches/04_textentry_size.dpatch
+++ b/debian/patches/04_textentry_size.patch
@@ -1,14 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_textentry_sizes.dpatch by Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some web interface text entry boxes which are supposed to be able to
-## DP: accept host names have maxlength set such that they're way to short to
-## DP: be useful. This patch extends maxlength to 255 chars (the RFC max value
-## DP: for FQDN) and widens some entry boxes for aesthetics.
-## DP: This bug is fixed in NetDisco 0.96
+From: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
+Subject: Some web interface text entry boxes which are supposed to be able to
+accept host names have maxlength set such that they're way to short to
+be useful. This patch extends maxlength to 255 chars (the RFC max value
+for FQDN) and widens some entry boxes for aesthetics.
+This bug is fixed in NetDisco 0.96
-@DPATCH@
diff -urN netdisco-0.95.orig/html/device.html netdisco-0.95/html/device.html
--- netdisco-0.95.orig/html/device.html 2007-03-17 23:36:29.000000000 +0000
diff --git a/debian/patches/05_graphviz_defaults.dpatch b/debian/patches/05_graphviz_defaults.patch
similarity index 72%
rename from debian/patches/05_graphviz_defaults.dpatch
rename to debian/patches/05_graphviz_defaults.patch
index d0f7e87..c528185 100644
--- a/debian/patches/05_graphviz_defaults.dpatch
+++ b/debian/patches/05_graphviz_defaults.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_graphviz_defaults.dpatch by Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Alter the default options for GraphViz to omit less warnings
-## DP: Bug#497939
+From: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
+Subject: Alter the default options for GraphViz to omit less warnings
+Bug#497939
-@DPATCH@
diff -urN netdisco-1.0.orig/netdisco netdisco-1.0/netdisco
--- netdisco-1.0.orig/netdisco 2009-06-20 18:45:13.000000000 +0100
diff --git a/debian/patches/06_no_pg_vacuum.dpatch b/debian/patches/06_no_pg_vacuum.patch
similarity index 54%
rename from debian/patches/06_no_pg_vacuum.dpatch
rename to debian/patches/06_no_pg_vacuum.patch
index 9f24d29..f433eaa 100644
--- a/debian/patches/06_no_pg_vacuum.dpatch
+++ b/debian/patches/06_no_pg_vacuum.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_no_pg_vacuum.dpatch by Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable NEtdisco's database vacuum - this is buggy in 0.95 as it
-## DP: attempts to vacuum all tables including those netdisco does not have
-## DP: permissions upon.
-## DP: Bug#497938
+From: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
+Subject: Disable NEtdisco's database vacuum - this is buggy in 0.95 as it
+ attempts to vacuum all tables including those netdisco does not have
+ permissions upon.
+ Bug#497938
-@DPATCH@
diff -urN netdisco-0.95.orig/netdisco netdisco-0.95/netdisco
--- netdisco-0.95.orig/netdisco 2008-09-11 15:42:18.000000000 +0100
diff --git a/debian/patches/07_device_root_override.dpatch b/debian/patches/07_device_root_override.patch
similarity index 87%
rename from debian/patches/07_device_root_override.dpatch
rename to debian/patches/07_device_root_override.patch
index 32492bf..70a1cb8 100644
--- a/debian/patches/07_device_root_override.dpatch
+++ b/debian/patches/07_device_root_override.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_device_root_override.dpatch by Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow discovered Root IP to be overridden via a DB table
+From: Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>
+Subject: Allow discovered Root IP to be overridden via a DB table
-@DPATCH@
diff -urN netdisco.orig/html/device.html netdisco/html/device.html
--- netdisco.orig/html/device.html 2009-09-08 22:19:51.000000000 +0100
diff --git a/debian/patches/08_device_routes.dpatch b/debian/patches/08_device_routes.patch
similarity index 94%
rename from debian/patches/08_device_routes.dpatch
rename to debian/patches/08_device_routes.patch
index f83c945..f1d24d4 100644
--- a/debian/patches/08_device_routes.dpatch
+++ b/debian/patches/08_device_routes.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_device_routes.dpatch by Arizona State University
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Retrieve route information from device and store in DB
+From: Arizona State University
+Subject: Retrieve route information from device and store in DB
-@DPATCH@
diff -urN netdisco.orig/netdisco netdisco/netdisco
--- netdisco.orig/netdisco 2009-06-20 18:45:13.000000000 +0100
diff --git a/debian/patches/09_graphs_column.dpatch b/debian/patches/09_graphs_column.patch
similarity index 85%
rename from debian/patches/09_graphs_column.dpatch
rename to debian/patches/09_graphs_column.patch
index 01f4416..3f57320 100644
--- a/debian/patches/09_graphs_column.dpatch
+++ b/debian/patches/09_graphs_column.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_graphs_column.dpatch by oliver.gorw...@oucs.ox.ac.uk
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: replace the port control column with a graphs link column
+From: oliver.gorw...@oucs.ox.ac.uk
+Subject: replace the port control column with a graphs link column
-@DPATCH@
diff -urN netdisco.orig/html/device.html netdisco/html/device.html
--- netdisco.orig/html/device.html 2009-09-08 22:19:51.000000000 +0100
diff --git a/debian/patches/10_connected_devices_limit.dpatch b/debian/patches/10_connected_devices_limit.patch
similarity index 88%
rename from debian/patches/10_connected_devices_limit.dpatch
rename to debian/patches/10_connected_devices_limit.patch
index fdb45da..ae63344 100644
--- a/debian/patches/10_connected_devices_limit.dpatch
+++ b/debian/patches/10_connected_devices_limit.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_connected_devices_limit.dpatch by oliver.gorw...@oucs.ox.ac.uk
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: limit the number of connected device shown to about 3 or so
+From: oliver.gorw...@oucs.ox.ac.uk
+Subject: limit the number of connected device shown to about 3 or so
-@DPATCH@
diff -urN netdisco.orig/html/device.html netdisco/html/device.html
--- netdisco.orig/html/device.html 2009-09-08 22:19:51.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b2c8ea8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_fhs.patch
+02_oui_location.patch
+05_graphviz_defaults.patch
diff --git a/debian/rules b/debian/rules
index 5b90050..312eeaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,29 +9,27 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
-PKG_COMMON = netdisco-common
-PKG_FRONTEND = netdisco-frontend
-PKG_BACKEND = netdisco-backend
-TMP_COMMON = $(CURDIR)/debian/$(PKG_COMMON)
-TMP_FRONTEND = $(CURDIR)/debian/$(PKG_FRONTEND)
-TMP_BACKEND = $(CURDIR)/debian/$(PKG_BACKEND)
+PKG_COMMON = netdisco-common
+PKG_FRONTEND = netdisco-frontend
+PKG_BACKEND = netdisco-backend
+TMP_COMMON = $(CURDIR)/debian/$(PKG_COMMON)
+TMP_FRONTEND = $(CURDIR)/debian/$(PKG_FRONTEND)
+TMP_BACKEND = $(CURDIR)/debian/$(PKG_BACKEND)
INSTALL = install
-INSTALL_FILE = $(INSTALL) -p -oroot -groot -m644
-INSTALL_PROGRAM = $(INSTALL) -p -oroot -groot -m755
-INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755
-INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755
+INSTALL_FILE = $(INSTALL) -p -oroot -groot -m644
+INSTALL_PROGRAM = $(INSTALL) -p -oroot -groot -m755
+INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755
+INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755
configure:
-build: patch
+build:
pod2man --section=1 $(CURDIR)/netdisco > $(CURDIR)/netdisco.1
pod2man --section=1 $(CURDIR)/sql/pg > $(CURDIR)/npg.1
for i in `ls -1 $(CURDIR)/sql/*.sql | grep -v upgrade`; do cat $$i >> $(CURDIR)/sql/complete_bootstrap.sql; done
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f $(CURDIR)/netdisco.1
@@ -40,10 +38,6 @@ clean-patched:
rm -f build-stamp configure-stamp
dh_clean
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: install-frontend install-backend install-common
install-common:
@@ -137,11 +131,6 @@ install-backend:
dh_install
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
binary-arch:
binary-indep: install
@@ -175,4 +164,4 @@ binary-indep: install
dh_builddeb
binary: binary-indep
-.PHONY: clean-patched unpatch patch patch-stamp build clean binary-indep binary-arch binary install configure install-backend install-frontend install-common
+.PHONY: build clean binary-indep binary-arch binary install configure install-backend install-frontend install-common
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
