Package: muttprofile
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 23cb703e50c7b119f2b4d524df9cf102b676c9fa Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 21:59:15 +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 | 13 +++++++++++++
debian/compat | 2 +-
debian/control | 8 ++++----
debian/copyright | 12 +++++-------
debian/patches/00list | 2 --
...{90-docs-update.dpatch => 90-docs-update.patch} | 8 ++------
...npage-update.dpatch => 90-manpage-update.patch} | 8 ++------
debian/patches/Makefile | 4 ----
debian/patches/series | 2 ++
debian/rules | 15 +++++++--------
debian/source/format | 1 +
11 files changed, 37 insertions(+), 38 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{90-docs-update.dpatch => 90-docs-update.patch} (96%)
rename debian/patches/{90-manpage-update.dpatch => 90-manpage-update.patch} (74%)
delete mode 100644 debian/patches/Makefile
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 3414638..5132b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+muttprofile (1.0.1-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-without-copyright-notice (Lintian) and update Author's email.
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix old-fsf-address-in-copyright-file (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 21:56:32 +0300
+
muttprofile (1.0.1-3) unstable; urgency=low
* Document standard profile regexp (closes: #307738).
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 c337f6e..c5b6a84 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: mail
Priority: optional
Maintainer: martin f. krafft <madd...@debian.org>
Build-Depends-Indep: perl
-Build-Depends: debhelper (>> 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: muttprofile
Architecture: all
-Depends: perl (>= 5.8.1-1), mutt
-Description: a utility to choose profiles in Mutt
+Depends: ${misc:Depends}, perl (>= 5.8.1-1), mutt
+Description: utility to choose profiles in Mutt
A profile in Mutt is simply a specific subset of the configuration. You may
have a personal and a work profile, each of which uses the same base
configuration and then overrides specific configuration items like the email
diff --git a/debian/copyright b/debian/copyright
index 71a9194..c6aac85 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,14 @@ This package was debianized by martin f. krafft <madd...@debian.org> on
Wed, 15 Jan 2003 01:20:06 +0100.
It was downloaded from http://www.acoustics.hut.fi/~mara/mutt/muttprofile.html
+which as of 2012-04-21 no longer hosts the code.
-Upstream Author: Martti Rahkila <martti.rahk...@hut.fi>
+Upstream Author: Martti Rahkila <martti.rahk...@aalto.fi>
Copyright:
+ Copyright (C) 2003 Martti Rahkila <martti.rahk...@aalto.fi>
+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991.
@@ -16,11 +19,6 @@ Copyright:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f35d3c0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-90-docs-update
-90-manpage-update
diff --git a/debian/patches/90-docs-update.dpatch b/debian/patches/90-docs-update.patch
similarity index 96%
rename from debian/patches/90-docs-update.dpatch
rename to debian/patches/90-docs-update.patch
index bdd5546..d3c252c 100644
--- a/debian/patches/90-docs-update.dpatch
+++ b/debian/patches/90-docs-update.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90-docs-update.dpatch by martin f. krafft <madd...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <madd...@debian.org>
+Subject: No description.
-@DPATCH@
diff -urNad trunk~/muttprofile.html trunk/muttprofile.html
--- trunk~/muttprofile.html 2003-01-15 01:24:16.000000000 +0100
+++ trunk/muttprofile.html 2006-07-12 00:50:46.302138933 +0200
diff --git a/debian/patches/90-manpage-update.dpatch b/debian/patches/90-manpage-update.patch
similarity index 74%
rename from debian/patches/90-manpage-update.dpatch
rename to debian/patches/90-manpage-update.patch
index b6a7450..9b91274 100644
--- a/debian/patches/90-manpage-update.dpatch
+++ b/debian/patches/90-manpage-update.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90-manpage-update.dpatch by martin f. krafft <madd...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <madd...@debian.org>
+Subject: No description.
-@DPATCH@
diff -urNad trunk~/muttprofile trunk/muttprofile
--- trunk~/muttprofile 2003-11-20 19:12:11.000000000 +0100
+++ trunk/muttprofile 2006-07-12 00:47:29.863638023 +0200
diff --git a/debian/patches/Makefile b/debian/patches/Makefile
deleted file mode 100644
index 4e8ee11..0000000
--- a/debian/patches/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-.PHONY: 00list
-00list:
- find . -maxdepth 1 -name Makefile -prune -o -name 00list -prune -o -type f -print \
- | sed -ne 's,\./\(.*\)\.dpatch,\1,p' | sort -n > $@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..604ed1f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+90-docs-update.patch
+90-manpage-update.patch
diff --git a/debian/rules b/debian/rules
index a3ed22c..8ae3b33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
download-doc:
wget -ck http://www.acoustics.hut.fi/~mara/mutt/muttprofile.html \
http://www.acoustics.hut.fi/~mara/mutt/profiles.html \
@@ -15,29 +13,30 @@ download-doc:
configure: configure-stamp
configure-stamp:
dh_testdir
- $(MAKE) -C debian/patches
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: configure-stamp patch
+build-stamp: configure-stamp
dh_testdir
touch build-stamp
pod2man muttprofile >| muttprofile.1
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
rm -f muttprofile.1
dh_clean
- $(MAKE) -C debian/patches
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
install -m 0755 -o root -g root muttprofile \
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
