Package: biblememorizer
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 44275dcc9b14de5a4fcdd122e21d65989e021add Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 3 Mar 2012 00:44:49 -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/README.source | 4 ----
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/patches/00list | 3 ---
debian/patches/03_qmake_vars.dpatch | 20 --------------------
debian/patches/03_qmake_vars.patch | 16 ++++++++++++++++
...tegories.dpatch => 04_desktop_categories.patch} | 8 ++------
...p_encoding.dpatch => 05_desktop_encoding.patch} | 8 ++------
debian/patches/series | 3 +++
debian/rules | 6 ++----
debian/source/format | 1 +
12 files changed, 38 insertions(+), 47 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
delete mode 100644 debian/patches/03_qmake_vars.dpatch
create mode 100644 debian/patches/03_qmake_vars.patch
rename debian/patches/{04_desktop_categories.dpatch => 04_desktop_categories.patch} (65%)
rename debian/patches/{05_desktop_encoding.dpatch => 05_desktop_encoding.patch} (60%)
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 dbe1bb4..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch in order to apply patches to the upstream source.
-Patches are stored in debian/patches. For further details, see the man pages for
-dpatch and dpatch-edit-patch, and also /usr/share/doc/dpatch/README.source.gz
-
diff --git a/debian/changelog b/debian/changelog
index b6706b6..1e8c397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+biblememorizer (0.6.4-3.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 <jari.aa...@cante.net> Fri, 02 Mar 2012 13:09:30 -0500
+
biblememorizer (0.6.4-3) unstable; urgency=low
* Upload to unstable -- no changes from previous version.
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 d70aa97..fe02340 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Maintainer: Debian Crosswire Packaging Team <pkg-crosswire-de...@lists.alioth.de
Uploaders: Jonathan Marsden <jmars...@fastmail.fm>,
Daniel Glassey <w...@debian.org>,
Raphael Pinson <raph...@ubuntu.com>
-Build-Depends: debhelper (>= 5.0), libsword-dev (>=1.5.11),
- libqt3-mt-dev, qt3-dev-tools, dpatch, docbook2x, docbook
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 9), libsword-dev (>=1.5.11),
+ libqt3-mt-dev, qt3-dev-tools, docbook2x, docbook
+Standards-Version: 3.9.3
Homepage: http://biblememorizer.sourceforge.net/
Package: biblememorizer
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fb1c766..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-03_qmake_vars.dpatch
-04_desktop_categories.dpatch
-05_desktop_encoding.dpatch
diff --git a/debian/patches/03_qmake_vars.dpatch b/debian/patches/03_qmake_vars.dpatch
deleted file mode 100644
index 6130e6b..0000000
--- a/debian/patches/03_qmake_vars.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_qmake_vars.dpatch by <rpinson@rpinson> edited by <jmars...@fastmail.fm>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add qmake_vars to upstream tarball to prevent it from appearing in the
-## DP: package diff
-
-@DPATCH@
-
---- biblememorizer-0.6.4.orig/qmake_vars
-+++ biblememorizer-0.6.4/qmake_vars
-@@ -0,0 +1,8 @@
-+#Variables generated by configure script:
-+CONFIG += sword
-+SWORD_PATH = /usr/include/sword
-+SWORD_LIB = -lsword
-+MAIN_PATH = /usr
-+CONFIG += release
-+
-+
diff --git a/debian/patches/03_qmake_vars.patch b/debian/patches/03_qmake_vars.patch
new file mode 100644
index 0000000..b672865
--- /dev/null
+++ b/debian/patches/03_qmake_vars.patch
@@ -0,0 +1,16 @@
+From: <jmars...@fastmail.fm>
+Subject: Add qmake_vars to upstream tarball to prevent it from appearing in the
+package diff
+
+
+--- biblememorizer-0.6.4.orig/qmake_vars
++++ biblememorizer-0.6.4/qmake_vars
+@@ -0,0 +1,8 @@
++#Variables generated by configure script:
++CONFIG += sword
++SWORD_PATH = /usr/include/sword
++SWORD_LIB = -lsword
++MAIN_PATH = /usr
++CONFIG += release
++
++
diff --git a/debian/patches/04_desktop_categories.dpatch b/debian/patches/04_desktop_categories.patch
similarity index 65%
rename from debian/patches/04_desktop_categories.dpatch
rename to debian/patches/04_desktop_categories.patch
index 0d9cc92..65eeb1a 100644
--- a/debian/patches/04_desktop_categories.dpatch
+++ b/debian/patches/04_desktop_categories.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_desktop_categories.dpatch by Jonathan Marsden <jmars...@fastmail.fm>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct Religion and Bible categories to X-Religion and X-Bible.
+From: Jonathan Marsden <jmars...@fastmail.fm>
+Subject: Correct Religion and Bible categories to X-Religion and X-Bible.
-@DPATCH@
diff -urNad biblememorizer-0.6.4~/biblememorizer.desktop biblememorizer-0.6.4/biblememorizer.desktop
--- biblememorizer-0.6.4~/biblememorizer.desktop 2007-02-14 08:21:10.000000000 -0800
+++ biblememorizer-0.6.4/biblememorizer.desktop 2009-01-28 02:20:26.000000000 -0800
diff --git a/debian/patches/05_desktop_encoding.dpatch b/debian/patches/05_desktop_encoding.patch
similarity index 60%
rename from debian/patches/05_desktop_encoding.dpatch
rename to debian/patches/05_desktop_encoding.patch
index f493d8c..89b7e67 100644
--- a/debian/patches/05_desktop_encoding.dpatch
+++ b/debian/patches/05_desktop_encoding.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_desktop_encoding.dpatch by Jonathan Marsden <jmars...@fastmail.fm>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes deprecated Encoding= line from bibletime.desktop
+From: Jonathan Marsden <jmars...@fastmail.fm>
+Subject: Removes deprecated Encoding= line from bibletime.desktop
-@DPATCH@
diff -urNad biblememorizer-0.6.4~/biblememorizer.desktop biblememorizer-0.6.4/biblememorizer.desktop
--- biblememorizer-0.6.4~/biblememorizer.desktop 2009-04-05 18:54:34.000000000 -0700
+++ biblememorizer-0.6.4/biblememorizer.desktop 2009-04-05 18:54:47.000000000 -0700
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0bfd673
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+03_qmake_vars.patch
+04_desktop_categories.patch
+05_desktop_encoding.patch
diff --git a/debian/rules b/debian/rules
index 3929bb7..92172ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,10 @@ DEBIANDIR=$(CURDIR)/debian
PACKAGEDIR=$(DEBIANDIR)/biblememorizer
APPSDIR=$(PACKAGEDIR)/usr/share/applications
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
./configure --prefix=/usr --sword-path=/usr/include/sword
touch configure-stamp
@@ -23,8 +22,7 @@ build-stamp: configure-stamp
docbook2x-man $(DEBIANDIR)/biblememorizer.1.docbook
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-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
