adapter

[packages/cdrtools.git] / cdrtools-config.patch

diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.1 cdrtools-2.01.01/cdrecord/cdrecord.1
--- cdrtools-2.01.01.orig/cdrecord/cdrecord.1	2010-01-31 22:09:45.000000000 +0100
+++ cdrtools-2.01.01/cdrecord/cdrecord.1	2010-02-08 14:15:04.000000000 +0100
@@ -71,7 +71,7 @@
 explained below refers to
 .IR scsibus / target / lun
 of the CD/DVD/BluRay-Recorder.
-If a file /etc/default/cdrecord exists, the parameter to the
+If a file /etc/cdrecord.conf exists, the parameter to the
 .B dev=
 option may also be a drive name label in said file (see FILES section).
 
@@ -1201,13 +1201,13 @@
 option is present,
 .B cdrecord
 will try to get a drive specific speed value from the file
-.B /etc/default/cdrecord
+.B /etc/cdrecord.conf
 and if it cannot find one, it will try to get the speed value from the
 .B CDR_SPEED
 environment and later from the 
 .B CDR_SPEED=
 entry in
-.BR /etc/default/cdrecord .
+.BR /etc/cdrecord.conf .
 If no speed value could be found, cdrecord uses a drive specific default speed.
 The default for all new (MMC compliant) drives is to use the maximum supported by the drive.
 If you use 
@@ -1505,7 +1505,7 @@
 .B CDR_DEVICE
 environment.
 .sp
-If a file /etc/default/cdrecord exists, and
+If a file /etc/cdrecord.conf exists, and
 if the argument to the
 .B dev=
 option
@@ -1514,7 +1514,7 @@
 environment
 does not contain the characters ',', '/', '@' or ':',
 it is interpreted as a device label name that was defined in the file
-/etc/default/cdrecord (see FILES section).
+/etc/cdrecord.conf (see FILES section).
 .sp
 .B \h'-2m'Autotarget Mode
 .br
@@ -2158,7 +2158,7 @@
 .TP
 .B CDR_DEVICE
 This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/cdrecord.
+call of the SCSI transport library or a label in the file /etc/cdrecord.conf
 .TP
 .B CDR_SPEED
 Sets the default speed value for writing (see also 
@@ -2226,8 +2226,11 @@
 
 .SH FILES
 .TP
-.B /etc/default/cdrecord
-Default values can be set for the following options in /etc/default/cdrecord.
+.B /etc/cdrecord.conf
+Default values can be set for the following options in /etc/cdrecord.conf .
+Note that this path has been changed from standard location in cdrtools
+distribution (/etc/default/cdrecord) to be consistent with other packages
+which don't use /etc/default directory in general.
 For example:
 .SM CDR_FIFOSIZE=8m
 or
@@ -2236,7 +2239,7 @@
 .TP
 .B CDR_DEVICE
 This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/cdrecord 
+call of the SCSI transport library or a label in the file /etc/cdrecord.conf
 that allows to identify a specific drive on the system.
 .TP
 .B CDR_SPEED
diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl cdrtools-2.01.01/cdrecord/cdrecord.dfl
--- cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl	2008-12-30 14:29:50.000000000 +0100
+++ cdrtools-2.01.01/cdrecord/cdrecord.dfl	2010-02-08 14:15:04.000000000 +0100
@@ -1,6 +1,6 @@
 #ident @(#)cdrecord.dfl	1.7 08/12/30 Copyr 1998 J. Schilling
 #
-# This file is /etc/default/cdrecord
+# This file is /etc/cdrecord.conf
 # It contains defaults that are used if no command line option
 # or environment is present.
 # 
@@ -19,7 +19,7 @@
 # Note that newer cdrecord versions do not default
 # to speed=1. For MMC compliant drives, the default
 # is to write at maximum speed, so it in general does
-# not make sense to set up a default speed in /etc/default/cdrecord 
+# not make sense to set up a default speed in /etc/cdrecord.conf 
 #
 #CDR_SPEED=40
 
diff -urN cdrtools-2.01.01.orig/cdrecord/README.ATAPI cdrtools-2.01.01/cdrecord/README.ATAPI
--- cdrtools-2.01.01.orig/cdrecord/README.ATAPI	2008-10-12 21:08:13.000000000 +0200
+++ cdrtools-2.01.01/cdrecord/README.ATAPI	2010-02-08 14:15:04.000000000 +0100
@@ -512,14 +512,14 @@
       ln -s scd1 cdrw  # NOTE: see above, maybe cdrom
    Check the new SCSI settings:
       cdrecord -scanbus
-   Setup cdrecord's environment - edit /etc/default/cdrecord:
+   Setup cdrecord's environment - edit /etc/cdrecord.conf:
       CDR_DEVICE=cdrw
       cdrw=1,0,0        4       8m
       cdrom=1,2,0       0       0m
    Input the right values, the fields are described in the manpage
    of cdrecord. Alternatively, you may use this values as
    cdrecord-parameter or take a frontend with an own configuration
-   scheme, then you don't need to modify /etc/default/cdrecord.
+   scheme, then you don't need to modify /etc/cdrecord.conf
 9. It's done! Insert a CD and try "cdrecord -v -toc"
 /*--------------------------------------------------------------------------*/
 He had constant buffer underrun problems:
diff -urN cdrtools-2.01.01.orig/doc/cdrecord.man cdrtools-2.01.01/doc/cdrecord.man
--- cdrtools-2.01.01.orig/doc/cdrecord.man	2010-01-31 22:56:01.000000000 +0100
+++ cdrtools-2.01.01/doc/cdrecord.man	2010-02-08 14:18:18.000000000 +0100
@@ -32,7 +32,7 @@
 
      The _\bd_\be_\bv_\bi_\bc_\be parameter to  the  d\bde\bev\bv=\b=  option  explained  below
      refers  to _\bs_\bc_\bs_\bi_\bb_\bu_\bs/_\bt_\ba_\br_\bg_\be_\bt/_\bl_\bu_\bn of the CD/DVD/BluRay-Recorder.
-     If a file /etc/default/cdrecord exists, the parameter to the
+     If a file /etc/cdrecord.conf exists, the parameter to the
      d\bde\bev\bv=\b= option may also be a drive name label in said file (see
      FILES section).
 
@@ -1422,11 +1422,11 @@
           If no _\bd_\be_\bv option is present, c\bcd\bdr\bre\bec\bco\bor\brd\bd will try  to  get
           the device from the C\bCD\bDR\bR_\b_D\bDE\bEV\bVI\bIC\bCE\bE environment.
 
-          If a file  /etc/default/cdrecord  exists,  and  if  the
+          If a file  /etc/cdrecord.conf  exists,  and  if  the
           argument  to the d\bde\bev\bv=\b= option or the C\bCD\bDR\bR_\b_D\bDE\bEV\bVI\bIC\bCE\bE environ-
           ment does not contain the characters ',', '/',  '@'  or
           ':',  it is interpreted as a device label name that was
-          defined in the file  /etc/default/cdrecord  (see  FILES
+          defined in the file  /etc/cdrecord.conf  (see  FILES
           section).
 
         A\bAu\but\bto\bot\bta\bar\brg\bge\bet\bt M\bMo\bod\bde\be
@@ -2078,7 +2078,7 @@
      C\bCD\bDR\bR_\b_D\bDE\bEV\bVI\bIC\bCE\bE
           This may either hold a device identifier that is  suit-
           able  to the open call of the SCSI transport library or
-          a label in the file /etc/default/cdrecord.
+          a label in the file /etc/cdrecord.conf.
 
      C\bCD\bDR\bR_\b_S\bSP\bPE\bEE\bED\bD
           Sets the default speed  value  for  writing  (see  also
@@ -2143,14 +2143,14 @@
 F\bFI\bIL\bLE\bES\bS
      /\b/e\bet\btc\bc/\b/d\bde\bef\bfa\bau\bul\blt\bt/\b/c\bcd\bdr\bre\bec\bco\bor\brd\bd
           Default values can be set for the following options  in
-          /etc/default/cdrecord.   For  example:  CDR_FIFOSIZE=8m
+          /etc/cdrecord.conf.   For  example:  CDR_FIFOSIZE=8m
           or CDR_SPEED=2
 
           C\bCD\bDR\bR_\b_D\bDE\bEV\bVI\bIC\bCE\bE
                This may either hold a device identifier  that  is
                suitable  to  the  open call of the SCSI transport
                library    or    a    label    in     the     file
-               /etc/default/cdrecord  that  allows  to identify a
+               /etc/cdrecord.conf  that  allows  to identify a
                specific drive on the system.
 
           C\bCD\bDR\bR_\b_S\bSP\bPE\bEE\bED\bD
diff -urN cdrtools-2.01.01.orig/doc/cdrecord.ps cdrtools-2.01.01/doc/cdrecord.ps
--- cdrtools-2.01.01.orig/doc/cdrecord.ps	2010-01-31 22:55:49.000000000 +0100
+++ cdrtools-2.01.01/doc/cdrecord.ps	2010-02-08 14:24:23.000000000 +0100
@@ -341,7 +341,7 @@
 (lun)4915 2952 w
 10 R f
 (of the)1 281 1 5119 2952 t
-( the)1 161( a \256le /etc/default/cdrecord exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 3072 t
+( the)1 161( a \256le /etc/cdrecord.conf exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 3072 t
 10 B f
 ( =)1 0( v=)1 57( ev)1 50(d de)1 100 4 4687 3072 t
 10 R f
@@ -3329,7 +3329,7 @@
 ( E)1 0( CE)1 67( IC)1 72( VI)1 39( EV)1 72(D DE)1 139 6 5011 2640 t
 10 R f
 (environment.)1440 2760 w
-( the argument to the)4 1007(If a \256le /etc/default/cdrecord exists, and if)6 1977 2 1440 3000 t
+( the argument to the)4 1007(If a \256le /etc/cdrecord.conf exists, and if)6 1977 2 1440 3000 t
 10 B f
 ( =)1 0( v=)1 57( ev)1 50(d de)1 100 4 4501 3000 t
 10 R f
@@ -3346,7 +3346,7 @@
 (@)4333 3120 w
 10 R f
 (' or ':', it is interpreted)5 975 1 4425 3120 t
-(as a device label name that was de\256ned in the \256le /etc/default/cdrecord \(see FILES section\).)14 3779 1 1440 3240 t
+(as a device label name that was de\256ned in the \256le /etc/cdrecord.conf \(see FILES section\).)14 3779 1 1440 3240 t
 10 B f
 ( e)1 0( de)1 44( od)1 56( Mo)1 50( M)1 127( t)1 0( et)1 33( ge)1 44( rg)1 50( ar)1 44( ta)1 50( ot)1 33( to)1 50( ut)1 33(A Au)1 128 15 1240 3480 t
 10 R f
@@ -4755,7 +4755,7 @@
 ( E)1 0( CE)1 67( IC)1 72( VI)1 39( EV)1 72(D DE)1 139 6 1346 2496 t
 10 R f
 ( call of the SCSI transport)5 1126(This may either hold a device identi\256er that is suitable to the open)12 2834 2 1440 2616 t
-(library or a label in the \256le /etc/default/cdrecord.)7 1996 1 1440 2736 t
+(library or a label in the \256le /etc/cdrecord.conf.)7 1996 1 1440 2736 t
 10 B f
 (C CD DR R)3 216 1 1080 2904 t
 10 S f
@@ -4891,7 +4891,7 @@
 10 B f
 ( d)1 0( rd)1 56( or)1 44( re ec co)3 138( dr)1 44( cd)1 56( /c)1 44( t/)1 28( lt)1 33( ul)1 28( au)1 56( fa)1 50( ef)1 33( de)1 44( /d)1 56( c/)1 28( tc)1 44( et)1 33(/ /e)1 72 19 1080 6672 t
 10 R f
-( example:)1 423( For)1 229( /etc/default/cdrecord.)1 907(Default values can be set for the following options in)9 2401 4 1440 6792 t
+( example:)1 423( For)1 229( /etc/cdrecord.conf.)1 907(Default values can be set for the following options in)9 2401 4 1440 6792 t
 9 R f
 (CDR)1440 6912 w
 9 S f
@@ -4931,7 +4931,7 @@
 (\302)976 480 w
 10 R f
 ( \( 1 \))3 164( CDRECORD)1 3277(s USER COMMANDS)2 950 3 1009 480 t
-( identify a)2 455(transport library or a label in the \256le /etc/default/cdrecord that allows to)11 3145 2 1800 960 t
+( identify a)2 455(transport library or a label in the \256le /etc/cdrecord.conf that allows to)11 3145 2 1800 960 t
 (speci\256c drive on the system.)4 1167 1 1800 1080 t
 10 B f
 (C CD DR R)3 216 1 1440 1248 t
diff -urN cdrtools-2.01.01.orig/doc/readcd.man cdrtools-2.01.01/doc/readcd.man
--- cdrtools-2.01.01.orig/doc/readcd.man	2010-01-29 23:52:16.000000000 +0100
+++ cdrtools-2.01.01/doc/readcd.man	2010-02-08 14:26:27.000000000 +0100
@@ -28,7 +28,7 @@
 
      The _\bd_\be_\bv_\bi_\bc_\be parameter to  the  d\bde\bev\bv=\b=  option  explained  below
      refers  to _\bs_\bc_\bs_\bi_\bb_\bu_\bs/_\bt_\ba_\br_\bg_\be_\bt/_\bl_\bu_\bn of the CD/DVD/BluRay-Recorder.
-     If a file /etc/default/cdrecord exists, the parameter to the
+     If a file /etc/cdrecord.conf exists, the parameter to the
      d\bde\bev\bv=\b= option may also be a drive name label in said file (see
      FILES section).
 
@@ -351,11 +351,11 @@
           If no _\bd_\be_\bv option is present, r\bre\bea\bad\bdc\bcd\bd will try to get the
           device from the C\bCD\bDR\bR_\b_D\bDE\bEV\bVI\bIC\bCE\bE environment.
 
-          If a file  /etc/default/cdrecord  exists,  and  if  the
+          If a file  /etc/cdrecord.conf  exists,  and  if  the
           argument  to the d\bde\bev\bv=\b= option or the C\bCD\bDR\bR_\b_D\bDE\bEV\bVI\bIC\bCE\bE environ-
           ment does not contain the characters ',', '/',  '@'  or
           ':',  it is interpreted as a device label name that was
-          defined in the file  /etc/default/cdrecord  (see  FILES
+          defined in the file  /etc/cdrecord.conf  (see  FILES
           section).
 
         A\bAu\but\bto\bot\bta\bar\brg\bge\bet\bt M\bMo\bod\bde\be
diff -urN cdrtools-2.01.01.orig/doc/readcd.ps cdrtools-2.01.01/doc/readcd.ps
--- cdrtools-2.01.01.orig/doc/readcd.ps	2010-01-29 23:57:11.000000000 +0100
+++ cdrtools-2.01.01/doc/readcd.ps	2010-02-08 14:29:09.000000000 +0100
@@ -330,7 +330,7 @@
 (lun)4915 2832 w
 10 R f
 (of the)1 281 1 5119 2832 t
-( the)1 161( a \256le /etc/default/cdrecord exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 2952 t
+( the)1 161( a \256le /etc/cdrecord.conf exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 2952 t
 10 B f
 (dev=)4687 2952 w
 10 R f
@@ -1192,7 +1192,7 @@
 10 R f
 (environ-)5062 3000 w
 (ment.)1440 3120 w
-( the argument to the)4 1007(If a \256le /etc/default/cdrecord exists, and if)6 1977 2 1440 3360 t
+( the argument to the)4 1007(If a \256le /etc/cdrecord.conf exists, and if)6 1977 2 1440 3360 t
 10 B f
 (dev=)4501 3360 w
 10 R f
@@ -1209,7 +1209,7 @@
 (@)4333 3480 w
 10 R f
 (' or ':', it is interpreted)5 975 1 4425 3480 t
-(as a device label name that was de\256ned in the \256le /etc/default/cdrecord \(see FILES section\).)14 3779 1 1440 3600 t
+(as a device label name that was de\256ned in the \256le /etc/cdrecord.conf \(see FILES section\).)14 3779 1 1440 3600 t
 10 B f
 (Autotarget Mode)1 742 1 1240 3840 t
 10 R f
diff -urN cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c
--- cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c	2009-07-10 23:57:18.000000000 +0200
+++ cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c	2010-02-08 14:15:04.000000000 +0100
@@ -49,7 +49,7 @@
 	 * don't contribute work and don't give support, they are causing extra
 	 * work for me and this way slow down the cdrecord development.
 	 */
-	return (defltopen("/etc/default/cdrecord"));
+	return (defltopen("/etc/cdrecord.conf"));
 }
 
 EXPORT void
diff -urN cdrtools-2.01.01.orig/readcd/readcd.1 cdrtools-2.01.01/readcd/readcd.1
--- cdrtools-2.01.01.orig/readcd/readcd.1	2010-01-29 23:27:12.000000000 +0100
+++ cdrtools-2.01.01/readcd/readcd.1	2010-02-08 14:15:04.000000000 +0100
@@ -64,7 +64,7 @@
 explained below refers to
 .IR scsibus / target / lun
 of the CD/DVD/BluRay-Recorder.
-If a file /etc/default/cdrecord exists, the parameter to the
+If a file /etc/cdrecord.conf exists, the parameter to the
 .B dev=
 option may also be a drive name label in said file (see FILES section).
 
@@ -440,7 +440,7 @@
 .B CDR_DEVICE
 environment.
 .sp
-If a file /etc/default/cdrecord exists, and
+If a file /etc/cdrecord.conf exists, and
 if the argument to the
 .B dev=
 option
@@ -449,7 +449,7 @@
 environment
 does not contain the characters ',', '/', '@' or ':',
 it is interpreted as a device label name that was defined in the file
-/etc/default/cdrecord (see FILES section).
+/etc/cdrecord.conf (see FILES section).
 .sp
 .B \h'-2m'Autotarget Mode
 .br
diff -urN cdrtools-2.01.01.orig/README.openserver cdrtools-2.01.01/README.openserver
--- cdrtools-2.01.01.orig/README.openserver	2000-01-25 17:37:48.000000000 +0100
+++ cdrtools-2.01.01/README.openserver	2010-02-08 14:15:04.000000000 +0100
@@ -55,7 +55,7 @@
 ===================================================================
            THE OLD ADDRESSING IS NO LONGER AVAILABLE!
 	    
-         PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
+         PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
 ===================================================================
 
 Running cdrecord with the old address method will result in an error!
diff -urN cdrtools-2.01.01.orig/README.unixware cdrtools-2.01.01/README.unixware
--- cdrtools-2.01.01.orig/README.unixware	2001-03-04 00:41:43.000000000 +0100
+++ cdrtools-2.01.01/README.unixware	2010-02-08 14:15:04.000000000 +0100
@@ -64,7 +64,7 @@
 ===================================================================
            THE OLD ADDRESSING IS NO LONGER AVAILABLE!
 	    
-         PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
+         PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
 ===================================================================
 
 Running cdrecord with the old address method will result in an error!