Package: pyexcelerator
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 2d8809e714a3a0d4881ca09727975e8bbc806557 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 23 Apr 2012 23:53:09 +0300
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/README.source                                         |    6 ------
 debian/changelog                                             |   10 ++++++++++
 debian/compat                                                |    2 +-
 debian/control                                               |    4 ++--
 debian/copyright                                             |    5 +++--
 debian/docs                                                  |    1 -
 debian/patches/00list                                        |    1 -
 .../{01-write_datetime.dpatch => 01-write-datetime.patch}    |    7 ++-----
 debian/patches/series                                        |    1 +
 debian/rules                                                 |    1 -
 debian/source/format                                         |    1 +
 11 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01-write_datetime.dpatch => 01-write-datetime.patch} (86%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 2a936ee..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package is using dpatch patch system. 
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run `./debian/rules patch`
-
-See /usr/share/doc/dpatch/README.source.gz for more information.
diff --git a/debian/changelog b/debian/changelog
index 84caa83..4291d7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pyexcelerator (0.6.4.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.
+  * Fix copyright-refers-to-symlink-license (Lintian).
+  * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+
+ -- Jari Aalto <[email protected]>  Mon, 23 Apr 2012 23:50:04 +0300
+
 pyexcelerator (0.6.4.1-1) unstable; urgency=low
 
   * New upstream version independent of the xlwt project. Closes: #500185.
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 045f06b..b2f9dee 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: python
 Priority: optional
 Maintainer: Kevin Coyner <[email protected]>
 Uploaders: Debian Python Modules Team <[email protected]>
-Build-Depends: cdbs (>=0.4.43), debhelper (>= 7.4~), python-dev, python-central (>= 0.5), dpatch
+Build-Depends: cdbs (>=0.4.43), debhelper (>= 9), python-dev, python-central (>= 0.5)
 XS-Python-Version: >= 2.4
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
 Homepage: http://sourceforge.net/projects/pyexcelerator
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyexcelerator/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyexcelerator/trunk/
diff --git a/debian/copyright b/debian/copyright
index 62b5e68..f2f210d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -70,5 +70,6 @@ is (C) Wolfgang Haefelinger, 2004 and licensed under these terms:
   
   Terence Parr, jGuru.com
 
-The Debian packaging is (C) 2006, Kevin Coyner <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2006, Kevin Coyner
+<[email protected]> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL-2'.
diff --git a/debian/docs b/debian/docs
index 2962ef4..6ffa21d 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,4 @@
 debian/README.Debian-source
-debian/README.source
 README.txt
 THANKS.txt
 examples/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 16d82f9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-write_datetime
diff --git a/debian/patches/01-write_datetime.dpatch b/debian/patches/01-write-datetime.patch
similarity index 86%
rename from debian/patches/01-write_datetime.dpatch
rename to debian/patches/01-write-datetime.patch
index b67126e..33e2aa2 100644
--- a/debian/patches/01-write_datetime.dpatch
+++ b/debian/patches/01-write-datetime.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-write_datetime.dpatch by Kevin Coyner <[email protected]>
-##
-## DP: Fixed inability to write datetime.date to a cell.
+From: Kevin Coyner <[email protected]>
+Subject: Fixed inability to write datetime.date to a cell.
 
-@DPATCH@
 diff -urNad pyexcelerator-0.6.4.1~/pyExcelerator/Row.py pyexcelerator-0.6.4.1/pyExcelerator/Row.py
 --- pyexcelerator-0.6.4.1~/pyExcelerator/Row.py	2007-02-14 02:00:44.000000000 -0500
 +++ pyexcelerator-0.6.4.1/pyExcelerator/Row.py	2009-10-19 08:34:46.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..342e352
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-write-datetime.patch
diff --git a/debian/rules b/debian/rules
index 16b3b20..7010dc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ DEB_PYTHON_SYSTEM = pycentral
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 clean::
 	rm -f pyExcelerator/antlr.py
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.10

Reply via email to