Package: xmakemol
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 ad2203e39aacd2008f9a346fbf7db209216c2d66 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 10:41:08 -0500
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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
...h-bond-factor.dpatch => 03_h-bond-factor.patch} | 9 +++------
debian/patches/series | 1 +
debian/rules | 3 +--
debian/source/format | 1 +
8 files changed, 17 insertions(+), 12 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{03_h-bond-factor.dpatch => 03_h-bond-factor.patch} (64%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 6cb7b49..f0531b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xmakemol (5.16-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 25 Feb 2012 10:37:53 -0500
+
xmakemol (5.16-5) unstable; urgency=low
* debian/control (Build-Depends): Added dpatch.
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 dd42320..e188f7f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Debichem Team <debichem-de...@lists.alioth.debian.org>
Uploaders: Michael Banck <mba...@debian.org>,
Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-Build-Depends: debhelper (>= 5), dpatch, libxpm-dev, libxt-dev, libxi-dev,
+Build-Depends: debhelper (>= 9), libxpm-dev, libxt-dev, libxi-dev,
libgl1-mesa-swx11-dev, lesstif2-dev, freeglut3-dev, libglw1-mesa-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Homepage: http://www.nongnu.org/xmakemol/
Vcs-Browser: http://svn.debian.org/wsvn/debichem/
Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/xmakemol/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c150e3f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-03_h-bond-factor.dpatch
diff --git a/debian/patches/03_h-bond-factor.dpatch b/debian/patches/03_h-bond-factor.patch
similarity index 64%
rename from debian/patches/03_h-bond-factor.dpatch
rename to debian/patches/03_h-bond-factor.patch
index c0589dd..c817f68 100644
--- a/debian/patches/03_h-bond-factor.dpatch
+++ b/debian/patches/03_h-bond-factor.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_foo.dpatch by Michael Banck <mba...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Decrease hydrogen bond factor so intramolecular h-bonds are less likely to be displayed
+From: Michael Banck <mba...@debian.org>
+Subject: Decrease hydrogen bond factor
+ This way intramolecular h-bonds are less likely to be displayed.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' xmakemol~/globals.h xmakemol/globals.h
--- xmakemol~/globals.h 2007-08-25 13:20:28.000000000 +0200
+++ xmakemol/globals.h 2010-07-14 17:45:58.071981865 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f78c175
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+03_h-bond-factor.patch
diff --git a/debian/rules b/debian/rules
index a9e4726..9218fb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ else
CFLAGS += -O2
endif
-include /usr/share/dpatch/dpatch.make
COMMON_OPTIONS = --srcdir=.. \
--prefix=/usr \
@@ -29,7 +28,7 @@ COMMON_OPTIONS_opengl = --without-mesa
CFLAGS="$(CFLAGS)")
build: build-stamp
-build-stamp: patch-stamp normal/config.status opengl/config.status
+build-stamp: normal/config.status opengl/config.status
dh_testdir
$(MAKE) -C normal/
$(MAKE) -C opengl/
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
