From 9a0af8712dee21740e64ff1a5306fa77341b8e4a Mon Sep 17 00:00:00 2001 From: data Date: Wed, 24 Nov 2004 21:15:05 +0000 Subject: [PATCH 1/1] bug corrected git-svn-id: http://abcde.googlecode.com/svn/trunk@31 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- Makefile | 2 +- abcde | 6 +++--- debian/changelog | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3ece318..aa52aa0 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 2.2.0 +VERSION = 2.2.1 INSTALL = /usr/bin/install -c # Installation directories diff --git a/abcde b/abcde index 22bb6fd..b94feae 100755 --- a/abcde +++ b/abcde @@ -11,7 +11,7 @@ # Copyright for this work is to expire January 1, 2010, after which it # shall be public domain. -VERSION="2.2.0" +VERSION="2.2.1" usage () { @@ -21,7 +21,7 @@ echo "Options:" echo "-1 Encode the whole CD in a single file" echo "-a " echo " Actions to perform (cddb,read,normalize,encode,tag,move,playlist,clean)" -echo "-A Experimental actions (retag, transcode)" +#echo "-A Experimental actions (retag, transcode)" echo "-b Batch mode: enable album normalization and nogap encoding" echo "-c " echo " Specify a configuration file (overrides system and user config files)" @@ -843,7 +843,7 @@ do_discid () cdparanoia|debug) if [ "$WEHAVEACD" = "y" ]; then vecho "Querying the CD for audio tracks..." - TRACKS=$( $CDROMREADER -Q 2>&1 | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | awk '{print $1}' | tr -d "." | tr '\n' ' ' ) + TRACKS=$( $CDPARANOIA -Q 2>&1 | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | awk '{print $1}' | tr -d "." | tr '\n' ' ' ) CDPARANOIAAUDIOTRACKS="$TRACKS" else if [ -f "$ABCDETEMPDIR/status" ] && checkstatus cdparanoia-audio-tracks ; then diff --git a/debian/changelog b/debian/changelog index 34364ee..d88b5b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +abcde (2.2.1-1) unstable; urgency=low + + * Spotted and solved a problem with the way the data tracks were detected + (Closes: #282647). + + -- Jesus Climent Wed, 24 Nov 2004 22:47:54 +0200 + abcde (2.2.0-1) unstable; urgency=low * New release! Let's see if abcde 2.2 gets into Sarge. -- 2.20.1