Package: gausssum
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 e13301f98a7255f4fe2d59ea88b850dd6c2d4995 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 25 Feb 2012 08:16:41 -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/README.source | 7 -------
debian/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{debian_paths.dpatch => debian_paths.patch} | 9 ++-------
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 20 insertions(+), 21 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{debian_paths.dpatch => debian_paths.patch} (84%)
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 be8ad80..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-gausssum source for Debian
---------------------------
-
-This package uses the `dpatch' patch management solution. See
-/usr/share/doc/dpatch/README.source.gz.
-
- -- Daniel Leidert (dale) <[email protected]>, 28 Feb 2009
diff --git a/debian/changelog b/debian/changelog
index 9281132..5b30d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gausssum (2.2.5-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ Upgrade to packaging format "3.0 quilt".
+ * debian/rules: Remove dpatch.
+ * debian/control: (Standards-Version) Bumped to 3.9.3.
+ (Build-Depends): Update debhelper to 9.
+ * debian/patches: Convert to quilt format.
+
+ -- Jari Aalto <[email protected]> Sat, 25 Feb 2012 08:04:44 -0500
+
gausssum (2.2.5-1) unstable; urgency=low
* New upstream release.
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 b89a914..299b019 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: science
Priority: optional
Maintainer: Debichem Team <[email protected]>
Uploaders: Daniel Leidert (dale) <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch, python
+Build-Depends: debhelper (>= 9), python
Build-Depends-Indep: tofrodos, python-support (>= 0.3)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Homepage: http://gausssum.sourceforge.net
Vcs-Browser: http://svn.debian.org/wsvn/debichem/unstable/gausssum/
Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/gausssum/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8702ef2..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-debian_paths
diff --git a/debian/patches/debian_paths.dpatch b/debian/patches/debian_paths.patch
similarity index 84%
rename from debian/patches/debian_paths.dpatch
rename to debian/patches/debian_paths.patch
index 84543ab..5b4d826 100644
--- a/debian/patches/debian_paths.dpatch
+++ b/debian/patches/debian_paths.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debian_paths.dpatch by LI Daobing <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the path to the images and HTML documentation that follows the FHS
-## DP: in our Debian package.
+From: LI Daobing <[email protected]>
+Subject: Fix in HTML doc image path to follow the FHS
-@DPATCH@
diff -urNad gausssum~/gausssum/aboutbox.py gausssum/gausssum/aboutbox.py
--- gausssum~/gausssum/aboutbox.py 2009-11-24 13:21:49.000000000 +0100
+++ gausssum/gausssum/aboutbox.py 2009-11-25 00:11:04.631461938 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..961d86c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian_paths.patch
diff --git a/debian/rules b/debian/rules
index 7e9d0c7..367a633 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,19 +12,18 @@
PACKAGE = gausssum
DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$$/\1/p')
-include /usr/share/dpatch/dpatch.make
-include /usr/share/python/python.mk
setup.py: debian/setup.py
sed -e "s/@DEB_UPSTREAM_VERSION@/$(DEB_UPSTREAM_VERSION)/g" < $< > $@
build: setup.py build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
python setup.py build
touch $@
-clean: setup.py unpatch
+clean: setup.py
dh_testdir
dh_testroot
python setup.py clean
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
