Small fixes in TRACKNAME

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

diff --git a/abcde b/abcde
index 9ac7733..22bb6fd 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -758,7 +758,7 @@ do_playlist ()
                        do
                                # Shares some code with do_move since the filenames have to match
                                CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
-                               TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
+                               TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')
                                splitvarious
                                TRACKFILE=$(mungefilename "$TRACKNAME")
                                ARTISTFILE=$(mungefilename "$TRACKARTIST")
@@ -2446,7 +2446,7 @@ do
 #                      TRACKNUM=$(printf %0.${TRACKNUMPADDING}d $(expr ${UTRACKNUM} + 0))
                        TRACKNUM=$UTRACKNUM
                        CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
-                       TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
+                       TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')
                        splitvarious
                fi
        fi

diff --git a/debian/changelog b/debian/changelog
index bdf51c5..e850c87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,10 @@ abcde (2.2.0-1) unstable; urgency=low
     (Closes: #95828). Geez! That is low bug number...
   * Added "-T <number>" to modify also the tag entries on the songs. Currently
     available for FLAC and Ogg/Vorbis.
+  * Removes trailing spaces (Closes: #280382).
+  * TRACKNAME now combines multi-lines from long CDDB entries.
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Sun,  7 Nov 2004 03:25:21 +0200
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Mon,  8 Nov 2004 18:28:49 +0200
 
 abcde (2.1.21-1) unstable; urgency=low