Zwischencommit fuer LFS.
[people/pmueller/ipfire-2.x.git] / src / patches / cdrtools-2.01-ascii-2.patch
1 Submitted By: Alexander E. Patrakov
2 Date: 2006-06-05
3 Initial Package Version: 2.01
4 Upstream Status: Knows about a similar RedHat patch, ignores the issue
5 Origin: Alexander E. Patrakov; RedHat does something very similar
6 Modified by Andy Benton to fix an issue with it not applying properly
7 Description: Replaces hard-coded ISO-8859-1 with ASCII approximations
8 To regenerate:
9
10 for F in cdrecord/cdrecord.c cdrecord/diskid.c cdrecord/sector.c \
11 readcd/readcd.c scgcheck/scgcheck.c scgskeleton/skel.c ; do
12 LC_ALL=de_DE iconv -f ISO-8859-1 -t US-ASCII//TRANSLIT $F >tmp
13 mv tmp $F
14 done
15
16 and remove hunks that modify comments.
17
18 RedHat converts to UTF-8 instead, but this is unacceptable for LFS because
19 not everyone uses UTF-8 based locales.
20
21 $Id: cdrtools-2.01-ascii-2.patch 1553 2006-06-05 12:05:57Z randy $
22
23
24 diff -urN cdrtools-2.01.orig/cdrecord/cdrecord.c cdrtools-2.01/cdrecord/cdrecord.c
25 --- cdrtools-2.01.orig/cdrecord/cdrecord.c 2004-09-08 23:26:35.000000000 +0600
26 +++ cdrtools-2.01/cdrecord/cdrecord.c 2006-02-13 10:17:29.000000000 +0500
27 @@ -297,7 +297,7 @@
28 *
29 * Warning: you are not allowed to modify or to remove the
30 * Copyright and version printing code below!
31 - * See also GPL § 2 subclause c)
32 + * See also GPL paragraph 2 subclause c)
33 *
34 * If you modify cdrecord you need to include additional version
35 * printing code that:
36 @@ -349,7 +349,7 @@
37 # define CLONE_TITLE ""
38 #endif
39 if ((flags & F_MSINFO) == 0 || lverbose || flags & F_VERSION) {
40 - printf("Cdrecord%s%s %s (%s-%s-%s) Copyright (C) 1995-2004 Jörg Schilling\n",
41 + printf("Cdrecord%s%s %s (%s-%s-%s) Copyright (C) 1995-2004 Joerg Schilling\n",
42 PRODVD_TITLE,
43 CLONE_TITLE,
44 cdr_version,
45 @@ -1651,7 +1651,7 @@
46 error("\t-xamix Subsequent tracks are CD-ROM XA mode 2 form 1/2 - 2332 bytes\n");
47 error("\t-cdi Subsequent tracks are CDI tracks\n");
48 error("\t-isosize Use iso9660 file system size for next data track\n");
49 - error("\t-preemp Audio tracks are mastered with 50/15 µs preemphasis\n");
50 + error("\t-preemp Audio tracks are mastered with 50/15 us preemphasis\n");
51 error("\t-nopreemp Audio tracks are mastered with no preemphasis (default)\n");
52 error("\t-copy Audio tracks have unlimited copy permission\n");
53 error("\t-nocopy Audio tracks may only be copied once for personal use (default)\n");
54 diff -urN cdrtools-2.01.orig/cdrecord/diskid.c cdrtools-2.01/cdrecord/diskid.c
55 --- cdrtools-2.01.orig/cdrecord/diskid.c 2004-03-02 06:14:38.000000000 +0500
56 +++ cdrtools-2.01/cdrecord/diskid.c 2006-02-13 10:17:35.000000000 +0500
57 @@ -112,8 +112,8 @@
58 LOCAL char m_grandadv[] = "Grand Advance Technology Ltd.";
59 LOCAL char m_digitalstor[] = "DIGITAL STORAGE TECHNOLOGY CO.,LTD";
60 LOCAL char m_matsushita[] = "Matsushita Electric Industrial Co.,Ltd.";
61 -LOCAL char m_albrechts[] = "CDA Datenträger Albrechts GmbH.";
62 -LOCAL char m_xalbrechts[] = "??? CDA Datenträger Albrechts GmbH.";
63 +LOCAL char m_albrechts[] = "CDA Datentraeger Albrechts GmbH.";
64 +LOCAL char m_xalbrechts[] = "??? CDA Datentraeger Albrechts GmbH.";
65
66 LOCAL char m_prodisc[] = "Prodisc Technology Inc.";
67 LOCAL char m_postech[] = "POSTECH Corporation";
68 @@ -150,7 +150,7 @@
69 {{97, 27, 00}, 81, "ILLEGAL OLD CODE: Old Ritek Co.???" },
70 {{97, 27, 25}, 0, m_ill },
71 {{97, 30, 00}, 0, m_ill },
72 - {{97, 33, 00}, 82, "ILLEGAL OLD CODE: Old CDA Datenträger Albrechts GmbH." },
73 + {{97, 33, 00}, 82, "ILLEGAL OLD CODE: Old CDA Datentraeger Albrechts GmbH." },
74 {{97, 35, 44}, 0, m_ill },
75 {{97, 39, 00}, 0, m_ill },
76 {{97, 45, 36}, 83, "ILLEGAL OLD CODE: Old Kodak Photo CD" },
77
78 diff -urN cdrtools-2.01.orig/cdrecord/sector.c cdrtools-2.01/cdrecord/sector.c
79 --- cdrtools-2.01.orig/cdrecord/sector.c 2004-03-01 14:19:13.000000000 +0500
80 +++ cdrtools-2.01/cdrecord/sector.c 2006-02-13 10:17:36.000000000 +0500
81 @@ -125,7 +125,7 @@
82 break;
83 }
84 if (be_verbose) {
85 - printf("Encoding speed : %dx (%d sectors/s) for libedc from Heiko Eißfeldt\n",
86 + printf("Encoding speed : %dx (%d sectors/s) for libedc from Heiko Eissfeldt\n",
87 (i+74)/75, i);
88 }
89 return ((i+74)/75);
90 diff -urN cdrtools-2.01.orig/readcd/readcd.c cdrtools-2.01/readcd/readcd.c
91 --- cdrtools-2.01.orig/readcd/readcd.c 2004-09-08 23:24:14.000000000 +0600
92 +++ cdrtools-2.01/readcd/readcd.c 2006-02-13 10:17:37.000000000 +0500
93 @@ -296,7 +296,7 @@
94 if (help)
95 usage(0);
96 if (pversion) {
97 - printf("readcd %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Jörg Schilling\n",
98 + printf("readcd %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Joerg Schilling\n",
99 cdr_version,
100 HOST_CPU, HOST_VENDOR, HOST_OS);
101 exit(0);
102 diff -urN cdrtools-2.01.orig/scgcheck/scgcheck.c cdrtools-2.01/scgcheck/scgcheck.c
103 --- cdrtools-2.01.orig/scgcheck/scgcheck.c 2004-09-08 23:49:48.000000000 +0600
104 +++ cdrtools-2.01/scgcheck/scgcheck.c 2006-02-13 10:17:38.000000000 +0500
105 @@ -129,7 +129,7 @@
106 if (help)
107 usage(0);
108 if (pversion) {
109 - printf("scgckeck %s (%s-%s-%s) Copyright (C) 1998-2002 Jörg Schilling\n",
110 + printf("scgckeck %s (%s-%s-%s) Copyright (C) 1998-2002 Joerg Schilling\n",
111 scgc_version,
112 HOST_CPU, HOST_VENDOR, HOST_OS);
113 exit(0);
114 @@ -153,11 +153,11 @@
115 comerr("Cannot open logfile.\n");
116
117 printf("Scgcheck %s (%s-%s-%s) SCSI user level transport library ABI checker.\n\
118 -Copyright (C) 1998,2001 Jörg Schilling\n",
119 +Copyright (C) 1998,2001 Joerg Schilling\n",
120 scgc_version,
121 HOST_CPU, HOST_VENDOR, HOST_OS);
122 fprintf(logfile, "Scgcheck %s (%s-%s-%s) SCSI user level transport library ABI checker.\n\
123 -Copyright (C) 1998,2001 Jörg Schilling\n",
124 +Copyright (C) 1998,2001 Joerg Schilling\n",
125 scgc_version,
126 HOST_CPU, HOST_VENDOR, HOST_OS);
127 /*
128 diff -urN cdrtools-2.01.orig/scgskeleton/skel.c cdrtools-2.01/scgskeleton/skel.c
129 --- cdrtools-2.01.orig/scgskeleton/skel.c 2004-07-11 04:57:27.000000000 +0600
130 +++ cdrtools-2.01/scgskeleton/skel.c 2006-02-13 10:17:39.000000000 +0500
131 @@ -155,7 +155,7 @@
132 if (help)
133 usage(0);
134 if (pversion) {
135 - printf("scgskeleton %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Jörg Schilling\n",
136 + printf("scgskeleton %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Joerg Schilling\n",
137 skel_version,
138 HOST_CPU, HOST_VENDOR, HOST_OS);
139 exit(0);