Package: cfv
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.
Notes:
debian/rules was updated to *full* dh(1) syntax to migrate
away from old python-suport to "dh --with python2"
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 94ff0d7aa59915ce8e084b7177fe58127cb5c285 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 10 May 2012 16:50:29 +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 | 13 +++++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/dirs | 1 +
debian/patches/00list | 1 -
debian/patches/{01_color.dpatch => 01-color.patch} | 8 ++----
debian/patches/series | 1 +
debian/rules | 30 ++++----------------
debian/source/format | 1 +
9 files changed, 27 insertions(+), 34 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_color.dpatch => 01-color.patch} (96%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index bef7e7f..1818a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+cfv (1.18.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.
+ * Move to full dh(1) and simplify rules file. Move from deprecated
+ python-support to dh_python2, see:
+ http://wiki.debian.org/Python/TransitionToDHPython2
+ * Fix build-depends-on-python-dev-with-no-arch-any (Lintian) by changing
+ depends python-dev to python-all.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 01 May 2012 00:09:36 +0300
+
cfv (1.18.3-1) unstable; urgency=low
* New upstream release and python 2.6 compatibility (Closes: #532056)
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 a4c4db9..9471b8e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: cfv
Section: utils
Priority: optional
Maintainer: Stefan Alfredsson <a...@debian.org>
-Build-Depends: python-dev (>=2.5.4), debhelper (>= 7), python-support (>= 0.4), dpatch
-Standards-Version: 3.8.0.1
+Build-Depends: python-all (>=2.6.7), debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://cfv.sourceforge.net/
Package: cfv
diff --git a/debian/dirs b/debian/dirs
index 98d1583..bcf3c5f 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,3 @@
usr/bin
usr/share/man/man1
+usr/share/pyshared
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1a4a8f9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-# 01_color
diff --git a/debian/patches/01_color.dpatch b/debian/patches/01-color.patch
similarity index 96%
rename from debian/patches/01_color.dpatch
rename to debian/patches/01-color.patch
index bcc19cc..cdb3a7c 100644
--- a/debian/patches/01_color.dpatch
+++ b/debian/patches/01-color.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_color.dpatch by <alfs@kossan>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <alfs@kossan>
+Subject: No description.
-@DPATCH@
diff -urNad cfv-1.18.1/cfv /tmp/dpep.HlaHol/cfv-1.18.1/cfv
--- cfv-1.18.1/cfv Mon Feb 4 20:16:49 2008
+++ /tmp/dpep.HlaHol/cfv-1.18.1/cfv Mon Feb 4 20:39:25 2008
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..294f188
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# 01-color.patch
diff --git a/debian/rules b/debian/rules
index 7132c62..681db87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,12 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
include /usr/share/python/python.mk
-build: patch build-stamp
-build-stamp:
- touch $@
+override_dh_auto_install:
+ make install-wrapper-only prefix=/usr mandir=/usr/share/man DESTDIR=debian/cfv
+ mv debian/cfv/*.py debian/cfv/usr/share/pyshared/cfv.py
-clean: unpatch
- dh $@
+%:
+ dh $@ --with python2
-install: build install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- mkdir -p debian/cfv/usr/lib/$(shell pyversions -d)/$(call py_sitename, $(shell pyversions -d))
- make install-wrapper-only prefix=/usr mandir=/usr/share/man DESTDIR=debian/cfv/ pkgdir=/usr/lib/$(shell pyversions -d)/$(call py_sitename, $(shell pyversions -d))
- touch $@
-
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install -i
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
- dh $@
+# End of file
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
