Package: pyca
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 3c05ffccf6b75b9a4abd275d5539dd1242180851 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 29 Apr 2012 21:49:00 +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/changelog | 9 +++++++
debian/compat | 2 +-
debian/control | 6 ++---
debian/patches/00list | 3 ---
.../{01_debianization => 01-debianization.patch} | 26 +++-----------------
debian/patches/{02_pep0263 => 02-pep0263.patch} | 26 +++-----------------
.../{03_opensslexec => 03-opensslexec.patch} | 26 +++-----------------
debian/patches/series | 3 +++
debian/rules | 11 ++++++---
debian/source/format | 1 +
10 files changed, 34 insertions(+), 79 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_debianization => 01-debianization.patch} (97%)
rename debian/patches/{02_pep0263 => 02-pep0263.patch} (84%)
rename debian/patches/{03_opensslexec => 03-opensslexec.patch} (91%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index dd84e44..bc303d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyca (20031119-0.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 required build-arch, build-indep, binary-arch targets to rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 29 Apr 2012 21:46:54 +0300
+
pyca (20031119-0) unstable; urgency=low
* Cleaned up stray openssl patch
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 f701921..71630f1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: pyca
Section: net
Priority: optional
Maintainer: Lars Bahner <bah...@debian.org>
-Build-Depends: debhelper (>> 5.0.0), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: pyca
Architecture: all
-Depends: python, openssl (>= 0.9.7), logrotate, adduser
+Depends: ${misc:Depends}, python, openssl (>= 0.9.7), logrotate, adduser
Conflicts: openssl (= 0.9.6)
Recommends: apache2 | httpd-cgi, slapd, mail-transport-agent, python-ldap
Description: Certification Authority written in Python
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0ebe911..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_debianization
-02_pep0263
-03_opensslexec
diff --git a/debian/patches/01_debianization b/debian/patches/01-debianization.patch
similarity index 97%
rename from debian/patches/01_debianization
rename to debian/patches/01-debianization.patch
index 2752847..fd56a5c 100644
--- a/debian/patches/01_debianization
+++ b/debian/patches/01-debianization.patch
@@ -1,27 +1,7 @@
-#!/bin/sh -e
-## DP: Debian conformance patch for the Debian pyca-package
-## DP: This patch consists mainly of FHS (2.2) stuff
-## Copyright @ 2003 by Lars Bahner <bah...@debian.org>
+From: Lars Bahner <bah...@debian.org>
+Subject: Debian conformance patch for the Debian pyca-package
+ This patch consists mainly of FHS (2.2) stuff
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
diff -Naur pyca.orig/bin/ca2ldif.py pyca-20030602/bin/ca2ldif.py
--- pyca.orig/bin/ca2ldif.py 2002-02-20 18:41:22.000000000 +0100
+++ pyca-20030602/bin/ca2ldif.py 2003-06-03 22:19:23.000000000 +0200
diff --git a/debian/patches/02_pep0263 b/debian/patches/02-pep0263.patch
similarity index 84%
rename from debian/patches/02_pep0263
rename to debian/patches/02-pep0263.patch
index 5c93c24..217f34c 100644
--- a/debian/patches/02_pep0263
+++ b/debian/patches/02-pep0263.patch
@@ -1,27 +1,7 @@
-#!/bin/sh -e
-## DP: Debian conformance patch for the Debian pyca-package
-## DP: This patch consists mainly of FHS (2.2) stuff
-## Copyright @ 2003 by Lars Bahner <bah...@debian.org>
+From: Lars Bahner <bah...@debian.org>
+Subject: Debian conformance patch for the Debian pyca-package
+ This patch consists mainly of FHS (2.2) stuff
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
diff -Naur pyca-20031118/cgi-bin/browser-check.py pyca-20031118.new/cgi-bin/browser-check.py
--- pyca-20031118/cgi-bin/browser-check.py 2001-08-26 17:32:58.000000000 +0000
+++ pyca-20031118.new/cgi-bin/browser-check.py 2008-08-24 18:49:26.000000000 +0000
diff --git a/debian/patches/03_opensslexec b/debian/patches/03-opensslexec.patch
similarity index 91%
rename from debian/patches/03_opensslexec
rename to debian/patches/03-opensslexec.patch
index 674daaa..b62e74f 100644
--- a/debian/patches/03_opensslexec
+++ b/debian/patches/03-opensslexec.patch
@@ -1,27 +1,7 @@
-#!/bin/sh -e
-## DP: Debian conformance patch for the Debian pyca-package
-## DP: This patch consists mainly of FHS (2.2) stuff
-## Copyright @ 2003 by Lars Bahner <bah...@debian.org>
+From: Lars Bahner <bah...@debian.org>
+Subject: Debian conformance patch for the Debian pyca-package
+ This patch consists mainly of FHS (2.2) stuff
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
diff -Naur pyca-20031118/bin/ca2ldif.py pyca-20031118.New/bin/ca2ldif.py
--- pyca-20031118/bin/ca2ldif.py 2002-02-20 17:41:22.000000000 +0000
+++ pyca-20031118.New/bin/ca2ldif.py 2008-08-24 18:43:18.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fb9a18c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-debianization.patch
+02-pep0263.patch
+03-opensslexec.patch
diff --git a/debian/rules b/debian/rules
index 9d9ac9f..18b693a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,18 @@
export PACKAGE=pyca
-include /usr/share/dpatch/dpatch.make
configure:
dh_testdir
-build: configure patch
-clean: unpatch
+build-arch: build
+build-indep: build
+
+build: configure
+
+clean:
dh_testdir
dh_testroot
@@ -42,6 +45,8 @@ install: build
chmod 644 debian/pyca/usr/lib/cgi-bin/pyca/pycacnf.py
+binary-arch: build install
+
binary-indep: build install
dh_testdir
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
