Package: prover9-manual
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 9bacec35956b2c455a1dc690c2c2bbd673c1999f Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 14:20: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 | 1 -
.../{01-entities.dpatch => 01-entities.patch} | 10 +++-------
debian/patches/series | 1 +
debian/rules | 6 ++----
debian/source/format | 1 +
8 files changed, 18 insertions(+), 15 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-entities.dpatch => 01-entities.patch} (88%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 4f35483..ba49b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+prover9-manual (0.0.200902a-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 14:18:11 -0500
+
prover9-manual (0.0.200902a-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 a77f23d..8065bd2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: prover9-manual
Section: doc
Priority: optional
Maintainer: Peter Collingbourne <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: htmldoc
-Standards-Version: 3.8.1
+Standards-Version: 3.9.3
Vcs-Bzr: nosmart+http://bzr.debian.org/collab-maint/prover9-manual/unstable/
DM-Upload-Allowed: yes
Homepage: http://www.cs.unm.edu/~mccune/mace4/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8bc53b3..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-entities.dpatch
diff --git a/debian/patches/01-entities.dpatch b/debian/patches/01-entities.patch
similarity index 88%
rename from debian/patches/01-entities.dpatch
rename to debian/patches/01-entities.patch
index 3b28afe..294965a 100644
--- a/debian/patches/01-entities.dpatch
+++ b/debian/patches/01-entities.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-entities.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replaced literal < and > symbols with entities in order to prevent
-## DP: htmldoc from failing.
+From: <[email protected]>
+Subject: Replaced literal < and > symbols with entities in order to prevent
+htmldoc from failing.
-@DPATCH@
diff -urNad prover9-manual-0.0.200712~/syntax.html prover9-manual-0.0.200712/syntax.html
--- prover9-manual-0.0.200712~/syntax.html 2008-01-25 21:46:20.000000000 +0000
+++ prover9-manual-0.0.200712/syntax.html 2008-01-25 21:47:10.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8b0d049
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-entities.patch
diff --git a/debian/rules b/debian/rules
index a212e8d..c648c0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
EGFILES = $(shell cat debian/examples)
EGREGEX = $(shell echo $(EGFILES) | sed -e 's/ /\\|/g ; s/\./\\./g')
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
# Rebuild the pdf to update it and point it to the correct example directory
@@ -28,8 +27,7 @@ build-stamp: patch
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
