Package: python-nids
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 593f96aa5b52e9b70aed1e97c516a36c52c0416f Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 22 Apr 2012 09:28:20 +0300
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 | 14 --------------
debian/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{01_libnids.dpatch => 01-libnids.patch} | 7 ++-----
debian/patches/series | 1 +
debian/rules | 8 +++++---
debian/source/format | 2 +-
9 files changed, 23 insertions(+), 27 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_libnids.dpatch => 01-libnids.patch} (77%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 7f5c1ee..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,14 +0,0 @@
-pynids for Debian
------------------
-
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
- /usr/share/doc/dpatch/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
-
-
-
diff --git a/debian/changelog b/debian/changelog
index 5b03ff5..858e0dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-nids (0.6.1-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix helper-templates-in-copyright (Lintian).
+ * Fix debian-watch-file-is-missing (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 22 Apr 2012 09:26:39 +0300
+
python-nids (0.6.1-1) unstable; urgency=low
* New upstream version:
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 8e4083f..498b014 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: python-nids
Section: python
Priority: extra
Maintainer: Luciano Bello <luci...@debian.org>
-Build-Depends: dpatch, debhelper (>= 7), python-support, python-all-dev, libpcap0.8-dev, libnids-dev, libnet1-dev, libglib2.0-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), python-support, python-all-dev, libpcap0.8-dev, libnids-dev, libnet1-dev, libglib2.0-dev
+Standards-Version: 3.9.3
Homepage: http://jon.oberheide.org/pynids/
XS-Python-Version: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d62f9c1..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_libnids.dpatch
diff --git a/debian/patches/01_libnids.dpatch b/debian/patches/01-libnids.patch
similarity index 77%
rename from debian/patches/01_libnids.dpatch
rename to debian/patches/01-libnids.patch
index 97a5d10..56129f8 100644
--- a/debian/patches/01_libnids.dpatch
+++ b/debian/patches/01-libnids.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_libnids.dpatch by Luciano Bello <luci...@debian.org>
-##
-## DP: Use the libnids included in Debian and compile it dynamically
+From: Luciano Bello <luci...@debian.org>
+Subject: Use the libnids included in Debian and compile it dynamically
-@DPATCH@
diff -urNad trunk~/setup.py trunk/setup.py
--- trunk~/setup.py 2009-10-09 04:16:59.000000000 -0300
+++ trunk/setup.py 2010-05-31 12:48:36.000000000 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..36fed49
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-libnids.patch
diff --git a/debian/rules b/debian/rules
index 46a5420..37f8e7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
PYVERS=$(shell pyversions -r)
@@ -10,12 +9,15 @@ PREFIX := debian/$(PACKAGE)/usr
CFLAGS+= -lnids
-build: patch-stamp
+build-arch: build
+build-indep: build
+
+build:
for python in $(PYVERS); do \
CFLAGS="$(CFLAGS)" $$python setup.py build; \
done
-clean: unpatch
+clean:
dh_testdir
# Add here commands to clean up after the build process.
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.5
