Package: muttprint
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 72175d270510b78f3220ee3b076a49f92c2eeb8c Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 13 Apr 2012 23:01:19 +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 | 7 ++++---
debian/copyright | 2 +-
debian/patches/00list | 8 --------
...h => 03-fix-muttrc-changing-instructions.patch} | 8 ++------
...s.dpatch => 11-right-docbook-utils-flags.patch} | 8 ++------
...2_no_html_docs.dpatch => 12-no-html-docs.patch} | 8 ++------
...t_to_ospics.dpatch => 14-point-to-ospics.patch} | 8 ++------
.../{15_no_Gentoo.dpatch => 15-no-Gentoo.patch} | 8 ++------
debian/patches/16-dont-install-README.patch | 16 ++++++++++++++++
debian/patches/16_dont_install_README.dpatch | 17 -----------------
...leave_tmp_dir.dpatch => 17-leave-tmp-dir.patch} | 10 ++--------
...man_de_utf8.dpatch => 18-pod2man-de-utf8.patch} | 8 ++------
debian/patches/series | 8 ++++++++
debian/rules | 11 +++++++----
debian/source/format | 1 +
17 files changed, 64 insertions(+), 78 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{03_fix_muttrc_changing_instructions.dpatch => 03-fix-muttrc-changing-instructions.patch} (94%)
rename debian/patches/{11_right_docbook-utils_flags.dpatch => 11-right-docbook-utils-flags.patch} (96%)
rename debian/patches/{12_no_html_docs.dpatch => 12-no-html-docs.patch} (91%)
rename debian/patches/{14_point_to_ospics.dpatch => 14-point-to-ospics.patch} (95%)
rename debian/patches/{15_no_Gentoo.dpatch => 15-no-Gentoo.patch} (67%)
create mode 100644 debian/patches/16-dont-install-README.patch
delete mode 100644 debian/patches/16_dont_install_README.dpatch
rename debian/patches/{17_leave_tmp_dir.dpatch => 17-leave-tmp-dir.patch} (69%)
rename debian/patches/{18_pod2man_de_utf8.dpatch => 18-pod2man-de-utf8.patch} (77%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 8c1337e..39e221f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+muttprint (0.73-4.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.
+ * Patch 16 was updated with "quilt refresh" to make it apply cleanly.
+ * Fix no-homepage-field (Lintian).
+ * Fix duplicate-in-relation-field texlive-latex-recommended (Lintian).
+
+ -- Jari Aalto <[email protected]> Fri, 13 Apr 2012 22:46:23 +0300
+
muttprint (0.73-4) unstable; urgency=low
* remove obsolete debconf note (closes: #631303, #658505)
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 c1a5a28..ea72ac4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: muttprint
Section: mail
Priority: optional
Maintainer: Rene Engelhard <[email protected]>
-Build-Depends: debhelper (>= 4.1.16), dpatch, imagemagick, ghostscript, docbook-utils, sharutils, automake1.9, autoconf, docbook
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 9), imagemagick, ghostscript, docbook-utils, sharutils, automake1.9, autoconf, docbook
+Standards-Version: 3.9.3
+Homepage: http://muttprint.sourceforge.net
Package: muttprint
Architecture: all
-Depends: ${perl:Depends} (>= 5.8.0-16), ${misc:Depends}, texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, libtext-iconv-perl, latex-ucs | texlive-latex-recommended
+Depends: ${perl:Depends} (>= 5.8.0-16), ${misc:Depends}, texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, libtext-iconv-perl, latex-ucs
Recommends: mutt | sylpheed | gnus | xfmail | exmh | mail-reader, libtimedate-perl
Suggests: ospics, compface, imagemagick, psutils, muttprint-manual, dialog, slrn | news-reader, texlive-fonts-extra
Enhances: mail-reader, news-reader
diff --git a/debian/copyright b/debian/copyright
index 223f60e..4780274 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,4 +14,4 @@ Copyright (c) 2005, Lukas Ruf <[email protected]>
You are free to distribute this software under the terms of
the GNU General Public Licence.
On Debian systems, the complete text of the GNU General Public
-Licence can be found in /usr/share/common-licenses/GPL file.
+Licence can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 02ddb2a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,8 +0,0 @@
-03_fix_muttrc_changing_instructions
-11_right_docbook-utils_flags
-12_no_html_docs
-14_point_to_ospics
-15_no_Gentoo
-16_dont_install_README
-17_leave_tmp_dir
-18_pod2man_de_utf8
diff --git a/debian/patches/03_fix_muttrc_changing_instructions.dpatch b/debian/patches/03-fix-muttrc-changing-instructions.patch
similarity index 94%
rename from debian/patches/03_fix_muttrc_changing_instructions.dpatch
rename to debian/patches/03-fix-muttrc-changing-instructions.patch
index 2ac4944..b2251c0 100644
--- a/debian/patches/03_fix_muttrc_changing_instructions.dpatch
+++ b/debian/patches/03-fix-muttrc-changing-instructions.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_muttrc_changing_instructions.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix up docs
+From: Rene Engelhard <[email protected]>
+Subject: fix up docs
-@DPATCH@
diff -urNad muttprint-0.73~/doc/manual/de/manual-de.sgml muttprint-0.73/doc/manual/de/manual-de.sgml
--- muttprint-0.73~/doc/manual/de/manual-de.sgml 2008-12-29 23:19:51.000000000 +0100
+++ muttprint-0.73/doc/manual/de/manual-de.sgml 2008-12-29 23:21:52.000000000 +0100
diff --git a/debian/patches/11_right_docbook-utils_flags.dpatch b/debian/patches/11-right-docbook-utils-flags.patch
similarity index 96%
rename from debian/patches/11_right_docbook-utils_flags.dpatch
rename to debian/patches/11-right-docbook-utils-flags.patch
index afcbed7..38b1ae0 100644
--- a/debian/patches/11_right_docbook-utils_flags.dpatch
+++ b/debian/patches/11-right-docbook-utils-flags.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_right_docbook-utils_flags.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad muttprint-0.73~/doc/manual/de/Makefile.am muttprint-0.73/doc/manual/de/Makefile.am
--- muttprint-0.73~/doc/manual/de/Makefile.am 2008-12-29 23:19:51.000000000 +0100
+++ muttprint-0.73/doc/manual/de/Makefile.am 2008-12-29 23:21:12.000000000 +0100
diff --git a/debian/patches/12_no_html_docs.dpatch b/debian/patches/12-no-html-docs.patch
similarity index 91%
rename from debian/patches/12_no_html_docs.dpatch
rename to debian/patches/12-no-html-docs.patch
index 6bab42f..cd6b2c8 100644
--- a/debian/patches/12_no_html_docs.dpatch
+++ b/debian/patches/12-no-html-docs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_no_html_docs.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad muttprint-0.73~/doc/manual/de/Makefile.am muttprint-0.73/doc/manual/de/Makefile.am
--- muttprint-0.73~/doc/manual/de/Makefile.am 2008-12-29 23:20:51.000000000 +0100
+++ muttprint-0.73/doc/manual/de/Makefile.am 2008-12-29 23:20:51.000000000 +0100
diff --git a/debian/patches/14_point_to_ospics.dpatch b/debian/patches/14-point-to-ospics.patch
similarity index 95%
rename from debian/patches/14_point_to_ospics.dpatch
rename to debian/patches/14-point-to-ospics.patch
index 269761d..2f034d2 100644
--- a/debian/patches/14_point_to_ospics.dpatch
+++ b/debian/patches/14-point-to-ospics.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_point_to_ospics.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The images get moved to ospics
+From: Rene Engelhard <[email protected]>
+Subject: The images get moved to ospics
-@DPATCH@
diff -urNad muttprint-0.73~/doc/manpages/de/muttprint.pod muttprint-0.73/doc/manpages/de/muttprint.pod
--- muttprint-0.73~/doc/manpages/de/muttprint.pod 2006-05-06 09:13:46.000000000 +0200
+++ muttprint-0.73/doc/manpages/de/muttprint.pod 2008-12-29 18:13:33.000000000 +0100
diff --git a/debian/patches/15_no_Gentoo.dpatch b/debian/patches/15-no-Gentoo.patch
similarity index 67%
rename from debian/patches/15_no_Gentoo.dpatch
rename to debian/patches/15-no-Gentoo.patch
index 1b49b28..f7c0eb5 100644
--- a/debian/patches/15_no_Gentoo.dpatch
+++ b/debian/patches/15-no-Gentoo.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_no_Gentoo.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: we don't need the Gentoo pictures
+From: Rene Engelhard <[email protected]>
+Subject: we don't need the Gentoo pictures
-@DPATCH@
diff -urNad muttprint-0.73~/pics/Makefile.am muttprint-0.73/pics/Makefile.am
--- muttprint-0.73~/pics/Makefile.am 2006-05-06 09:13:46.000000000 +0200
+++ muttprint-0.73/pics/Makefile.am 2008-12-29 18:22:12.000000000 +0100
diff --git a/debian/patches/16-dont-install-README.patch b/debian/patches/16-dont-install-README.patch
new file mode 100644
index 0000000..c623412
--- /dev/null
+++ b/debian/patches/16-dont-install-README.patch
@@ -0,0 +1,16 @@
+From: Rene Engelhard <[email protected]>
+Subject: we don't need README.pics being installed...
+
+---
+ pics/Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/pics/Makefile.am
++++ b/pics/Makefile.am
+@@ -8,5 +8,4 @@
+ Debian.eps \
+ Debian.png \
+ penguin.eps \
+- penguin.jpg \
+- README.pics
++ penguin.jpg
diff --git a/debian/patches/16_dont_install_README.dpatch b/debian/patches/16_dont_install_README.dpatch
deleted file mode 100644
index e2d2d87..0000000
--- a/debian/patches/16_dont_install_README.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16__dont_install_REAME.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: we don't need README.pics being installed...
-
-@DPATCH@
-diff -urNad muttprint-0.73~/pics/Makefile.am muttprint-0.73/pics/Makefile.am
---- muttprint-0.73~/pics/Makefile.am 2008-12-29 20:23:16.000000000 +0100
-+++ muttprint-0.73/pics/Makefile.am 2008-12-29 20:24:01.000000000 +0100
-@@ -12,5 +12,4 @@
- Debian.eps \
- Debian.png \
- penguin.eps \
-- penguin.jpg \
-- README.pics
-+ penguin.jpg
diff --git a/debian/patches/17_leave_tmp_dir.dpatch b/debian/patches/17-leave-tmp-dir.patch
similarity index 69%
rename from debian/patches/17_leave_tmp_dir.dpatch
rename to debian/patches/17-leave-tmp-dir.patch
index 953ea0d..034695f 100644
--- a/debian/patches/17_leave_tmp_dir.dpatch
+++ b/debian/patches/17-leave-tmp-dir.patch
@@ -1,12 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_leave_tmp_dir.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: cannot remove path when cwd is /tmp/muttprint*
-## DP: Author: martin f krafft <[email protected]>
-## DP: http://bugs.debian.org/551543
+From: martin f krafft <[email protected]>
+Subject: cannot remove path when cwd is /tmp/muttprint*, closes: #551543
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' muttprint-0.73~/muttprint muttprint-0.73/muttprint
--- muttprint-0.73~/muttprint 2008-12-26 01:33:36.000000000 +0100
+++ muttprint-0.73/muttprint 2010-11-27 19:08:51.000000000 +0100
diff --git a/debian/patches/18_pod2man_de_utf8.dpatch b/debian/patches/18-pod2man-de-utf8.patch
similarity index 77%
rename from debian/patches/18_pod2man_de_utf8.dpatch
rename to debian/patches/18-pod2man-de-utf8.patch
index db47108..06aa781 100644
--- a/debian/patches/18_pod2man_de_utf8.dpatch
+++ b/debian/patches/18-pod2man-de-utf8.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_pod2man_de_utf8.diff.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' muttprint-0.73~/doc/manpages/de/Makefile.am muttprint-0.73/doc/manpages/de/Makefile.am
--- muttprint-0.73~/doc/manpages/de/Makefile.am 2006-05-06 07:13:46.000000000 +0000
+++ muttprint-0.73/doc/manpages/de/Makefile.am 2012-02-10 20:15:43.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d62d6ac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+03-fix-muttrc-changing-instructions.patch
+11-right-docbook-utils-flags.patch
+12-no-html-docs.patch
+14-point-to-ospics.patch
+15-no-Gentoo.patch
+16-dont-install-README.patch
+17-leave-tmp-dir.patch
+18-pod2man-de-utf8.patch
diff --git a/debian/rules b/debian/rules
index 6937bab..2baae4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
aclocal-1.9
@@ -15,6 +14,10 @@ configure-stamp: patch-stamp
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: configure-stamp build-stamp
build-stamp:
dh_testdir
@@ -30,7 +33,7 @@ build-stamp:
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@@ -53,7 +56,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/muttprint
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
