Package: python-yenc
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 187ba6d70f2911b271c1d88f48fa0632473a6560 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 10:07:24 -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 ++--
 ..._var.dpatch => 000-Handle_env_CFLAGS_var.patch} |    8 ++------
 debian/patches/00list                              |    1 -
 debian/patches/series                              |    1 +
 debian/rules                                       |    5 ++---
 debian/source/format                               |    1 +
 8 files changed, 17 insertions(+), 13 deletions(-)
 rename debian/patches/{000-Handle_env_CFLAGS_var.dpatch => 000-Handle_env_CFLAGS_var.patch} (78%)
 delete mode 100644 debian/patches/00list
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 07f77cd..65588ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-yenc (0.3+debian-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove 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>  Sat, 25 Feb 2012 10:06:33 -0500
+
 python-yenc (0.3+debian-2) unstable; urgency=low
 
   * Add debian/watch.
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 139771c..defa4db 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: python-yenc
 Section: python
 Priority: extra
 Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5), dpatch, python-support (>= 0.4), python-all-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), python-support (>= 0.4), python-all-dev
+Standards-Version: 3.9.3
 Homepage: http://www.hellanzb.com/
 
 Package: python-yenc
diff --git a/debian/patches/000-Handle_env_CFLAGS_var.dpatch b/debian/patches/000-Handle_env_CFLAGS_var.patch
similarity index 78%
rename from debian/patches/000-Handle_env_CFLAGS_var.dpatch
rename to debian/patches/000-Handle_env_CFLAGS_var.patch
index 493c6a4..8548b9a 100644
--- a/debian/patches/000-Handle_env_CFLAGS_var.dpatch
+++ b/debian/patches/000-Handle_env_CFLAGS_var.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Handle_env_CFLAGS_var.dpatch
-## by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Do not auto-probe CFLAGS, and use which are passed in environment.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Do not auto-probe CFLAGS, and use which are passed in environment.
 
-@DPATCH@
 
 diff -u python-yenc-0.3~debian/setup.py python-yenc-0.3~debian/setup.py.new
 --- python-yenc-0.3~debian/setup.py	2007-04-11 17:30:42.000000000 +0200
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7d4b4d7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-000-Handle_env_CFLAGS_var
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..69cae24
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+000-Handle_env_CFLAGS_var.patch
diff --git a/debian/rules b/debian/rules
index 5922526..d4888f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 #export DH_VERBOSE=1
 
 # I *love* dpatch
-include /usr/share/dpatch/dpatch.make
 
 PYVERS	= $(shell pyversions -rv)
 CFLAGS	= -Wall -g
@@ -15,12 +14,12 @@ else
 endif
 
 build: $(PYVERS:%=build-stamp-py%)
-build-stamp-py%: patch-stamp
+build-stamp-py%:
 	dh_testdir
 	CFLAGS="$(CFLAGS)" python$* setup.py build
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -rf build build-stamp*
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

Reply via email to