Package: mailcheck
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 6bea36a55118137050b9b89f47814feee1f70d7a Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 22 Apr 2012 23:16:03 +0300
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 | 14 +++++++++++++
debian/compat | 2 +-
debian/control | 9 ++++----
debian/copyright | 11 +++++-----
.../{001_username.dpatch => 001-username.patch} | 16 ++++++--------
...counting.dpatch => 002-advanced-counting.patch} | 9 +++-----
..._no_stripping.dpatch => 003-no-stripping.patch} | 7 ++-----
debian/patches/00list | 3 ---
debian/patches/series | 3 +++
debian/rules | 22 +++++++-------------
debian/source/format | 1 +
11 files changed, 47 insertions(+), 50 deletions(-)
rename debian/patches/{001_username.dpatch => 001-username.patch} (68%)
rename debian/patches/{002_advanced_counting.dpatch => 002-advanced-counting.patch} (99%)
rename debian/patches/{003_no_stripping.dpatch => 003-no-stripping.patch} (72%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 4582914..33d46e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+mailcheck (1.91.2-2.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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix no-upstream-changelog (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix description-contains-homepage (Lintian)
+
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 22 Apr 2012 23:13:03 +0300
+
mailcheck (1.91.2-2) unstable; urgency=low
* Added advanced_counting patch from Tomas Hoger <tho...@pobox.sk>.
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 dc6ce6f..b4aa0f9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,15 @@ Source: mailcheck
Section: mail
Priority: extra
Maintainer: Kevin Coyner <kcoy...@debian.org>
-Build-Depends: debhelper (>= 5.0), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: http://mailcheck.sourceforge.net
Package: mailcheck
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Check multiple mailboxes/maildirs for mail
+Description: check multiple mailboxes/maildirs for mail
Mailcheck is a simple, configurable tool that allows multiple mailboxes
to be checked for the existence of new mail messages. It supports both
mbox and maildir-style mailboxes for compatibility with most mail
transport agents. It also supports remote POP3 and IMAP mailboxes.
- .
- Homepage: http://mailcheck.sourceforge.net/
diff --git a/debian/copyright b/debian/copyright
index 1a44811..edcc99f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,7 +28,7 @@ License (except netrc.h, netrc.c, and socket.c):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
License (netrc.c):
@@ -49,7 +49,7 @@ License (netrc.c):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
License (netrc.h):
@@ -71,7 +71,7 @@ License (netrc.h):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
License (socket.c):
@@ -92,5 +92,6 @@ License (socket.c):
with this program; if not, write to the Free Software Foundation, Inc., 51
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-The Debian packaging is (C) 2007, Kevin Coyner <kcoy...@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2007, Kevin Coyner
+<kcoy...@debian.org> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/001_username.dpatch b/debian/patches/001-username.patch
similarity index 68%
rename from debian/patches/001_username.dpatch
rename to debian/patches/001-username.patch
index 2fc1f22..ca32207 100644
--- a/debian/patches/001_username.dpatch
+++ b/debian/patches/001-username.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_username.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: Username fix. Original diff from Martin Wickman <mar...@wickman.com>
-## DP: mailcheck gets confused if username contains an @-sign. This simple
-## DP: patch fixes this. I also noticed that some pop3 servers don't understand
-## DP: the LAST command. Patch uses STAT information in this case.
-## DP: See Debian bug #272749
-
-@DPATCH@
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: Username fix. Original diff from Martin Wickman <mar...@wickman.com>
+ mailcheck gets confused if username contains an @-sign. This simple
+ patch fixes this. I also noticed that some pop3 servers don't understand
+ the LAST command. Patch uses STAT information in this case.
+ See Debian bug #272749
--- mailcheck-1.91.2/mailcheck.c~ 2001-05-11 22:38:50.000000000 +0200
+++ mailcheck-1.91.2/mailcheck.c 2004-09-21 21:08:17.000000000 +0200
diff --git a/debian/patches/002_advanced_counting.dpatch b/debian/patches/002-advanced-counting.patch
similarity index 99%
rename from debian/patches/002_advanced_counting.dpatch
rename to debian/patches/002-advanced-counting.patch
index ad5220e..10ad760 100644
--- a/debian/patches/002_advanced_counting.dpatch
+++ b/debian/patches/002-advanced-counting.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002_advanced_counting.dpatch by Tomas Hoger <tho...@pobox.sk>
-##
-## DP: Advanced mail counting, brief mode, maildir handling fixes,
-## DP: possibility to specify alternate config file.
+From: Tomas Hoger <tho...@pobox.sk>
+Subject: Advanced mail counting, brief mode, maildir handling fixes,
+possibility to specify alternate config file.
-@DPATCH@
diff -ruN mailcheck-1.91.1/mailcheck.1 mailcheck-1.91.1+2/mailcheck.1
--- mailcheck-1.91.1/mailcheck.1 2001-05-11 22:46:07.000000000 +0200
diff --git a/debian/patches/003_no_stripping.dpatch b/debian/patches/003-no-stripping.patch
similarity index 72%
rename from debian/patches/003_no_stripping.dpatch
rename to debian/patches/003-no-stripping.patch
index ef0229a..a8832c0 100644
--- a/debian/patches/003_no_stripping.dpatch
+++ b/debian/patches/003-no-stripping.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003_no_stripping.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: Remove stripping (-s) from the Makefile. Closes Debian bug #437550.
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: Remove stripping (-s) from the Makefile. Closes Debian bug #437550.
-@DPATCH@
diff -urNad mailcheck-1.91.2~/Makefile mailcheck-1.91.2/Makefile
--- mailcheck-1.91.2~/Makefile 2007-01-28 15:54:04.000000000 -0500
+++ mailcheck-1.91.2/Makefile 2007-08-14 13:00:50.000000000 -0400
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index da8d0bf..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-001_username
-002_advanced_counting
-003_no_stripping
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f956411
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+001-username.patch
+002-advanced-counting.patch
+003-no-stripping.patch
diff --git a/debian/rules b/debian/rules
index 53edab3..e3aebf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,35 +2,27 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-build: patch build-stamp
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp:
dh_testdir
$(MAKE) all
touch build-stamp
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tmp.
@@ -62,4 +54,4 @@ source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched
+.PHONY: build clean binary-indep binary-arch binary install clean-patched
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.10
