Package: mrename 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 81b7ca953e53cd0eee6b099a2351c78bb83fbe1d Mon Sep 17 00:00:00 2001 From: Jari Aalto <jari.aa...@cante.net> Date: Mon, 23 Apr 2012 23:43:36 +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> --- Makefile | 9 --------- debian/changelog | 14 ++++++++++++++ debian/compat | 2 +- debian/control | 9 ++++----- debian/copyright | 11 +++-------- debian/patches/00list | 3 --- ...g.dpatch => 01-space-in-filenames-handling.patch} | 8 ++------ debian/patches/05-makefile.patch | 18 ++++++++++++++++++ .../{10_option_p.dpatch => 10-option-p.patch} | 7 ++----- ...0_shebang_patch.dpatch => 20-shebang-patch.patch} | 7 ++----- debian/patches/series | 4 ++++ debian/rules | 17 ++++++++--------- debian/source/format | 1 + 13 files changed, 59 insertions(+), 51 deletions(-) delete mode 100644 Makefile delete mode 100644 debian/patches/00list rename debian/patches/{01_space_in_filenames_handling.dpatch => 01-space-in-filenames-handling.patch} (76%) create mode 100644 debian/patches/05-makefile.patch rename debian/patches/{10_option_p.dpatch => 10-option-p.patch} (81%) rename debian/patches/{20_shebang_patch.dpatch => 20-shebang-patch.patch} (75%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/Makefile b/Makefile deleted file mode 100644 index 322bc8b..0000000 --- a/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# Makefile adapted from saytime and added for Debian by Dr. Guenter Bechly - -DESTDIR = -BINDIR = $(DESTDIR)/usr/bin - -install: - install mcpmv $(BINDIR) - install mrename $(BINDIR) - diff --git a/debian/changelog b/debian/changelog index 65d8509..66888fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +mrename (1.2-12.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-indep target; use dh_prep in rules file. + * Patch 05 is new; in-line changes to original sources. + * Fix description-contains-homepage (Lintian). + * Fix description-synopsis-starts-with-article (Lintian). + * Fix copyright-with-old-dh-make-debian-copyright (Lintian). + * Fix copyright-refers-to-versionless-license-file (Lintian). + + -- Jari Aalto <jari.aa...@cante.net> Mon, 23 Apr 2012 23:17:57 +0300 + mrename (1.2-12) unstable; urgency=low * New maintainer. Closes: #439532. 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 40aec71..39cdd76 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,17 @@ Source: mrename Section: utils Priority: optional Maintainer: Kevin Coyner <kcoy...@debian.org> -Build-Depends: debhelper (>= 5), dpatch -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 +Homepage: http://alfalinux.sourceforge.net/mrename.php3 Package: mrename Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A tool for easy and automatic renaming of many files +Description: tool for easy and automatic renaming of many files Mass Rename is a simple pair of shell scripts which make it easier to move, rename, or copy multiple files at once. It is intended mainly as an automatic and simple way to rename multiple files with a customizable prefix and a progressive number. It is also possible to modify the rename format simply by editing one of the scripts. It is easy, complete, and efficient, and was written only in sh code. - . - Homepage: http://alfalinux.sourceforge.net/mrename.php3 diff --git a/debian/copyright b/debian/copyright index cdd37e1..eae767d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,7 +10,7 @@ It can now be downloaded from http://alfalinux.sourceforge.net/mrename.php3. Upstream Author: Giancarlo Erra <ro...@mindless.com> -Copyright: (c) 2000 Giancarlo Erra +Copyright: Copyright (C) 2000 Giancarlo Erra This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,13 +21,8 @@ Copyright: (c) 2000 Giancarlo Erra 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 with - the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; - if not, write to the Free Software Foundation, Inc., 51 Franklin Street, - Fifth Floor, Boston, MA 02110-1301 USA - On Debian systems, the complete text of the GNU General Public License, version 2, can be found in /usr/share/common-licenses/GPL-2. -The Debian packaging is (C) 2007, Kevin Coyner <kcoy...@debian.org> and -is licensed under the GPL, see above. +The Debian packaging is Copyright (C) 2007, Kevin Coyner +<kcoy...@debian.org> and is licensed under the GPL, see above. diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 2cc8f1e..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,3 +0,0 @@ -01_space_in_filenames_handling -10_option_p -20_shebang_patch diff --git a/debian/patches/01_space_in_filenames_handling.dpatch b/debian/patches/01-space-in-filenames-handling.patch similarity index 76% rename from debian/patches/01_space_in_filenames_handling.dpatch rename to debian/patches/01-space-in-filenames-handling.patch index ad71c4d..158679e 100644 --- a/debian/patches/01_space_in_filenames_handling.dpatch +++ b/debian/patches/01-space-in-filenames-handling.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_space_in_filenames_handling.dpatch by Tommaso Moroni <moron...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Tommaso Moroni <moron...@debian.org> +Subject: Use quotes around parameters: spaces in filenames -@DPATCH@ diff -urNad mrename-1.2~/mcpmv mrename-1.2/mcpmv --- mrename-1.2~/mcpmv 2000-03-22 16:21:24.000000000 +0100 +++ mrename-1.2/mcpmv 2005-11-12 09:48:50.000000000 +0100 diff --git a/debian/patches/05-makefile.patch b/debian/patches/05-makefile.patch new file mode 100644 index 0000000..080e6c0 --- /dev/null +++ b/debian/patches/05-makefile.patch @@ -0,0 +1,18 @@ +From: Dr. Guenter Bechly +Subject: New file: makefile + +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..322bc8b +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,9 @@ ++# Makefile adapted from saytime and added for Debian by Dr. Guenter Bechly ++ ++DESTDIR = ++BINDIR = $(DESTDIR)/usr/bin ++ ++install: ++ install mcpmv $(BINDIR) ++ install mrename $(BINDIR) ++ diff --git a/debian/patches/10_option_p.dpatch b/debian/patches/10-option-p.patch similarity index 81% rename from debian/patches/10_option_p.dpatch rename to debian/patches/10-option-p.patch index a6e3044..c3c3148 100644 --- a/debian/patches/10_option_p.dpatch +++ b/debian/patches/10-option-p.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_option_p.dpatch by Kevin Coyner <kcoy...@debian.org> -## -## DP: The -p option does not exist and should actually be -m. +From: Kevin Coyner <kcoy...@debian.org> +Subject: The -p option does not exist and should actually be -m. -@DPATCH@ diff -urNad mrename-1.2~/README mrename-1.2/README --- mrename-1.2~/README 2007-08-25 19:57:24.000000000 -0400 +++ mrename-1.2/README 2007-08-25 20:01:06.000000000 -0400 diff --git a/debian/patches/20_shebang_patch.dpatch b/debian/patches/20-shebang-patch.patch similarity index 75% rename from debian/patches/20_shebang_patch.dpatch rename to debian/patches/20-shebang-patch.patch index d002bb0..6a644ac 100644 --- a/debian/patches/20_shebang_patch.dpatch +++ b/debian/patches/20-shebang-patch.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_shebang_patch.dpatch by Kevin Coyner <kcoy...@debian.org> -## -## DP: Thanks to Stephan Hermann <s...@sourcecode.de> for this patch. +From: Kevin Coyner <kcoy...@debian.org> +Subject: Thanks to Stephan Hermann <s...@sourcecode.de> for this patch. -@DPATCH@ diff -urNad mrename-1.2~/mcpmv mrename-1.2/mcpmv --- mrename-1.2~/mcpmv 2007-08-25 19:55:21.000000000 -0400 +++ mrename-1.2/mcpmv 2007-08-25 19:55:31.000000000 -0400 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..aeb5eab --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +01-space-in-filenames-handling.patch +05-makefile.patch +10-option-p.patch +20-shebang-patch.patch diff --git a/debian/rules b/debian/rules index eade1f8..e1bc4aa 100755 --- a/debian/rules +++ b/debian/rules @@ -5,22 +5,21 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - configure: configure-stamp -configure-stamp: patch +configure-stamp: dh_testdir touch configure-stamp +build-arch: build +build-indep: build + build: configure-stamp build-stamp build-stamp: dh_testdir # Add here commands to compile the package. touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -30,18 +29,18 @@ clean-patched: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/tmp. $(MAKE) install DESTDIR=`pwd`/debian/mrename # Build architecture-independent files here. -binary-indep: build install +binary-arch: build install # We have nothing to do by default. # Build architecture-dependent files here. -binary-arch: build install +binary-indep: build install dh_testdir dh_testroot dh_installdocs 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