Package: lfhex
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 c4f1d94ccceda845b0b35e1b20ccbf420148b969 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 14:27:46 -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 | 29 --------------------
debian/changelog | 8 +++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 1 -
.../{01-abs-llabs.dpatch => 01-abs-llabs.patch} | 7 +---
debian/patches/series | 1 +
debian/rules | 5 +--
debian/source/format | 1 +
9 files changed, 17 insertions(+), 41 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01-abs-llabs.dpatch => 01-abs-llabs.patch} (78%)
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 5ed8c35..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,29 +0,0 @@
-lfhex for Debian
-----------------
-
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
diff --git a/debian/changelog b/debian/changelog
index 7158c96..fdb1241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lfhex (0.42-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> Tue, 28 Feb 2012 14:22:09 -0500
+
lfhex (0.42-3) unstable; urgency=low
* Fix stoopid^Wstupid typo in watch file (really closes: #551418).
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 67d6ddc..f3351b6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: lfhex
Section: editors
Priority: optional
Maintainer: Tobias Klauser <tklau...@distanz.ch>
-Build-Depends: debhelper (>= 7), dpatch, libqt4-dev, flex, bison
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libqt4-dev, flex, bison
+Standards-Version: 3.9.3
Homepage: http://stoopidsimple.com/lfhex
Vcs-Git: http://git.distanz.ch/scm/debian/pkg-lfhex.git
Vcs-Browser: http://git.distanz.ch/?p=debian/pkg-lfhex.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6b7bc42..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-abs-llabs.dpatch
diff --git a/debian/patches/01-abs-llabs.dpatch b/debian/patches/01-abs-llabs.patch
similarity index 78%
rename from debian/patches/01-abs-llabs.dpatch
rename to debian/patches/01-abs-llabs.patch
index 74ffcbc..98c7138 100644
--- a/debian/patches/01-abs-llabs.dpatch
+++ b/debian/patches/01-abs-llabs.patch
@@ -1,8 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-abs-llabs.dpatch by Thiemo Seufer
-##
-## DP: Fixes FTBFS due to abs() not being in the global anymore since g++ 4.3
-## (#495467)
+From: Thiemo Seufer
+Subject: Fixes FTBFS due to abs() not being in the global anymore since g++ 4.3
diff -up lfhex-0.42.orig/src/reader.cpp lfhex-0.42/src/reader.cpp
--- lfhex-0.42.orig/src/reader.cpp 2008-10-08 19:25:57.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5f66090
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-abs-llabs.patch
diff --git a/debian/rules b/debian/rules
index 9893545..edd9472 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
SRCDIR=src
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
cd $(SRCDIR) && qmake-qt4 lfhex.pro
@@ -21,7 +20,7 @@ build-stamp: configure-stamp
touch $@
-clean: unpatch
+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
