Package: pyrex
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 bc74e179b216c660fa7cc8d38a183ac75858b544 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 14 Apr 2012 16:50:57 +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 | 5 -----
debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 7 +++----
debian/patches/00list | 1 -
debian/patches/{01_hash.dpatch => 01-hash.patch} | 8 ++------
debian/patches/series | 1 +
debian/python-pyrex.docs | 1 -
debian/rules | 19 +++++++++----------
debian/source/format | 1 +
10 files changed, 29 insertions(+), 28 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_hash.dpatch => 01-hash.patch} (78%)
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 eaf396c..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-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.
-
-Read more about this on /usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index a63b679..6953d22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pyrex (0.9.8.5-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix duplicate-changelog-files CHANGES.txt (Lintian).
+ * Fix build-depends-on-python-dev-with-no-arch-any (Lintian).
+ * Fix dh_pycentral-is-obsolete (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 14 Apr 2012 16:47:53 +0300
+
pyrex (0.9.8.5-2) unstable; urgency=low
* Acknowledge NMU (closes: #519951)
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 9ee1576..822bbb4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,11 @@ Source: pyrex
Section: python
Priority: optional
Maintainer: Paul Brossier <[email protected]>
-Build-Depends: debhelper (>= 5.0.37.2),
- python-all-dev (>= 2.5.4-1~),
- dpatch
+Build-Depends: debhelper (>= 9),
+ python-all (>= 2.6)
Build-Depends-Indep: python-central (>= 0.5)
XS-Python-Version: all
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Homepage: http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
Vcs-Bzr: http://bzr.debian.org/users/piem/pyrex/
Vcs-Browser: http://bzr.debian.org/loggerhead/users/piem/pyrex/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 19a4581..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_hash
diff --git a/debian/patches/01_hash.dpatch b/debian/patches/01-hash.patch
similarity index 78%
rename from debian/patches/01_hash.dpatch
rename to debian/patches/01-hash.patch
index 23de89c..cf7ff7f 100644
--- a/debian/patches/01_hash.dpatch
+++ b/debian/patches/01-hash.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hash.dpatch by Paul Brossier <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Paul Brossier <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad pyrex-0.9.7~/Pyrex/Compiler/Builtin.py pyrex-0.9.7/Pyrex/Compiler/Builtin.py
--- pyrex-0.9.7~/Pyrex/Compiler/Builtin.py 2008-05-11 15:36:50.000000000 +0200
+++ pyrex-0.9.7/Pyrex/Compiler/Builtin.py 2008-05-11 15:40:36.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4c6fad4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-hash.patch
diff --git a/debian/python-pyrex.docs b/debian/python-pyrex.docs
index 39e2812..2e07141 100644
--- a/debian/python-pyrex.docs
+++ b/debian/python-pyrex.docs
@@ -1,4 +1,3 @@
-CHANGES.txt
README.txt
ToDo.txt
USAGE.txt
diff --git a/debian/rules b/debian/rules
index 127719b..b032d07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_OPTIONS
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
include /usr/share/python/python.mk
PYTHON := /usr/bin/python
@@ -16,11 +11,15 @@ PYVER := $(shell python -c 'import sys; print sys.version[:3]')
PYREXC=pyrexc
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
# nothing to do
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
# make sure most files are not executable
@@ -29,7 +28,7 @@ build-stamp: configure-stamp
# nothing to do
touch build-stamp
-clean: clean1st unpatch
+clean: clean1st
clean1st:
dh_testdir
dh_testroot
@@ -45,7 +44,7 @@ clean1st:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# fix executable file : headers, names
@@ -76,7 +75,7 @@ binary-common:
dh_strip
dh_compress
dh_fixperms
- dh_pycentral
+ dh_python2
# remove empty dir after pycentral moved its content
-$(RM) -r debian/python-pyrex/usr/lib
dh_installdeb
@@ -89,4 +88,4 @@ binary-common:
binary: build install
$(MAKE) -k -f debian/rules DH_OPTIONS=-i binary-common
-.PHONY: build clean binary-indep binary-arch binary install configure unpatch clean1st
+.PHONY: build clean binary-indep binary-arch binary install configure clean1st
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.5
