bug corrected

git-svn-id: http://abcde.googlecode.com/svn/trunk@31 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/Makefile b/Makefile
index 3ece318..aa52aa0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 2.2.0
+VERSION = 2.2.1

 INSTALL = /usr/bin/install -c
 
 # Installation directories
 INSTALL = /usr/bin/install -c
 
 # Installation directories

diff --git a/abcde b/abcde
index 22bb6fd..b94feae 100755 (executable)
--- 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.
 
 # 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 ()
 {
 
 usage ()
 {


@@ -21,7 +21,7 @@ echo "Options:"
 echo "-1     Encode the whole CD in a single file"
 echo "-a <action1[,action2]...>"
 echo "       Actions to perform (cddb,read,normalize,encode,tag,move,playlist,clean)"
 echo "-1     Encode the whole CD in a single file"
 echo "-a <action1[,action2]...>"
 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 <file>"
 echo "       Specify a configuration file (overrides system and user config files)"
 echo "-b     Batch mode: enable album normalization and nogap encoding"
 echo "-c <file>"
 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..."
                                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
                                                CDPARANOIAAUDIOTRACKS="$TRACKS"
                                        else
                                                if [ -f "$ABCDETEMPDIR/status" ] && checkstatus cdparanoia-audio-tracks ; then

diff --git a/debian/changelog b/debian/changelog
index 34364ee..d88b5b0 100644 (file)
--- 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 <jesus.climent@hispalinux.es>  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.
 abcde (2.2.0-1) unstable; urgency=low
 
   * New release! Let's see if abcde 2.2 gets into Sarge.