1 diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.1 cdrtools-2.01.01/cdrecord/cdrecord.1
2 --- cdrtools-2.01.01.orig/cdrecord/cdrecord.1 2010-01-31 22:09:45.000000000 +0100
3 +++ cdrtools-2.01.01/cdrecord/cdrecord.1 2010-02-08 14:15:04.000000000 +0100
5 explained below refers to
6 .IR scsibus / target / lun
7 of the CD/DVD/BluRay-Recorder.
8 -If a file /etc/default/cdrecord exists, the parameter to the
9 +If a file /etc/cdrecord.conf exists, the parameter to the
11 option may also be a drive name label in said file (see FILES section).
13 @@ -1201,13 +1201,13 @@
16 will try to get a drive specific speed value from the file
17 -.B /etc/default/cdrecord
18 +.B /etc/cdrecord.conf
19 and if it cannot find one, it will try to get the speed value from the
21 environment and later from the
24 -.BR /etc/default/cdrecord .
25 +.BR /etc/cdrecord.conf .
26 If no speed value could be found, cdrecord uses a drive specific default speed.
27 The default for all new (MMC compliant) drives is to use the maximum supported by the drive.
33 -If a file /etc/default/cdrecord exists, and
34 +If a file /etc/cdrecord.conf exists, and
35 if the argument to the
40 does not contain the characters ',', '/', '@' or ':',
41 it is interpreted as a device label name that was defined in the file
42 -/etc/default/cdrecord (see FILES section).
43 +/etc/cdrecord.conf (see FILES section).
45 .B \h'-2m'Autotarget Mode
50 This may either hold a device identifier that is suitable to the open
51 -call of the SCSI transport library or a label in the file /etc/default/cdrecord.
52 +call of the SCSI transport library or a label in the file /etc/cdrecord.conf
55 Sets the default speed value for writing (see also
56 @@ -2226,8 +2226,11 @@
60 -.B /etc/default/cdrecord
61 -Default values can be set for the following options in /etc/default/cdrecord.
62 +.B /etc/cdrecord.conf
63 +Default values can be set for the following options in /etc/cdrecord.conf .
64 +Note that this path has been changed from standard location in cdrtools
65 +distribution (/etc/default/cdrecord) to be consistent with other packages
66 +which don't use /etc/default directory in general.
73 This may either hold a device identifier that is suitable to the open
74 -call of the SCSI transport library or a label in the file /etc/default/cdrecord
75 +call of the SCSI transport library or a label in the file /etc/cdrecord.conf
76 that allows to identify a specific drive on the system.
79 diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl cdrtools-2.01.01/cdrecord/cdrecord.dfl
80 --- cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl 2008-12-30 14:29:50.000000000 +0100
81 +++ cdrtools-2.01.01/cdrecord/cdrecord.dfl 2010-02-08 14:15:04.000000000 +0100
83 #ident @(#)cdrecord.dfl 1.7 08/12/30 Copyr 1998 J. Schilling
85 -# This file is /etc/default/cdrecord
86 +# This file is /etc/cdrecord.conf
87 # It contains defaults that are used if no command line option
88 # or environment is present.
91 # Note that newer cdrecord versions do not default
92 # to speed=1. For MMC compliant drives, the default
93 # is to write at maximum speed, so it in general does
94 -# not make sense to set up a default speed in /etc/default/cdrecord
95 +# not make sense to set up a default speed in /etc/cdrecord.conf
99 diff -urN cdrtools-2.01.01.orig/cdrecord/README.ATAPI cdrtools-2.01.01/cdrecord/README.ATAPI
100 --- cdrtools-2.01.01.orig/cdrecord/README.ATAPI 2008-10-12 21:08:13.000000000 +0200
101 +++ cdrtools-2.01.01/cdrecord/README.ATAPI 2010-02-08 14:15:04.000000000 +0100
102 @@ -512,14 +512,14 @@
103 ln -s scd1 cdrw # NOTE: see above, maybe cdrom
104 Check the new SCSI settings:
106 - Setup cdrecord's environment - edit /etc/default/cdrecord:
107 + Setup cdrecord's environment - edit /etc/cdrecord.conf:
111 Input the right values, the fields are described in the manpage
112 of cdrecord. Alternatively, you may use this values as
113 cdrecord-parameter or take a frontend with an own configuration
114 - scheme, then you don't need to modify /etc/default/cdrecord.
115 + scheme, then you don't need to modify /etc/cdrecord.conf
116 9. It's done! Insert a CD and try "cdrecord -v -toc"
117 /*--------------------------------------------------------------------------*/
118 He had constant buffer underrun problems:
119 diff -urN cdrtools-2.01.01.orig/doc/cdrecord.man cdrtools-2.01.01/doc/cdrecord.man
120 --- cdrtools-2.01.01.orig/doc/cdrecord.man 2010-01-31 22:56:01.000000000 +0100
121 +++ cdrtools-2.01.01/doc/cdrecord.man 2010-02-08 14:18:18.000000000 +0100
124 The _
\bd_
\be_
\bv_
\bi_
\bc_
\be parameter to the d
\bde
\bev
\bv=
\b= option explained below
125 refers to _
\bs_
\bc_
\bs_
\bi_
\bb_
\bu_
\bs/_
\bt_
\ba_
\br_
\bg_
\be_
\bt/_
\bl_
\bu_
\bn of the CD/DVD/BluRay-Recorder.
126 - If a file /etc/default/cdrecord exists, the parameter to the
127 + If a file /etc/cdrecord.conf exists, the parameter to the
128 d
\bde
\bev
\bv=
\b= option may also be a drive name label in said file (see
131 @@ -1422,11 +1422,11 @@
132 If no _
\bd_
\be_
\bv option is present, c
\bcd
\bdr
\bre
\bec
\bco
\bor
\brd
\bd will try to get
133 the device from the C
\bCD
\bDR
\bR_
\b_D
\bDE
\bEV
\bVI
\bIC
\bCE
\bE environment.
135 - If a file /etc/default/cdrecord exists, and if the
136 + If a file /etc/cdrecord.conf exists, and if the
137 argument to the d
\bde
\bev
\bv=
\b= option or the C
\bCD
\bDR
\bR_
\b_D
\bDE
\bEV
\bVI
\bIC
\bCE
\bE environ-
138 ment does not contain the characters ',', '/', '@' or
139 ':', it is interpreted as a device label name that was
140 - defined in the file /etc/default/cdrecord (see FILES
141 + defined in the file /etc/cdrecord.conf (see FILES
144 A
\bAu
\but
\bto
\bot
\bta
\bar
\brg
\bge
\bet
\bt M
\bMo
\bod
\bde
\be
145 @@ -2078,7 +2078,7 @@
146 C
\bCD
\bDR
\bR_
\b_D
\bDE
\bEV
\bVI
\bIC
\bCE
\bE
147 This may either hold a device identifier that is suit-
148 able to the open call of the SCSI transport library or
149 - a label in the file /etc/default/cdrecord.
150 + a label in the file /etc/cdrecord.conf.
152 C
\bCD
\bDR
\bR_
\b_S
\bSP
\bPE
\bEE
\bED
\bD
153 Sets the default speed value for writing (see also
154 @@ -2143,14 +2143,14 @@
156 /
\b/e
\bet
\btc
\bc/
\b/d
\bde
\bef
\bfa
\bau
\bul
\blt
\bt/
\b/c
\bcd
\bdr
\bre
\bec
\bco
\bor
\brd
\bd
157 Default values can be set for the following options in
158 - /etc/default/cdrecord. For example: CDR_FIFOSIZE=8m
159 + /etc/cdrecord.conf. For example: CDR_FIFOSIZE=8m
162 C
\bCD
\bDR
\bR_
\b_D
\bDE
\bEV
\bVI
\bIC
\bCE
\bE
163 This may either hold a device identifier that is
164 suitable to the open call of the SCSI transport
165 library or a label in the file
166 - /etc/default/cdrecord that allows to identify a
167 + /etc/cdrecord.conf that allows to identify a
168 specific drive on the system.
170 C
\bCD
\bDR
\bR_
\b_S
\bSP
\bPE
\bEE
\bED
\bD
171 diff -urN cdrtools-2.01.01.orig/doc/cdrecord.ps cdrtools-2.01.01/doc/cdrecord.ps
172 --- cdrtools-2.01.01.orig/doc/cdrecord.ps 2010-01-31 22:55:49.000000000 +0100
173 +++ cdrtools-2.01.01/doc/cdrecord.ps 2010-02-08 14:24:23.000000000 +0100
177 (of the)1 281 1 5119 2952 t
178 -( 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
179 +( 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
181 ( =)1 0( v=)1 57( ev)1 50(d de)1 100 4 4687 3072 t
183 @@ -3329,7 +3329,7 @@
184 ( E)1 0( CE)1 67( IC)1 72( VI)1 39( EV)1 72(D DE)1 139 6 5011 2640 t
186 (environment.)1440 2760 w
187 -( the argument to the)4 1007(If a \256le /etc/default/cdrecord exists, and if)6 1977 2 1440 3000 t
188 +( the argument to the)4 1007(If a \256le /etc/cdrecord.conf exists, and if)6 1977 2 1440 3000 t
190 ( =)1 0( v=)1 57( ev)1 50(d de)1 100 4 4501 3000 t
192 @@ -3346,7 +3346,7 @@
195 (' or ':', it is interpreted)5 975 1 4425 3120 t
196 -(as a device label name that was de\256ned in the \256le /etc/default/cdrecord \(see FILES section\).)14 3779 1 1440 3240 t
197 +(as a device label name that was de\256ned in the \256le /etc/cdrecord.conf \(see FILES section\).)14 3779 1 1440 3240 t
199 ( 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
201 @@ -4755,7 +4755,7 @@
202 ( E)1 0( CE)1 67( IC)1 72( VI)1 39( EV)1 72(D DE)1 139 6 1346 2496 t
204 ( 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
205 -(library or a label in the \256le /etc/default/cdrecord.)7 1996 1 1440 2736 t
206 +(library or a label in the \256le /etc/cdrecord.conf.)7 1996 1 1440 2736 t
208 (C CD DR R)3 216 1 1080 2904 t
210 @@ -4891,7 +4891,7 @@
212 ( 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
214 -( 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
215 +( 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
219 @@ -4931,7 +4931,7 @@
222 ( \( 1 \))3 164( CDRECORD)1 3277(s USER COMMANDS)2 950 3 1009 480 t
223 -( identify a)2 455(transport library or a label in the \256le /etc/default/cdrecord that allows to)11 3145 2 1800 960 t
224 +( identify a)2 455(transport library or a label in the \256le /etc/cdrecord.conf that allows to)11 3145 2 1800 960 t
225 (speci\256c drive on the system.)4 1167 1 1800 1080 t
227 (C CD DR R)3 216 1 1440 1248 t
228 diff -urN cdrtools-2.01.01.orig/doc/readcd.man cdrtools-2.01.01/doc/readcd.man
229 --- cdrtools-2.01.01.orig/doc/readcd.man 2010-01-29 23:52:16.000000000 +0100
230 +++ cdrtools-2.01.01/doc/readcd.man 2010-02-08 14:26:27.000000000 +0100
233 The _
\bd_
\be_
\bv_
\bi_
\bc_
\be parameter to the d
\bde
\bev
\bv=
\b= option explained below
234 refers to _
\bs_
\bc_
\bs_
\bi_
\bb_
\bu_
\bs/_
\bt_
\ba_
\br_
\bg_
\be_
\bt/_
\bl_
\bu_
\bn of the CD/DVD/BluRay-Recorder.
235 - If a file /etc/default/cdrecord exists, the parameter to the
236 + If a file /etc/cdrecord.conf exists, the parameter to the
237 d
\bde
\bev
\bv=
\b= option may also be a drive name label in said file (see
240 @@ -351,11 +351,11 @@
241 If no _
\bd_
\be_
\bv option is present, r
\bre
\bea
\bad
\bdc
\bcd
\bd will try to get the
242 device from the C
\bCD
\bDR
\bR_
\b_D
\bDE
\bEV
\bVI
\bIC
\bCE
\bE environment.
244 - If a file /etc/default/cdrecord exists, and if the
245 + If a file /etc/cdrecord.conf exists, and if the
246 argument to the d
\bde
\bev
\bv=
\b= option or the C
\bCD
\bDR
\bR_
\b_D
\bDE
\bEV
\bVI
\bIC
\bCE
\bE environ-
247 ment does not contain the characters ',', '/', '@' or
248 ':', it is interpreted as a device label name that was
249 - defined in the file /etc/default/cdrecord (see FILES
250 + defined in the file /etc/cdrecord.conf (see FILES
253 A
\bAu
\but
\bto
\bot
\bta
\bar
\brg
\bge
\bet
\bt M
\bMo
\bod
\bde
\be
254 diff -urN cdrtools-2.01.01.orig/doc/readcd.ps cdrtools-2.01.01/doc/readcd.ps
255 --- cdrtools-2.01.01.orig/doc/readcd.ps 2010-01-29 23:57:11.000000000 +0100
256 +++ cdrtools-2.01.01/doc/readcd.ps 2010-02-08 14:29:09.000000000 +0100
260 (of the)1 281 1 5119 2832 t
261 -( 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
262 +( 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
266 @@ -1192,7 +1192,7 @@
268 (environ-)5062 3000 w
270 -( the argument to the)4 1007(If a \256le /etc/default/cdrecord exists, and if)6 1977 2 1440 3360 t
271 +( the argument to the)4 1007(If a \256le /etc/cdrecord.conf exists, and if)6 1977 2 1440 3360 t
275 @@ -1209,7 +1209,7 @@
278 (' or ':', it is interpreted)5 975 1 4425 3480 t
279 -(as a device label name that was de\256ned in the \256le /etc/default/cdrecord \(see FILES section\).)14 3779 1 1440 3600 t
280 +(as a device label name that was de\256ned in the \256le /etc/cdrecord.conf \(see FILES section\).)14 3779 1 1440 3600 t
282 (Autotarget Mode)1 742 1 1240 3840 t
284 diff -urN cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c
285 --- cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c 2009-07-10 23:57:18.000000000 +0200
286 +++ cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c 2010-02-08 14:15:04.000000000 +0100
288 * don't contribute work and don't give support, they are causing extra
289 * work for me and this way slow down the cdrecord development.
291 - return (defltopen("/etc/default/cdrecord"));
292 + return (defltopen("/etc/cdrecord.conf"));
296 diff -urN cdrtools-2.01.01.orig/readcd/readcd.1 cdrtools-2.01.01/readcd/readcd.1
297 --- cdrtools-2.01.01.orig/readcd/readcd.1 2010-01-29 23:27:12.000000000 +0100
298 +++ cdrtools-2.01.01/readcd/readcd.1 2010-02-08 14:15:04.000000000 +0100
300 explained below refers to
301 .IR scsibus / target / lun
302 of the CD/DVD/BluRay-Recorder.
303 -If a file /etc/default/cdrecord exists, the parameter to the
304 +If a file /etc/cdrecord.conf exists, the parameter to the
306 option may also be a drive name label in said file (see FILES section).
312 -If a file /etc/default/cdrecord exists, and
313 +If a file /etc/cdrecord.conf exists, and
314 if the argument to the
319 does not contain the characters ',', '/', '@' or ':',
320 it is interpreted as a device label name that was defined in the file
321 -/etc/default/cdrecord (see FILES section).
322 +/etc/cdrecord.conf (see FILES section).
324 .B \h'-2m'Autotarget Mode
326 diff -urN cdrtools-2.01.01.orig/README.openserver cdrtools-2.01.01/README.openserver
327 --- cdrtools-2.01.01.orig/README.openserver 2000-01-25 17:37:48.000000000 +0100
328 +++ cdrtools-2.01.01/README.openserver 2010-02-08 14:15:04.000000000 +0100
330 ===================================================================
331 THE OLD ADDRESSING IS NO LONGER AVAILABLE!
333 - PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
334 + PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
335 ===================================================================
337 Running cdrecord with the old address method will result in an error!
338 diff -urN cdrtools-2.01.01.orig/README.unixware cdrtools-2.01.01/README.unixware
339 --- cdrtools-2.01.01.orig/README.unixware 2001-03-04 00:41:43.000000000 +0100
340 +++ cdrtools-2.01.01/README.unixware 2010-02-08 14:15:04.000000000 +0100
342 ===================================================================
343 THE OLD ADDRESSING IS NO LONGER AVAILABLE!
345 - PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
346 + PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
347 ===================================================================
349 Running cdrecord with the old address method will result in an error!