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

[Eduard Bloch]

Author: blade
Date: 2006-09-12 18:36:27 +0000 (Tue, 12 Sep 2006)
New Revision: 306

Modified:
   nonameyet/trunk/Changelog
   nonameyet/trunk/cdda2wav/cdda2mp3
   nonameyet/trunk/cdda2wav/cdda2ogg
   nonameyet/trunk/cdrecord/wodim.1
   nonameyet/trunk/debian/changelog
Log:
Typo fixes in wodim.1 and better track listing command in cdda2ogg/cdda2mp3

Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog	2006-09-12 14:54:08 UTC (rev 305)
+++ nonameyet/trunk/Changelog	2006-09-12 18:36:27 UTC (rev 306)
@@ -8,6 +8,7 @@
     project
   * fixed libmagic detection
   * rewrote README.mkisofs, README.win32
+  * better track numbers extraction command in cdda2ogg/cdda2mp3
 
   [ Christian Fromme ]
   * detailed review and correction of author related data in manpages and

Modified: nonameyet/trunk/cdda2wav/cdda2mp3
===================================================================
--- nonameyet/trunk/cdda2wav/cdda2mp3	2006-09-12 14:54:08 UTC (rev 305)
+++ nonameyet/trunk/cdda2wav/cdda2mp3	2006-09-12 18:36:27 UTC (rev 306)
@@ -42,7 +42,7 @@
 
 if [ -z "$LIST" ] ; then
    echo Looking for available tracks...
-   LIST="$($CDDA2WAV -v trackid -t -1 2>&1|grep T:|cut -f1 -d.|cut -f2 -d:)"
+   LIST="$( cdda2wav -J -vtoc 2>&1 | sed -e 's/^[^\ ].*//; s/\.([^)]*)/ /g;s/,//g;')"
    if [ -z "$LIST" ] ; then
       echo "ERROR: No valid audio tracks detected"
       exit 1

Modified: nonameyet/trunk/cdda2wav/cdda2ogg
===================================================================
--- nonameyet/trunk/cdda2wav/cdda2ogg	2006-09-12 14:54:08 UTC (rev 305)
+++ nonameyet/trunk/cdda2wav/cdda2ogg	2006-09-12 18:36:27 UTC (rev 306)
@@ -43,14 +43,14 @@
 
 if [ -z "$LIST" ] ; then
    echo Looking for available tracks...
-   LIST="$($CDDA2WAV -v trackid -t -1 2>&1|grep T:|cut -f1 -d.|cut -f2 -d:)"
+   LIST="$( cdda2wav -J -vtoc 2>&1 | sed -e 's/^[^\ ].*//; s/\.([^)]*)/ /g;s/,//g;')"
    if [ -z "$LIST" ] ; then
       echo "ERROR: No valid audio tracks detected"
       exit 1
    fi
 fi
 
-echo Fetching `echo $LIST | wc -w` tracks in $CDDA_DEVICE, encoding with $MP_CODER.
+echo Fetching `echo $LIST | wc -w` tracks from $CDDA_DEVICE, encoding with $MP_CODER.
 echo Cancel with Ctrl-C, watch out for error messages.
 
 for TRACK in $LIST ; do

Modified: nonameyet/trunk/cdrecord/wodim.1
===================================================================
--- nonameyet/trunk/cdrecord/wodim.1	2006-09-12 14:54:08 UTC (rev 305)
+++ nonameyet/trunk/cdrecord/wodim.1	2006-09-12 18:36:27 UTC (rev 306)
@@ -1,3 +1,5 @@
+.\" @(#)wodim.1	 06/09/10 Copyright 2006 Cdrkit maintainers
+.\" derived from:
 .\" @(#)cdrecord.1	1.106 06/02/09 Copyright 1996 J. Schilling
 .\" 
 .\" This program is free software; you can redistribute it and/or modify
@@ -63,12 +65,12 @@
 .I device
 is the device file offered by the operating system to access the recorder. On
 .I Linux
-systems it is usualy 
+systems it is usually 
 .IR /dev/hd...
 for IDE/ATAPI based devices and 
 .IR /dev/sg...
 for SCSI based defices. Note that sg... devices represent the access trough the
-SCSI GENERIC interface and therefore the differ from the device files generaly
+SCSI GENERIC interface and therefore the differ from the device files generally
 used to open block devices (/dev/scd... or /dev/sr...).
 .PP
 In any case, the user running 
@@ -703,7 +705,7 @@
 than 8 MB to write a CD at a speed less than 20x from an image on a
 local file system on an idle machine, your machine is either underpowered,
 has hardware problems or is mis-configured.
-If you like to write DVDs or to write CDs at higher speed, it makes sense
+If you like to write DVDs or CDs at higher speed, it makes sense
 to use at least 16\ MB for the FIFO.
 .sp
 On old and small machines, you need to be more careful with the FIFO size.
@@ -2347,7 +2349,7 @@
 
 .SH AUTHORS
 .B wodim
-is currently maintained as part of the cdrkit project by its developers. Most of the code and this manual page was originaly written by:
+is currently maintained as part of the cdrkit project by its developers. Most of the code and this manual page was originally written by:
 .PP
 .nf
 Joerg Schilling

Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog	2006-09-12 14:54:08 UTC (rev 305)
+++ nonameyet/trunk/debian/changelog	2006-09-12 18:36:27 UTC (rev 306)
@@ -2,6 +2,7 @@
 
   * New upstream source snapshot
   * fixed installation of FAQ and FORK files (closes: #386735)
+  * typos in wodim.1 fixes, thanks to J. Alto (closes: #386898)
 
  -- Eduard Bloch <blade at debian.org>  Tue, 12 Sep 2006 11:16:34 +0200