Package: pyblosxom
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 9de14eae8ed5773b0537648f53adb14b202f3817 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 08:24:59 -0500
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/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
....dpatch => pyblosxom.cgi-path-config-fix.patch} | 6 +++---
...ove_poweredby.dpatch => remove_poweredby.patch} | 6 +++---
debian/patches/series | 2 ++
debian/rules | 1 -
debian/source/format | 1 +
9 files changed, 20 insertions(+), 12 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{pyblosxom.cgi-path-config-fix.dpatch => pyblosxom.cgi-path-config-fix.patch} (81%)
rename debian/patches/{remove_poweredby.dpatch => remove_poweredby.patch} (83%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 438e476..869a57a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pyblosxom (1.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.
+
+ -- Jari Aalto <[email protected]> Tue, 28 Feb 2012 08:23:53 -0500
+
pyblosxom (1.4.3-1) unstable; urgency=low
* New upstream release: (Closes: #443998)
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 4fb599b..82b0202 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
Source: pyblosxom
Section: web
Priority: optional
-Build-Depends: cdbs (>= 0.2), debhelper (>= 5.0), dpatch
+Build-Depends: cdbs (>= 0.2), debhelper (>= 9)
Build-Depends-Indep: python, python-dev, python-support (>= 0.4)
Maintainer: Daniel Watkins <[email protected]>
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
Homepage: http://pyblosxom.sourceforge.net/
Package: pyblosxom
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f6e43ed..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-pyblosxom.cgi-path-config-fix
-remove_poweredby
diff --git a/debian/patches/pyblosxom.cgi-path-config-fix.dpatch b/debian/patches/pyblosxom.cgi-path-config-fix.patch
similarity index 81%
rename from debian/patches/pyblosxom.cgi-path-config-fix.dpatch
rename to debian/patches/pyblosxom.cgi-path-config-fix.patch
index a291273..b64cd8c 100644
--- a/debian/patches/pyblosxom.cgi-path-config-fix.dpatch
+++ b/debian/patches/pyblosxom.cgi-path-config-fix.patch
@@ -1,6 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## DP: Add /etc/pyblosxom/ as a location to look for configuration.
-@DPATCH@
+From: Unknown
+Subject: Add /etc/pyblosxom/ as a location to look for configuration.
+
--- pyblosxom-1.2.1/web/pyblosxom.cgi 2004-02-20 00:54:36.000000000 +0100
+++ pyblosxom-1.2.1/web/pyblosxom.cgi 2004-04-13 10:46:49.000000000 +0200
@@ -8,6 +8,9 @@ Blosxom details.
diff --git a/debian/patches/remove_poweredby.dpatch b/debian/patches/remove_poweredby.patch
similarity index 83%
rename from debian/patches/remove_poweredby.dpatch
rename to debian/patches/remove_poweredby.patch
index 995e081..7ae1d4a 100644
--- a/debian/patches/remove_poweredby.dpatch
+++ b/debian/patches/remove_poweredby.patch
@@ -1,6 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## DP: Remove default reference to a remote 'Powered By' image.
-@DPATCH@
+From: Unknown
+Subject: Remove default reference to a remote 'Powered By' image.
+
diff -Nur pyblosxom-1.3.orig/Pyblosxom/flavours/html.flav/foot.html pyblosxom-1.3/Pyblosxom/flavours/html.flav/foot.html
--- pyblosxom-1.3.orig/Pyblosxom/flavours/html.flav/foot.html 2005-09-17 23:58:25.000000000 +0200
+++ pyblosxom-1.3/Pyblosxom/flavours/html.flav/foot.html 2006-01-28 20:29:46.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9ede9b0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+pyblosxom.cgi-path-config-fix.patch
+remove_poweredby.patch
diff --git a/debian/rules b/debian/rules
index c61d61f..3decf81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
PYTHONVERSION=$(shell pyversions -dv)
DEB_COMPRESS_EXCLUDE := .txt
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
