Package: flowscan-cuflow
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
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 6caad6ee4251536db895d94f98cf74c9b34ac140 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 08:12:36 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/01-etc_config.patch | 8 ++------
debian/patches/02-cugrapher-config.patch | 8 ++------
debian/patches/{00list => series} | 0
debian/rules | 6 ++----
debian/source/format | 1 +
8 files changed, 18 insertions(+), 19 deletions(-)
rename debian/patches/{00list => series} (100%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 0c80cc3..8ff2703 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+flowscan-cuflow (1.7-5.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 <[email protected]> Tue, 28 Feb 2012 08:11:37 -0500
+
flowscan-cuflow (1.7-5) unstable; urgency=low
* Got rid of bash ism's.
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 7969e79..57b3fdc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: flowscan-cuflow
Section: net
Priority: optional
Maintainer: Russell Stuart <[email protected]>
-Build-Depends: debhelper (>> 5), dpatch
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.columbia.edu/acis/networks/advanced/CUFlow/
DM-Upload-Allowed: yes
diff --git a/debian/patches/01-etc_config.patch b/debian/patches/01-etc_config.patch
index 432922f..25c7baf 100644
--- a/debian/patches/01-etc_config.patch
+++ b/debian/patches/01-etc_config.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## etc_config.patch.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move config files to /etc
+From: <[email protected]>
+Subject: Move config files to /etc
-@DPATCH@
diff -Nur flowscan-cuflow-1.7.orig/CUFlow.pm flowscan-cuflow-1.7/CUFlow.pm
--- flowscan-cuflow-1.7.orig/CUFlow.pm 2006-01-11 06:47:04.000000000 +1000
+++ flowscan-cuflow-1.7/CUFlow.pm 2006-01-11 16:36:48.000000000 +1000
diff --git a/debian/patches/02-cugrapher-config.patch b/debian/patches/02-cugrapher-config.patch
index 1908aef..68b1ae0 100644
--- a/debian/patches/02-cugrapher-config.patch
+++ b/debian/patches/02-cugrapher-config.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-cugrapher-config.patch.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make CUGrapher.pl read settings from /etc/flowscan/CUGrapher.cf
+From: <[email protected]>
+Subject: Make CUGrapher.pl read settings from /etc/flowscan/CUGrapher.cf
-@DPATCH@
diff -Nur CUFlow-1.7/CUGrapher.cf flowscan-cuflow-1.7/CUGrapher.cf
--- CUFlow-1.7/CUGrapher.cf 1970-01-01 10:00:00.000000000 +1000
+++ flowscan-cuflow-1.7/CUGrapher.cf 2006-01-11 16:58:03.000000000 +1000
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index cec390f..eb44b51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,18 +2,16 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-include /usr/share/dpatch/dpatch.make
get-orig-source:
@if [ -z "$(UPSTREAM_VERSION)" ]; then echo "Please run as .../debian/rules UPSTREAM_VERSION=xxx $@"; exit 1; fi
wget -O "CUFlow-$(UPSTREAM_VERSION).tgz" "http://www.columbia.edu/acis/networks/advanced/CUFlow/CUFlow-$(UPSTREAM_VERSION).tgz"
mv CUFlow-$(UPSTREAM_VERSION).tgz flowscan-cuflow_$(UPSTREAM_VERSION).orig.tar.gz
-build: patch
+build:
# Nothing to do here.
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_clean
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
