Put back the official release and remove $ID$

Added CDDISCID in the tag variables

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

diff --git a/TODO b/TODO
index 88544e0..6580369 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,10 +1,9 @@
 TODO:
 ----
-* flacdecode (to extract files from a -1 flac file)
+* flacdecode (to extract files from a -1 flac file) (ALMOST READY!)
 
 * Get the echo instances to behave consistently
 
-* move the wav files to a different dir if the user wants to keep the tracks
 * read the TOC and CDTEXT files and store them
 
 * read_and_encode_and_tag? :)
@@ -79,3 +78,14 @@ TODO:
   BTW, dpkg -l toolame:
   ii  toolame        02i-2          MPEG-1 layer 2 audio encoder
 
+*
+
+abcde -a read,encode -o ogg,flac,wav (it creates and encodes the 3 formats)
+
+abcde -a tag,move,clean (it tags and moves Ogg/Vorbis and erases everything
+                        else...)
+
+I will have to add a "-f" as force to erase the directory if we have encoded
+something else than what we have already moved, so that we dont destroy
+formats that we want to keep.
+

diff --git a/abcde b/abcde
index bd230a5..539c95c 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.
 
-VERSION="2.3.99-$Id $"
+VERSION="2.3.99"
 
 usage ()
 {
@@ -587,6 +587,7 @@ return 0
 do_tag ()
 {
        COMMENTOUTPUT="$(eval echo ${COMMENT})"
+       CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
        run_command '' echo "Tagging track $1 of $TRACKS: $TRACKNAME..."
        # If we want to start the tracks with a given number, we need to modify the
        # TRACKNUM value before evaluation

diff --git a/debian/changelog b/debian/changelog
index eb17a37..cbc59e7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ abcde (2.3.99-1) unstable; urgency=low
   * Added diff choice to CDDB entries ("1,4").
   * Added SHOWCDDBFIELDS to allow the user to show YEAR and GENRE in the
     parsed CDDB output.
+  * Suggests mkcue, and erase old cdgrab info since sarge is out.
   * Changed cdparanoia-audio-tracks to use the status file to save the data.
   * Added the possibility of using a singletrack flac file with an embeded
     cuesheet as a source of tracks.

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/debian/control b/debian/control
index 5820e1f..61b0068 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,13 @@ Source: abcde
 Section: sound
 Priority: optional
 Maintainer: Jesus Climent <jesus.climent@hispalinux.es>
-Standards-Version: 3.6.1.1
+Standards-Version: 3.6.2
 Build-Depends: debhelper
 
 Package: abcde
 Architecture: all
 Depends: cd-discid, wget, cdparanoia | cdda2wav, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex 
-Conflicts: cdgrab
-Replaces: cdgrab
-Provides: cdgrab
-Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3, normalize-audio, vorbisgain
+Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3, normalize-audio, vorbisgain, mkcue
 Description: A Better CD Encoder
  A frontend program to cdparanoia, wget, cd-discid, id3, and your favorite
  Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+(Musepack) encoder (defaults