Added last patches

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

diff --git a/FAQ b/FAQ
index 6e81758..f05fc74 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -192,8 +192,8 @@ A. Since MP3 is considered non-free (you get it for free, but hardware players
    
    If you are among those individuals, you might need to add support for MP3
    encoding to your system:
    
    If you are among those individuals, you might need to add support for MP3
    encoding to your system:

-   Debian : check http://marillat.free.fr to install lame in your system.
-            others prefer bladeenc. Check www.apt-get.org or google.
+   Debian : check http://ftp.nerim.net/debian-marillat to install lame in your
+            system. Others prefer bladeenc. Check www.apt-get.org or google.

    RedHat : search on rpmfind.net
    FreeBSD: By default includes LAME support.
    OpenBSD: Available by specifying you want to install the port with LAME
    RedHat : search on rpmfind.net
    FreeBSD: By default includes LAME support.
    OpenBSD: Available by specifying you want to install the port with LAME

diff --git a/abcde b/abcde
index 553a818..e6b8aad 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -505,12 +505,12 @@ do_tag ()
                                echo ARTIST="$TRACKARTIST"
                                echo ALBUM="$DALBUM"
                                echo TITLE="$TRACKNAME"
                                echo ARTIST="$TRACKARTIST"
                                echo ALBUM="$DALBUM"
                                echo TITLE="$TRACKNAME"

-                                       if [ -n "$CDYEAR" ]; then
+                               if [ -n "$CDYEAR" ]; then

                                        echo DATE="$CDYEAR"
                                        echo DATE="$CDYEAR"

-                                       fi
-                               if [ -n "$CDGENRE" ]; then
+                               fi
+                               if [ -n "$CDGENRE" ]; then

                                        echo GENRE="$CDGENRE"
                                        echo GENRE="$CDGENRE"

-                               fi      
+                               fi      

                                echo TRACKNUMBER=${TRACKNUM:-$1}
                                echo CDDB=$CDDBDISCID
                                if [ "$(eval echo ${COMMENT})" != "" ]; then
                                echo TRACKNUMBER=${TRACKNUM:-$1}
                                echo CDDB=$CDDBDISCID
                                if [ "$(eval echo ${COMMENT})" != "" ]; then


@@ -1047,7 +1047,13 @@ do_discid ()
        #elif [ -z "$DISCID" ]; then
        if [ -z "$DISCID" ]; then
                vecho -n "Getting CD track info... "
        #elif [ -z "$DISCID" ]; then
        if [ -z "$DISCID" ]; then
                vecho -n "Getting CD track info... "

+               if [ "$OSFLAVOUR" = "OSX" ]; then
+                       disktool -u ${CDROM#/dev/}
+               fi

                TRACKINFO=$($CDDISCID $CDROM)
                TRACKINFO=$($CDDISCID $CDROM)

+               if [ "$OSFLAVOUR" = "OSX" ]; then
+                       disktool -m ${CDROM#/dev/}
+               fi

                # Make sure there's a CD in there by checking cd-discid's return code
                if [ "$?" = "1" ]; then
                        echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2
                # Make sure there's a CD in there by checking cd-discid's return code
                if [ "$?" = "1" ]; then
                        echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2


@@ -1204,9 +1210,10 @@ do_discid ()
                cat /dev/null > "$ABCDETEMPDIR/status"
        fi
        if [ X"$CUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then
                cat /dev/null > "$ABCDETEMPDIR/status"
        fi
        if [ X"$CUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then

-               if checkstatus cuefile ; then :; else
-                       $MKCUE $MKCUEOPTS > $ABCDETEMPDIR/cue-$(echo $TRACKINFO | cut -f1 -d' ').txt
-                       echo cuefile >> "$ABCDETEMPDIR/status"
+               if checkstatus cuefile >/dev/null ; then :; else
+                       CUEFILE=cue-$(echo $TRACKINFO | cut -f3 -d' ').txt
+                       $MKCUE $MKCUEOPTS > $ABCDETEMPDIR/$CUEFILE
+                       echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"

                fi
        fi
        # If we got the CDPARANOIA status and it is not recorded, save it now
                fi
        fi
        # If we got the CDPARANOIA status and it is not recorded, save it now


@@ -1222,6 +1229,13 @@ do_discid ()
        echo "$TRACKINFO" > "$ABCDETEMPDIR/discid"
 }
 
        echo "$TRACKINFO" > "$ABCDETEMPDIR/discid"
 }
 

+# do_mkcue
+
+do_mkcue()
+{
+
+}
+

 # do_cddbparse
 # Parses a CDDB file and outputs the title and the track names.
 # Variables: CDDBFILE
 # do_cddbparse
 # Parses a CDDB file and outputs the title and the track names.
 # Variables: CDDBFILE


@@ -2055,6 +2069,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
        OSFLAVOUR=OSX
        # We should have disktool in OSX, but let's be sure...
        NEEDDISKTOOL=y
        OSFLAVOUR=OSX
        # We should have disktool in OSX, but let's be sure...
        NEEDDISKTOOL=y

+       CDROMREADERSYNTAX=cddafs

 elif [ X$(uname) = "XOpenBSD" ] ; then
        HTTPGET=wget
        MD5SUM=md5
 elif [ X$(uname) = "XOpenBSD" ] ; then
        HTTPGET=wget
        MD5SUM=md5


@@ -2835,6 +2850,10 @@ do
        fi
        ) &
 done
        fi
        ) &
 done

+# Lets move the cue file
+if checkstatus cuefile >/dev/null ; then 
+       do_movecue
+fi

 # Go through it again and make sure there's no distmp3 stragglers, otherwise
 # we'll delete the files they're working on
 ## FIXME ## Check also for files which are encoded using PIPEs.
 # Go through it again and make sure there's no distmp3 stragglers, otherwise
 # we'll delete the files they're working on
 ## FIXME ## Check also for files which are encoded using PIPEs.

diff --git a/debian/changelog b/debian/changelog
index cdcb891..3cd99a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 abcde (2.3.0-1) unstable; urgency=low
 
   * New upstream release!
 abcde (2.3.0-1) unstable; urgency=low
 
   * New upstream release!

-  * 
+  * Defining the tracknumber now resets the first track if given a number
+    different to 1 (that is: abcde -T 1 2-10 creates songs 1 to 9).
+  * Modified the FAQ to reflect the changes on Marillat's repo 
+    (Closes: #315724).

 
 

- -- Jesus Climent <jesus.climent@hispalinux.es>  Sun,  1 May 2005 23:57:18 +0300
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Mon,  4 Jul 2005 19:58:14 +0300

 
 abcde (2.2.6-1) unstable; urgency=low
 
 
 abcde (2.2.6-1) unstable; urgency=low