Lintian Fixes - abcde

Ready changes

Summary

Failed fixers:

See the worker log for details.

Diff

diff --git a/debian/changelog b/debian/changelog
index 4dceed4..6e55c32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+abcde (2.9.3-2) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use set -e rather than passing -e on the shebang-line.
+  * Bump debhelper from old 10 to 13.
+  * Set debhelper-compat version in Build-Depends.
+  * Fix day-of-week for changelog entries 2.5.1-1, 2.3.99.5-1, 2.3.99.4-1.
+  * Update standards version to 4.6.2, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Thu, 30 Mar 2023 12:21:17 -0000
+
 abcde (2.9.3-1) unstable; urgency=medium
 
   * New upstream version with fixes since the 2.9.2 release:
@@ -41,8 +52,8 @@ abcde (2.9.1-1) unstable; urgency=medium
 abcde (2.9-1) unstable; urgency=medium
 
   * New upstream version with various improvements and bugfixes:
-    + Add some documentation for the aged CD ripper dagrab. Thanks to 
-      Teika Kazura for the notification and suggested documentation. This 
+    + Add some documentation for the aged CD ripper dagrab. Thanks to
+      Teika Kazura for the notification and suggested documentation. This
       closes Issue 50: https://abcde.einval.com/bugzilla/show_bug.cgi?id=50
     + Work by Matthias Andree <matthias.andree@gmx.de> to address the issue
       where abcde fails with accented characters from CD-TEXT. The issue and
@@ -50,7 +61,7 @@ abcde (2.9-1) unstable; urgency=medium
       https://abcde.einval.com/bugzilla/show_bug.cgi?id=53
       and also in the abcde mailing list:
       https://lists.einval.com/pipermail/abcde-users/2017-January/000232.html
-    + Allow for embedding of  album art downloaded by the getalbumart function. 
+    + Allow for embedding of  album art downloaded by the getalbumart function.
       Currently this is available for flac (using metaflac), mp3 (using eyed3),
       m4a (using AtomicParsley) and WavPack aka wv (using wvtag).
       This can be invoked in 3 ways:
@@ -63,7 +74,7 @@ abcde (2.9-1) unstable; urgency=medium
     + Use md5 rather than md5sum under macOS. Thanks to JCount for the bug
       report and also the fix. This solves Issue 59:
       https://abcde.einval.com/bugzilla/show_bug.cgi?id=59
-    + Support added for encoding with Audio Interchange File Format (AIFF). 
+    + Support added for encoding with Audio Interchange File Format (AIFF).
       Thanks to Massimo Villa for the feature request. FFmpeg is required
       for the encoding, the container and suffix are 'aiff'.
     + Allow selection of either cddb or musicbrainz from the command line:
@@ -283,12 +294,12 @@ abcde (2.7-1) unstable; urgency=medium
     upstream.
   * Remove TODO file, removed upstream
   * New upstream version, with lots of improvements and bugfixes:
-    + Rewrite of abcde's mungefilename function. Thanks to 
+    + Rewrite of abcde's mungefilename function. Thanks to
       Andreas Kusalananda Kahari for this and also thanks
       to Andrew Willis for the report which triggered the
       rewrite. Thanks also to shughes for an earlier report.
       This closes Issues 72 and 135.
-    + TRACKTOTAL now written to flac and ogg files. Thanks to 
+    + TRACKTOTAL now written to flac and ogg files. Thanks to
       monkth for the notification. This resolves Issue 76.
     + Support added for the downloading of album art. A huge
       thank you to Johannes Gernemann who came forward with
@@ -298,18 +309,18 @@ abcde (2.7-1) unstable; urgency=medium
       abcde FAQ document although the sane defaults in place
       will guarantee a good experience even for those who do
       not read documentation! This closes Issue 33.
-    + Support added for ripping with the GNU Compact Disc 
+    + Support added for ripping with the GNU Compact Disc
       Input and Control library (libcdio) as requested by
       both gentoo and NixOS. The utility used is cd-paranoia
       and can best be called from a conf file as follows:
 
-       CDROMREADERSYNTAX=libcdio       
-       CD_PARANOIA=cd-paranoia  
+       CDROMREADERSYNTAX=libcdio
+       CD_PARANOIA=cd-paranoia
        CDPARANOIAOPTS="--never-skip=40 --verbose"
 
-      with the CD_PARANOIA variable giving the correct path 
+      with the CD_PARANOIA variable giving the correct path
       to cd-paranoia. I believe that cd-paranoia uses the same
-      options as cdparanoia but if I am proven incorrect this 
+      options as cdparanoia but if I am proven incorrect this
       will need to be rectified...
     + Fix for encoding with bladeenc and usepipes.
     + Fix for broken ripping with dagrab. Closes Issue 140.
@@ -318,14 +329,14 @@ abcde (2.7-1) unstable; urgency=medium
     + Added some error checking and documentation for
       the abcde-musicbrainz-tool. Thanks yet again to
       Matthias Andree for this work! Closes issue 138.
-    + New variables for m4a/aac encoding options to be 
+    + New variables for m4a/aac encoding options to be
       manipulated in a users ~/.abcde.conf file:
        1. FAACENCOPTS for faac encoding options
        2. NEROAACENCOPTS for neroAacEnc options
        3. FDKAACENCOPTS for fdkaacenc options
       Note that these options replace the now obsolete AACENCOPTS.
     + Check added for neroAacTag when encoding with neroAacEnc.
-    + Several additions to usepipes with the following encoders 
+    + Several additions to usepipes with the following encoders
       being added:
         1. mp3enc: mp3
         2. speexenc: Speex
@@ -341,15 +352,15 @@ abcde (2.7-1) unstable; urgency=medium
       abcde.conf. Last release of mp3enc in 1998 but it still
       works flawlessly with a modern abcde!
     + Suggested encoding options for l3enc added to the sample
-      abcde.conf. Congratulations to abcde which in 2015 still 
+      abcde.conf. Congratulations to abcde which in 2015 still
       works with l3enc which saw its final release in 1997!
     + Fix for -o option use with options and multiple outputs.
       This allows for commandline options such as the following:
-            abcde -o 'flac:-8,mp3:-b 320' 
-      Thanks to Matthias Andree for yet another quality patch! 
+            abcde -o 'flac:-8,mp3:-b 320'
+      Thanks to Matthias Andree for yet another quality patch!
       This closes Issue 136.
     + Support added for ReplayGain with WavPack encoding.
-    + Fix for MusePack to allow the use of the SV8 ReplayGain 
+    + Fix for MusePack to allow the use of the SV8 ReplayGain
       application 'mpcgain'.
     + Monkey's Audio (ape) encoding added. Tagging is with
       Robert Muth's apetag. Thanks to Shantiq for testing.
@@ -357,11 +368,11 @@ abcde (2.7-1) unstable; urgency=medium
     + Allow 'clean' when OUTPUTTYPE=wav, broken for some time.
       Thanks to Roger rogerx.oss<at>gmail.com for showing the
       problem and demonstrating the fix. This closes Issue 94.
-    + Clarification that CDDBLOCALRECURSIVE=y is required for 
+    + Clarification that CDDBLOCALRECURSIVE=y is required for
       local CDDB search. Thanks to Reuben Thomas for the
       notification. This partially resolves Issue 121.
     + AtomicParsley removed from debian/control, WavPack added.
-    + Details of abcde's handling of faac compiled with and 
+    + Details of abcde's handling of faac compiled with and
       without mp4v2 added as a new entry to FAQs.
     + Fix to allow display of the 'date' meta tag generated
       by eyeD3 in vlc, Audacious and friends.
@@ -376,7 +387,7 @@ abcde (2.7-1) unstable; urgency=medium
     + Support for WavPack added. Closes issue 123.
     + Fix for mp3 encoding with different versions of eyeD3.
       Thanks to Matthias Andree for this patch.
-    + Major AAC encoding cleanup, including addition of the fdkaac encoder. 
+    + Major AAC encoding cleanup, including addition of the fdkaac encoder.
       Thanks to Doug Mcmahon for assistance with this.
 
  -- Steve McIntyre <93sam@debian.org>  Fri, 19 Jun 2015 13:18:14 +0200
@@ -454,7 +465,7 @@ abcde (2.5.4-1) unstable; urgency=low
       tagging better. Closes issue 22 (hopefully)
   * Remove the "A " from the beginning of the description to fix a
     lintian warning
-	
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 18 Sep 2012 13:22:28 +0100
 
 abcde (2.5.3-1) unstable; urgency=low
@@ -538,7 +549,7 @@ abcde (2.5.1-1) unstable; urgency=low
     + improve presentation of options/defaults when asking a question
       (closes issue 9)
 
- -- Steve McIntyre <93sam@debian.org>  Thu, 25 Apr 2012 13:04:57 +0100
+ -- Steve McIntyre <93sam@debian.org>  Wed, 25 Apr 2012 13:04:57 +0100
 
 abcde (2.5.0-1) unstable; urgency=low
 
@@ -711,7 +722,7 @@ abcde (2.3.99.5-1) unstable; urgency=low
   * Repaired multiple CDDB entries when recursive search is active.
   * Patch from A. Costa to clean some typos (Closes: #351774).
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Thu, 07 Feb 2006 23:48:00 +0200
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Tue, 07 Feb 2006 23:48:00 +0200
 
 abcde (2.3.99.4-1) unstable; urgency=low
 
@@ -723,7 +734,7 @@ abcde (2.3.99.4-1) unstable; urgency=low
     portable.
   * Added Solaris OS entry, in case we need to define things for it.
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Thu, 05 Feb 2006 15:24:00 +0200
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sun, 05 Feb 2006 15:24:00 +0200
 
 abcde (2.3.99.3-1) unstable; urgency=low
 
@@ -744,7 +755,7 @@ abcde (2.3.99.3-1) unstable; urgency=low
   * Added iconv + converted to utf-8 the charset of a ready-to-send CDDB
     entry (Closes: #345708).
   * Added AAC (Mpeg4) support.
-  * Small cd-discid update. 
+  * Small cd-discid update.
 
  -- Jesus Climent <jesus.climent@hispalinux.es>  Thu, 19 Jan 2006 23:27:40 +0200
 
@@ -1310,7 +1321,7 @@ abcde (2.1.0-3) unstable; urgency=low
   * Since abcde does not depend on eject, an execution test ([-x]) was added,
     but that means abcde needs a test for eject in the patch if -x is passed:
     Closes: #184151.
-  * Merged some more bits from Marc 'HE' Brockschmidt: Closes: #126289. 
+  * Merged some more bits from Marc 'HE' Brockschmidt: Closes: #126289.
   * A bit of more info in abcde.conf: Closes: #184963.
   * cddb-tool version updated to 0.4.2
 
@@ -1331,7 +1342,7 @@ abcde (2.1.0-2) unstable; urgency=low
 abcde (2.1.0-1) unstable; urgency=low
 
   * The "Time To Release" version.
-  * We close: 
+  * We close:
     + We preppend track number now: Closes: #128966.
     + Itegrate flac: Closes: #126311.
     + Multi-format encode: Closes: #148934.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 072e793..2d1487d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: sound
 Priority: optional
 Maintainer: Steve McIntyre <93sam@debian.org>
 Homepage: https://abcde.einval.com/
-Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 10)
+Standards-Version: 4.6.2
+Build-Depends: debhelper-compat (= 13)
 Vcs-Browser: https://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=summary
 Vcs-Git: https://git.einval.com/git/abcde.git
 
diff --git a/debian/preinst b/debian/preinst
index 791e48e..d6e90cd 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -1,10 +1,12 @@
-#!/bin/sh -e
+#!/bin/sh
 # If:
 # * this isn't an upgrade (a fresh install)
 # * and /etc/cdgrab.conf exists
 # * and /etc/abcde.conf doesn't
 # copy /etc/cdgrab.conf to /etc/abcde.conf
 
+set -e
+
 if [ "$1" != "install" ]
 then
 	exit 0
diff --git a/debian/rules b/debian/rules
index ce13d7c..12a43a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE) 
+	$(MAKE)
 
 	touch build-stamp
 
@@ -51,7 +51,7 @@ binary-indep: build install
 	dh_installexamples
 	dh_installmenu
 	dh_installman
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
@@ -67,7 +67,7 @@ binary-indep: build install
 binary-arch: build install
 # We have nothing to do by default.
 
-source diff:                                                                  
+source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch

Run locally

More details

Full run details

Historical runs