Package: pynetsnmp
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
Bhavani, 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 f64ceb404b59d7a9ee6782394a9bf0bc0d5760c9 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 09:15:38 -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 | 33 -----------------------------
debian/changelog | 8 +++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00dpatch.conf | 2 -
debian/patches/examples-import-fix.dpatch | 7 +----
debian/rules | 8 ++----
debian/source/format | 1 +
8 files changed, 17 insertions(+), 48 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00dpatch.conf
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 103ed17..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,33 +0,0 @@
-This package uses dpatch in order to apply patches to the upstream source.
-Patches are stored in debian/patches and their filenames usually end in .dpatch .
-For further details, see the man pages for dpatch and dpatch-edit-patch.
-
-All commands described below should be run from the top directory of the
-package source tree, unless otherwise stated.
-
- * To generate the fully patched source, in a form ready for
- editing, that would be built to create Debian packages, run:
-
- dpatch apply-all
-
- Note: It has been proposed that in future, this should happen
- automatically when you run dpkg-source -x on a dpatch source
- package. However, this proposal has apparently not yet been
- implemented, so for now you have to do it yourself like this.
-
- * To modify the source and save those modifications so that
- they will be applied when building the package, pick a
- suitably informative patch file name, for example
- 01_add_README.source_file.dpatch, and then run:
-
- dpatch-edit-patch 01_add_README.source_file.dpatch
-
- This will place you in a new shell in a temporary copy of the
- source tree. Make your desired modifications to it, and then
- exit the shell to create the patch file containing them (this
- file will appear in debian/patches).
-
- * To remove source modifications that are currently being
- applied when building the package, run:
-
- dpatch deapply-all
diff --git a/debian/changelog b/debian/changelog
index 00b7522..0538ca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pynetsnmp (0.28.14-1.2) 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 09:14:38 -0500
+
pynetsnmp (0.28.14-1) unstable; urgency=low
* New Maintainer Closes: #538261
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 abe1bcb..742b77e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: pynetsnmp
Section: python
Priority: optional
Maintainer: Bhavani Shankar <bh...@ubuntu.com>
-Build-Depends: debhelper (>= 5), python (>= 2.5), dpatch
+Build-Depends: debhelper (>= 9), python (>= 2.5)
Build-Depends-Indep: libsnmp-dev, python-support
Vcs-Svn: svn://svn.debian.org/svn/pkg-zenoss/packages/pynetsnmp/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-zenoss/packages/pynetsnmp/trunk/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
XS-Python-Version: >= 2.5
Homepage: http://www.zenoss.com/
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index 685acc6..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
diff --git a/debian/patches/examples-import-fix.dpatch b/debian/patches/examples-import-fix.dpatch
index 47b5c7e..dc39cac 100644
--- a/debian/patches/examples-import-fix.dpatch
+++ b/debian/patches/examples-import-fix.dpatch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## examples-import-fix.dpatch by Bernd Zeimetz <b...@debian.org>
-##
-## DP: Fixiing tests to work as example
+From: Bernd Zeimetz <b...@debian.org>
+Subject: Fixiing tests to work as example
-@DPATCH@
diff -urNad pynetsnmp~/test/get.py pynetsnmp/test/get.py
--- pynetsnmp~/test/get.py 2007-10-29 18:17:44.000000000 +0100
+++ pynetsnmp/test/get.py 2009-05-17 16:00:37.000000000 +0200
diff --git a/debian/rules b/debian/rules
index 60e86d4..acae1df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,18 +5,16 @@
PKGNAME:=python-pynetsnmp
-include /usr/share/dpatch/dpatch.make
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
python setup.py build
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f install-stamp build-stamp
@@ -54,5 +52,5 @@ binary-indep: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched
+.PHONY: build clean binary-indep binary-arch binary install
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
