Package: pyparsing
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 1c98c2d6ca84c82b117c959dd3b8c61ca3e0bb13 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 23 Apr 2012 23:58:31 +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 | 4 ----
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{01_leaveWhitespace.dpatch => 01-leaveWhitespace.patch} | 9 +++------
debian/patches/series | 1 +
debian/rules | 1 -
debian/source/format | 1 +
9 files changed, 16 insertions(+), 15 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_leaveWhitespace.dpatch => 01-leaveWhitespace.patch} (80%)
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 0d0aa40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
- /usr/share/doc/dpatch/
diff --git a/debian/changelog b/debian/changelog
index d27efd6..87ed432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pyparsing (1.5.2-2.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]> Mon, 23 Apr 2012 23:57:10 +0300
+
pyparsing (1.5.2-2) unstable; urgency=low
* debian/rules
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 06d48bf..0ab168c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: python
Priority: optional
Maintainer: Kevin Coyner <[email protected]>
Uploaders: Debian Python Modules Team <[email protected]>, Torsten Marek <[email protected]>
-Standards-Version: 3.8.4
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7), python (>= 2.5.4-1~), dpatch
+Standards-Version: 3.9.3
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9), python (>= 2.5.4-1~)
Build-Depends-Indep: python-support (>= 0.9), tofrodos
Homepage: http://pyparsing.wikispaces.com/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyparsing/trunk
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 843396e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_leaveWhitespace
diff --git a/debian/patches/01_leaveWhitespace.dpatch b/debian/patches/01-leaveWhitespace.patch
similarity index 80%
rename from debian/patches/01_leaveWhitespace.dpatch
rename to debian/patches/01-leaveWhitespace.patch
index c761899..8c330b4 100644
--- a/debian/patches/01_leaveWhitespace.dpatch
+++ b/debian/patches/01-leaveWhitespace.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_leaveWhitespace.dpatch by Kevin Coyner <[email protected]>
-##
-## DP: fixes leaveWhitespace function documentation in HowToUsePyparsing.html
-## DP: Bug #381627
+From: Kevin Coyner <[email protected]>
+Subject: fixes leaveWhitespace function documentation in HowToUsePyparsing.html
+ Bug #381627
-@DPATCH@
diff -urNad pyparsing-1.5.0~/HowToUsePyparsing.html pyparsing-1.5.0/HowToUsePyparsing.html
--- pyparsing-1.5.0~/HowToUsePyparsing.html 2008-06-01 05:15:56.000000000 +0200
+++ pyparsing-1.5.0/HowToUsePyparsing.html 2008-07-01 17:10:18.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..36e6c5c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-leaveWhitespace.patch
diff --git a/debian/rules b/debian/rules
index 1e0b116..7e035de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ DEB_PYTHON_SYSTEM = pysupport
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
include /usr/share/python/python.mk
DEB_PYTHON_INSTALL_ARGS_ALL += --install-layout=deb
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
