[Debburn-changes] r328 - in nonameyet/trunk: . cdda2wav debian

[Eduard Bloch]

Author: blade
Date: 2006-09-22 09:54:17 +0000 (Fri, 22 Sep 2006)
New Revision: 328

Modified:
   nonameyet/trunk/Changelog
   nonameyet/trunk/cdda2wav/cdda2ogg
   nonameyet/trunk/debian/changelog
Log:
Minor corrections by Eugen Dedu

Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog	2006-09-22 09:24:58 UTC (rev 327)
+++ nonameyet/trunk/Changelog	2006-09-22 09:54:17 UTC (rev 328)
@@ -11,6 +11,9 @@
   * better track numbers extraction command in cdda2ogg/cdda2mp3
   * reenabled (forgotten) support for libedc
 
+  [ Eugen Dedu ]
+  * corrections and constructive help on cdda2ogg
+
   [ Modestas Vainius ]
   * dropped . from the include path and fixed mkisofs source to use the local
     headers

Modified: nonameyet/trunk/cdda2wav/cdda2ogg
===================================================================
--- nonameyet/trunk/cdda2wav/cdda2ogg	2006-09-22 09:24:58 UTC (rev 327)
+++ nonameyet/trunk/cdda2wav/cdda2ogg	2006-09-22 09:54:17 UTC (rev 328)
@@ -12,19 +12,17 @@
 # for normal use, comment out the next line
 #DEBUG='-d1'
 
-suffix=`basename $0 | cut -c6-`  # suffix: ogg or mp3
-
 # the post processor is fed through a pipe to avoid space waste
 # specify the post processing program and its options
-case "$suffix" in
-   ogg|OGG|Ogg)
+case $0 in
+   *ogg|*OGG|*Ogg)
    # ensure the right suffix for suffixes later
    suffix=ogg
    missmsg="Encoder not found. Install one first! (eg. vorbis-tools)"
    MP_CODER=${MP_CODER:-oggenc}
    outopt="-o"
    ;;
-   mp3|MP3|mpeg3|MPEG3|Mp3)
+   *mp3|*MP3|*mpeg3|*MPEG3|*Mp3)
    suffix=mp3
    missmsg="Encoder not found. Install one first! (eg. lame)"
    MP_CODER=${MP_CODER:-lame}
@@ -38,8 +36,6 @@
 
 MP_OPTIONS=${MP_OPTIONS:-''}
 
-export MP_CODER
-
 MP_CODER=$(which $MP_CODER 2>/dev/null)
 if [ ! -x "$MP_CODER" ] ; then
    echo $missmsg
@@ -82,6 +78,5 @@
     echo File $NAME failed \(result $RES\). Aborted. >&2
     break
   fi
-  TRACK=`echo $(($TRACK+1))`
 done
 

Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog	2006-09-22 09:24:58 UTC (rev 327)
+++ nonameyet/trunk/debian/changelog	2006-09-22 09:54:17 UTC (rev 328)
@@ -6,7 +6,7 @@
   * fixed installation of FAQ and FORK files (closes: #386735)
   * cdda2ogg/cdda2mp3 are unified, installing cdda2mp3 as symlink
   * remove . from the include list, patch by Modestas Vainius
-    (closes: #358497, confirming fix by Steinar H. Gunderson)
+    (closes: #358497, acknowledging NMU by Steinar H. Gunderson)
   * readded mkzftree to the mkisofs files (closes: #387927)
 
  -- Eduard Bloch <blade at debian.org>  Tue, 12 Sep 2006 11:16:34 +0200