Package: python-authkit
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 a71d7bb161277f7e8d0a3b2a5ffa1068ce52d667 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 28 Apr 2012 13:02:53 +0300
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 | 4 ----
debian/changelog | 14 ++++++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 5 +++--
debian/patches/00list | 3 ---
...ementtree.dpatch => 10-egginfo-elementtree.patch} | 8 ++------
...ementtree.dpatch => 20-setuppy-elementtree.patch} | 8 ++------
...thon-path.dpatch => 30-ezsetup-python-path.patch} | 8 ++------
debian/patches/series | 3 +++
debian/rules | 18 +++++++++++-------
debian/source/format | 1 +
12 files changed, 42 insertions(+), 38 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{egginfo-elementtree.dpatch => 10-egginfo-elementtree.patch} (62%)
rename debian/patches/{setuppy-elementtree.dpatch => 20-setuppy-elementtree.patch} (67%)
rename debian/patches/{ezsetup-python-path.dpatch => 30-ezsetup-python-path.patch} (69%)
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 a7ca8e4..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +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`
diff --git a/debian/changelog b/debian/changelog
index 337397b..1b29caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+python-authkit (0.4.3-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix dh_pycentral-is-obsolete (Lintian)
+ * Fix wrong-path-for-interpreter (Lintian).
+ * Fix build-depends-on-python-dev-with-no-arch-any (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 28 Apr 2012 12:55:35 +0300
+
python-authkit (0.4.3-1) unstable; urgency=low
[ Piotr Ożarowski ]
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 43bfdb3..6d128e7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: python
Priority: optional
Maintainer: Christoph Haas <h...@debian.org>
Uploaders: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11),
- python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1~), dpatch (>= 2.0)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), python-all (>= 2.5),
+ python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1~)
+Standards-Version: 3.9.3
Homepage: http://authkit.org/
XS-Python-Version: >=2.4
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-authkit/trunk/
diff --git a/debian/copyright b/debian/copyright
index 3e2a5fa..460466b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,9 @@
This package was debianized by Christoph Haas <h...@debian.org> on
Fri, 9 Mar 2007 20:20:15 +0100.
-The Debian packaging is (C) 2007, Christoph Haas <h...@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2007, Christoph Haas
+<h...@debian.org> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL-2'.
It was downloaded from http://python.org/pypi/AuthKit/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 63538b1..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-egginfo-elementtree.dpatch
-setuppy-elementtree.dpatch
-ezsetup-python-path.dpatch
diff --git a/debian/patches/egginfo-elementtree.dpatch b/debian/patches/10-egginfo-elementtree.patch
similarity index 62%
rename from debian/patches/egginfo-elementtree.dpatch
rename to debian/patches/10-egginfo-elementtree.patch
index 7744940..7eb630a 100644
--- a/debian/patches/egginfo-elementtree.dpatch
+++ b/debian/patches/10-egginfo-elementtree.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## egginfo-elementtree.dpatch by Jan Dittberner <j...@dittberner.info>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian uses Python 2.5 which includes elementtree
+From: Jan Dittberner <j...@dittberner.info>
+Subject: Debian uses Python 2.5 which includes elementtree
-@DPATCH@
diff -urNad python-authkit~/AuthKit.egg-info/requires.txt python-authkit/AuthKit.egg-info/requires.txt
--- python-authkit~/AuthKit.egg-info/requires.txt 2008-12-16 14:39:08.000000000 +0100
+++ python-authkit/AuthKit.egg-info/requires.txt 2008-12-31 18:25:28.000000000 +0100
diff --git a/debian/patches/setuppy-elementtree.dpatch b/debian/patches/20-setuppy-elementtree.patch
similarity index 67%
rename from debian/patches/setuppy-elementtree.dpatch
rename to debian/patches/20-setuppy-elementtree.patch
index b51dc23..b30f178 100644
--- a/debian/patches/setuppy-elementtree.dpatch
+++ b/debian/patches/20-setuppy-elementtree.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## egginfo-elementtree.dpatch by Jan Dittberner <j...@dittberner.info>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian uses Python 2.5 which includes elementtree
+From: Jan Dittberner <j...@dittberner.info>
+Subject: Debian uses Python 2.5 which includes elementtree
-@DPATCH@
diff -urNad python-authkit~/setup.py python-authkit/setup.py
--- python-authkit~/setup.py 2008-12-16 14:37:58.000000000 +0100
+++ python-authkit/setup.py 2008-12-31 18:33:08.000000000 +0100
diff --git a/debian/patches/ezsetup-python-path.dpatch b/debian/patches/30-ezsetup-python-path.patch
similarity index 69%
rename from debian/patches/ezsetup-python-path.dpatch
rename to debian/patches/30-ezsetup-python-path.patch
index 534915b..1e786de 100644
--- a/debian/patches/ezsetup-python-path.dpatch
+++ b/debian/patches/30-ezsetup-python-path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ezsetup-python-path.dpatch by Christoph Haas <h...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Lintian complains about python path not being absolute
+From: Christoph Haas <h...@debian.org>
+Subject: Lintian complains about python path not being absolute
-@DPATCH@
diff -urNad python-authkit_0.4.0~r95~/authkit/template/authenticate/ez_setup/__init__.py python-authkit_0.4.0~r95/authkit/template/authenticate/ez_setup/__init__.py
--- python-authkit_0.4.0~r95~/authkit/template/authenticate/ez_setup/__init__.py 2007-07-17 00:30:21.000000000 +0200
+++ python-authkit_0.4.0~r95/authkit/template/authenticate/ez_setup/__init__.py 2007-07-26 00:01:02.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fa4608e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-egginfo-elementtree.patch
+20-setuppy-elementtree.patch
+30-ezsetup-python-path.patch
diff --git a/debian/rules b/debian/rules
index b616a85..797351a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,23 +3,24 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
PYVERS=$(shell pyversions -vr)
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
REVISION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*~r([^-]+).*,\1,p')
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- rm -rf build
+ rm -rf build AuthKit.egg-info/PKG-INFO
find . -name *\.py[co] -exec rm {} \;
dh_clean
+
+build-arch: build
+build-indep: build
+
build:
-install: patch $(PYVERS:%=install-python%)
+install: $(PYVERS:%=install-python%)
install-python%:
python$* setup.py install \
--single-version-externally-managed \
@@ -29,6 +30,9 @@ install-python%:
find . -name README.txt | xargs chmod -x
# remove the executable flag from example scripts
chmod -x examples/docs/form2.py examples/docs/form_no_user_in_cookie.py
+ # Correct path
+ sed -i 's,#!python,#!/usr/bin/python,' \
+ debian/python-authkit/usr/local/lib/python*/dist-packages/authkit/template/authenticate/ez_setup/__init__.py
# Build architecture-dependent files here.
binary-arch:
@@ -40,7 +44,7 @@ binary-indep: build install
dh_install debian/lintian-overrides/python-authkit /usr/share/lintian/overrides/
dh_installchangelogs
dh_installdocs --exclude=pudge_template --exclude=scripts
- dh_pycentral
+ dh_python2
dh_compress -X.py
dh_fixperms
dh_installdeb
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
