Package: multitail
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.
Thanks,
Jari
>From e6ac32533b30fc2531b2ebc3bf7522271b8c272e Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 13 Apr 2012 22:43:31 +0300
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 | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 5 +++--
debian/copyright | 2 +-
debian/patches/00list | 1 -
...kefile_fixes.dpatch => 01-makefile-fixes.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 11 +++++++----
debian/source/format | 1 +
9 files changed, 28 insertions(+), 15 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_makefile_fixes.dpatch => 01-makefile-fixes.patch} (85%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 783cd70..bd90970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+multitail (5.2.9-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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <[email protected]> Fri, 13 Apr 2012 22:35:26 +0300
+
multitail (5.2.9-1) unstable; urgency=low
* New upstream release
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 4d16a6a..dca1351 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: multitail
Section: utils
Priority: optional
Maintainer: Rene Engelhard <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), dpatch, libncurses5-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), libncurses5-dev
+Standards-Version: 3.9.3
+Homepage: http://www.vanheusden.com/multitail/
Package: multitail
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index bb8d350..550bb91 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,4 +8,4 @@ Upstream Author: Folkert van Heusden <[email protected]>
Copyright:
GPL, on Debian System you can find the full text of the GPL
-under /usr/share/common-licenses/GPL
+under /usr/share/common-licenses/GPL-2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c12f1c4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_makefile_fixes
diff --git a/debian/patches/01_makefile_fixes.dpatch b/debian/patches/01-makefile-fixes.patch
similarity index 85%
rename from debian/patches/01_makefile_fixes.dpatch
rename to debian/patches/01-makefile-fixes.patch
index e3be941..a38e8b1 100644
--- a/debian/patches/01_makefile_fixes.dpatch
+++ b/debian/patches/01-makefile-fixes.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile_fixes.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' multitail-5.2.8~/Makefile multitail-5.2.8/Makefile
--- multitail-5.2.8~/Makefile 2011-04-14 20:07:39.000000000 +0000
+++ multitail-5.2.8/Makefile 2011-04-15 18:28:56.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..68eea29
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-makefile-fixes.patch
diff --git a/debian/rules b/debian/rules
index 193ed41..5e1427b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -16,10 +15,14 @@ endif
CFLAGS+= -g
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
@@ -29,7 +32,7 @@ build-stamp: configure-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -41,7 +44,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/multitail
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.5
