On Tue, Apr 26, 2011 at 01:38:02PM +0200, Elimar Riesebieter wrote: > Dear mentors, > > I am looking for a sponsor for the new version 3.9.0-2 > of my package "ripit". > > It builds these binary packages: > ripit - Textbased audio CD ripper > > This is an upload to unstable with no changes to the version which resides in > exparimental. I see that your package has already been uploaded; however, what do you think about the attached couple of patches - a couple of minor improvements and a couple of fixes to minor issues in the Debian packaging? None of them are mandatory or anything; they're just things that I would do to my own Debian packages, and of course it's up to you whether to accept them or not :) G'luck, Peter -- Peter Pentchev roam@ringlet.net roam@FreeBSD.org peter@packetscale.com PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 I am jealous of the first word in this sentence.
From ebf0dde42ed20a7f6825a001f94d2fe4204ef9dc Mon Sep 17 00:00:00 2001 From: Peter Pentchev <roam@ringlet.net> Date: Tue, 26 Apr 2011 15:09:23 +0300 Subject: [PATCH 1/7] Do not remove .pc/ with 3.0 (quilt). With the 3.0 (quilt) source format, dpkg-buildpackage takes care of applying and unapplying the patches. If the clean target removes quilt's .pc directory, but the patches are *not* unapplied (as they will not be in a normal "debian/rules clean" run), the source tree is left in a somewhat inconsistent state, and a subsequent build attempt will fail when trying to apply the patches. --- debian/rules | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/debian/rules b/debian/rules index f47ffeb..a533286 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,6 @@ clean: dh_testdir dh_testroot rm -f build-stamp install-stamp - rm -rf .pc dh_clean install: install-stamp -- 1.7.4.1
From cf76f3d267d1980f16c52a0fcec8d6eb7a2b7e96 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <roam@ringlet.net> Date: Tue, 26 Apr 2011 15:12:14 +0300 Subject: [PATCH 2/7] Convert the copyright file to the DEP 5 candidate format. --- debian/copyright | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian/copyright b/debian/copyright index 1a0775d..44ada16 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1,21 @@ -This package was debianized by Elimar Riesebieter <riesebie@lxtec.de> on -Sun, 04 Dec 2005 18:34:22 +0100. +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 +Upstream-Name: ripit +Upstream-Contact: Felix Suwald <ripit@suwald.com> +Source: http://www.suwald.com/ripit -It is available at: http://www.suwald.com/ripit +Files: * +Copyright: (C) 2005 Felix Suwald +License: GPL-2+ -Upstream Author: Felix Suwald <ripit@suwald.com> +Files: debian/* +Copyright: (C) 2006-2011 Elimar Riesebieter <riesebie@lxtec.de> +License: GPL-2+ -Copyright (C) 2005 Felix Suwald - -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 -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -On a Debian system, the license can be found at -/usr/share/common-licenses/GPL-2 +License: GPL-2+ + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + On Debian systems, the complete text of the GNU General Public License + can be found in "/usr/share/common-licenses/GPL-2". -- 1.7.4.1
From d53c11c285619342b74f72032d4959aa07ee6fa0 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <roam@ringlet.net> Date: Tue, 26 Apr 2011 15:19:21 +0300 Subject: [PATCH 3/7] Shorten the rules file by using the dh(1) tool. --- debian/rules | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/debian/rules b/debian/rules index a533286..78c37b6 100755 --- a/debian/rules +++ b/debian/rules @@ -6,44 +6,26 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -#include /usr/share/quilt/quilt.make - build: build-stamp build-stamp: - dh_testdir + dh build touch build-stamp clean: - dh_testdir - dh_testroot - rm -f build-stamp install-stamp - dh_clean + dh $@ install: install-stamp install-stamp: build-stamp - dh_testdir - dh_testroot - dh_prep - dh_installdirs - # Add here commands to install the package into debian/ripit. - $(MAKE) install prefix=$(CURDIR)/debian/ripit/usr \ + dh install --before auto_install + dh_auto_install -- prefix=$(CURDIR)/debian/ripit/usr \ etcdir=$(CURDIR)/debian/ripit/etc/ripit + dh install --before installchangelogs + dh_installchangelogs HISTORY + dh install --remaining touch install-stamp binary-indep: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installman - dh_installchangelogs HISTORY - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_perl - dh_gencontrol - dh_md5sums - dh_builddeb + dh $@ binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary -- 1.7.4.1
From 573cc4b23409ef5a1e21c23688906734567823d7 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <roam@ringlet.net> Date: Tue, 26 Apr 2011 15:24:32 +0300 Subject: [PATCH 4/7] Minimize the rules file using debhelper override targets. --- debian/control | 2 +- debian/rules | 22 ++++------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/debian/control b/debian/control index 15d94e4..36afe3c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Elimar Riesebieter <riesebie@lxtec.de> Standards-Version: 3.9.2 -Build-Depends: debhelper (>> 7.0.0) +Build-Depends: debhelper (>= 7.0.50~) Homepage: http://www.suwald.com/ripit/news.php Package: ripit diff --git a/debian/rules b/debian/rules index 78c37b6..27c9cda 100755 --- a/debian/rules +++ b/debian/rules @@ -6,26 +6,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -build: build-stamp -build-stamp: - dh build - touch build-stamp - -clean: - dh $@ - -install: install-stamp -install-stamp: build-stamp - dh install --before auto_install +override_dh_auto_install: dh_auto_install -- prefix=$(CURDIR)/debian/ripit/usr \ etcdir=$(CURDIR)/debian/ripit/etc/ripit - dh install --before installchangelogs + +override_dh_installchangelogs: dh_installchangelogs HISTORY - dh install --remaining - touch install-stamp -binary-indep: build install +%: dh $@ - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary -- 1.7.4.1
From 53061535d0f58b2c1b8dd0fe8f7edd65efbc3213 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <roam@ringlet.net> Date: Tue, 26 Apr 2011 15:26:04 +0300 Subject: [PATCH 5/7] Bump the debhelper compat level to 8 with no further changes. --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 36afe3c..0e68886 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Elimar Riesebieter <riesebie@lxtec.de> Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 7.0.50~) +Build-Depends: debhelper (>= 8) Homepage: http://www.suwald.com/ripit/news.php Package: ripit -- 1.7.4.1
From 0ff1f2bea21e440c77182bc9c48ae6f2fb7c5944 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@ringlet.net>
Date: Tue, 26 Apr 2011 15:33:05 +0300
Subject: [PATCH 6/7] Remove the unneeded versions of dependencies - satisfied even in oldstable.
---
debian/control | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 0e68886..a139045 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,11 @@ Package: ripit
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, libwww-perl, libcddb-get-perl,
cdparanoia | cdda2wav | icedax,
- vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | faac | wavpack | ffmpeg,
+ vorbis-tools | lame | flac | bladeenc | faac | wavpack | ffmpeg,
normalize-audio,
libwebservice-musicbrainz-perl,
libmusicbrainz-discid-perl
-Suggests: eject, id3 (>= 0.12), id3v2
+Suggests: eject, id3, id3v2
Description: Textbased audio CD ripper
ripit runs in text mode (no fancy GUI here) and does everything required to
produce a set of mp3, ogg, flac, m4a files without any user-intervention.
--
1.7.4.1
From 0e2163207e3de626f9a18ead4ae0436301182248 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@ringlet.net>
Date: Tue, 26 Apr 2011 15:35:46 +0300
Subject: [PATCH 7/7] Lowercase the first word of the short description.
---
debian/control | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/control b/debian/control
index a139045..fe59461 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, libwww-perl, libcddb-get-perl,
libwebservice-musicbrainz-perl,
libmusicbrainz-discid-perl
Suggests: eject, id3, id3v2
-Description: Textbased audio CD ripper
+Description: textbased audio CD ripper
ripit runs in text mode (no fancy GUI here) and does everything required to
produce a set of mp3, ogg, flac, m4a files without any user-intervention.
.
--
1.7.4.1
Attachment:
signature.asc
Description: Digital signature