debian/patches/*: refresh and adapt every patch
This commit is contained in:
2
debian/patches/02-encryption.patch
vendored
2
debian/patches/02-encryption.patch
vendored
@@ -3,7 +3,7 @@ Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
|
|||||||
|
|
||||||
--- a/scsi-layer.c
|
--- a/scsi-layer.c
|
||||||
+++ b/scsi-layer.c
|
+++ b/scsi-layer.c
|
||||||
@@ -2658,11 +2658,12 @@
|
@@ -2675,11 +2675,12 @@
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2
debian/patches/03-dvdrom.patch
vendored
2
debian/patches/03-dvdrom.patch
vendored
@@ -3,7 +3,7 @@ Description: Adds support for DVD-ROM medium-type.
|
|||||||
|
|
||||||
--- a/scsi-layer.c
|
--- a/scsi-layer.c
|
||||||
+++ b/scsi-layer.c
|
+++ b/scsi-layer.c
|
||||||
@@ -890,6 +890,11 @@
|
@@ -911,6 +911,11 @@
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
27
debian/patches/04-manpage.patch
vendored
27
debian/patches/04-manpage.patch
vendored
@@ -5,15 +5,6 @@ Description: Fixes typo in manpages.
|
|||||||
|
|
||||||
--- a/documentation/dvdisaster.cs.1
|
--- a/documentation/dvdisaster.cs.1
|
||||||
+++ b/documentation/dvdisaster.cs.1
|
+++ b/documentation/dvdisaster.cs.1
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
.\"
|
|
||||||
.TH DVDISASTER 1 "2006-01-04" "0.65" "ochrana pro média CD/DVD"
|
|
||||||
|
|
||||||
-.SH NÁZEV
|
|
||||||
+.SH JM<4A>NO
|
|
||||||
DVDISASTER \- ochrana proti ztrátě dat poškrábáním/stárnutím média CD/DVD
|
|
||||||
|
|
||||||
.SH SYNTAXE
|
|
||||||
@@ -49,8 +49,8 @@
|
@@ -49,8 +49,8 @@
|
||||||
Obecné příklady použití:
|
Obecné příklady použití:
|
||||||
.TP
|
.TP
|
||||||
@@ -36,7 +27,7 @@ Description: Fixes typo in manpages.
|
|||||||
předpokládá disk DAO; neořezávat konec obrazu.
|
předpokládá disk DAO; neořezávat konec obrazu.
|
||||||
--- a/documentation/dvdisaster.en.1
|
--- a/documentation/dvdisaster.en.1
|
||||||
+++ b/documentation/dvdisaster.en.1
|
+++ b/documentation/dvdisaster.en.1
|
||||||
@@ -102,8 +102,8 @@
|
@@ -111,8 +111,8 @@
|
||||||
Action selection (at least one action must be specified):
|
Action selection (at least one action must be specified):
|
||||||
.TP
|
.TP
|
||||||
.B \-r, \-\-read
|
.B \-r, \-\-read
|
||||||
@@ -47,7 +38,7 @@ Description: Fixes typo in manpages.
|
|||||||
.TP
|
.TP
|
||||||
.B \-c, \-\-create
|
.B \-c, \-\-create
|
||||||
Create .ecc information for the medium image.
|
Create .ecc information for the medium image.
|
||||||
@@ -163,7 +163,7 @@
|
@@ -192,7 +192,7 @@
|
||||||
automatically add .iso and .ecc file suffixes.
|
automatically add .iso and .ecc file suffixes.
|
||||||
.TP
|
.TP
|
||||||
.B \-\-cache-size n
|
.B \-\-cache-size n
|
||||||
@@ -56,7 +47,7 @@ Description: Fixes typo in manpages.
|
|||||||
.TP
|
.TP
|
||||||
.B \-\-dao
|
.B \-\-dao
|
||||||
assume DAO disc; do not trim image end.
|
assume DAO disc; do not trim image end.
|
||||||
@@ -178,12 +178,12 @@
|
@@ -215,12 +215,12 @@
|
||||||
continue reading after potentially fatal error condition.
|
continue reading after potentially fatal error condition.
|
||||||
.TP
|
.TP
|
||||||
.B \-\-internal-rereads n
|
.B \-\-internal-rereads n
|
||||||
@@ -71,8 +62,8 @@ Description: Fixes typo in manpages.
|
|||||||
+this setting anyways. Use \-1 to leave the drive at its default setting.
|
+this setting anyways. Use \-1 to leave the drive at its default setting.
|
||||||
.RE
|
.RE
|
||||||
.TP
|
.TP
|
||||||
.B \-\-query-size n
|
.B \-\-old-ds-marker
|
||||||
@@ -196,7 +196,7 @@
|
@@ -245,7 +245,7 @@
|
||||||
selects raw reading mode for CD media (default: 20)
|
selects raw reading mode for CD media (default: 20)
|
||||||
.RS
|
.RS
|
||||||
The recommended mode is 20, which makes the drive apply its built-in error
|
The recommended mode is 20, which makes the drive apply its built-in error
|
||||||
@@ -83,7 +74,7 @@ Description: Fixes typo in manpages.
|
|||||||
the uncorrected sector instead.
|
the uncorrected sector instead.
|
||||||
--- a/documentation/dvdisaster.de.1
|
--- a/documentation/dvdisaster.de.1
|
||||||
+++ b/documentation/dvdisaster.de.1
|
+++ b/documentation/dvdisaster.de.1
|
||||||
@@ -110,8 +110,8 @@
|
@@ -119,8 +119,8 @@
|
||||||
Aktions-Auswahl (mindestens eine Aktion muss gew\[:a]hlt werden):
|
Aktions-Auswahl (mindestens eine Aktion muss gew\[:a]hlt werden):
|
||||||
.TP
|
.TP
|
||||||
.B \-r, \-\-read
|
.B \-r, \-\-read
|
||||||
@@ -94,7 +85,7 @@ Description: Fixes typo in manpages.
|
|||||||
.TP
|
.TP
|
||||||
.B \-c, \-\-create
|
.B \-c, \-\-create
|
||||||
Erzeugt Fehlerkorrektur-Daten f\[:u]r das Abbild.
|
Erzeugt Fehlerkorrektur-Daten f\[:u]r das Abbild.
|
||||||
@@ -186,12 +186,12 @@
|
@@ -225,12 +225,12 @@
|
||||||
Lesen nach m\[:o]glicherweise schwerwiegenden Fehlern fortsetzen.
|
Lesen nach m\[:o]glicherweise schwerwiegenden Fehlern fortsetzen.
|
||||||
.TP
|
.TP
|
||||||
.B \-\-internal-rereads n
|
.B \-\-internal-rereads n
|
||||||
@@ -110,7 +101,7 @@ Description: Fixes typo in manpages.
|
|||||||
die Standardeinstellungen des Laufwerks zu verwenden.
|
die Standardeinstellungen des Laufwerks zu verwenden.
|
||||||
.RE
|
.RE
|
||||||
.TP
|
.TP
|
||||||
@@ -203,7 +203,7 @@
|
@@ -254,7 +254,7 @@
|
||||||
.RE
|
.RE
|
||||||
.TP
|
.TP
|
||||||
.B \-\-raw-mode n
|
.B \-\-raw-mode n
|
||||||
@@ -119,7 +110,7 @@ Description: Fixes typo in manpages.
|
|||||||
.RS
|
.RS
|
||||||
Das empfohlene Verfahren ist 20, bei dem das Laufwerk die eingebaute Fehlerkorrektur
|
Das empfohlene Verfahren ist 20, bei dem das Laufwerk die eingebaute Fehlerkorrektur
|
||||||
so weit wie m\[:o]glich anwendet, bevor es einen besch\[:a]digten Sektor
|
so weit wie m\[:o]glich anwendet, bevor es einen besch\[:a]digten Sektor
|
||||||
@@ -220,7 +220,7 @@
|
@@ -271,7 +271,7 @@
|
||||||
liest den gesamten Datentr\[:a]ger bis zu n-mal.
|
liest den gesamten Datentr\[:a]ger bis zu n-mal.
|
||||||
.TP
|
.TP
|
||||||
.B \-\-read-raw
|
.B \-\-read-raw
|
||||||
|
|||||||
8
debian/patches/05-help-dialog.patch
vendored
8
debian/patches/05-help-dialog.patch
vendored
@@ -25,14 +25,14 @@ Description: Customizes the help-dialog according to README.MODIFYING.
|
|||||||
|
|
||||||
#ifdef MODIFIED_SOURCE
|
#ifdef MODIFIED_SOURCE
|
||||||
AboutTextWithLink(vbox,
|
AboutTextWithLink(vbox,
|
||||||
- _("Modified version Copyright 2009 (please fill in - [directions])\n"
|
- _("Modified version Copyright 2010 (please fill in - [directions])\n"
|
||||||
- "Copyright 2004-2009 Carsten Gnoerlich"),
|
- "Copyright 2004-2010 Carsten Gnoerlich"),
|
||||||
- "MODIFYING");
|
- "MODIFYING");
|
||||||
+ _("Modified version for [Debian GNU/Linux]\n"
|
+ _("Modified version for [Debian GNU/Linux]\n"
|
||||||
+ "Original Copyright 2004-2009 Carsten Gnoerlich"),
|
+ "Original Copyright 2004-2010 Carsten Gnoerlich"),
|
||||||
+ "http://www.debian.org/");
|
+ "http://www.debian.org/");
|
||||||
#else
|
#else
|
||||||
AboutText(vbox, _("Copyright 2004-2009 Carsten Gnoerlich"));
|
AboutText(vbox, _("Copyright 2004-2010 Carsten Gnoerlich"));
|
||||||
#endif
|
#endif
|
||||||
@@ -725,14 +725,14 @@
|
@@ -725,14 +725,14 @@
|
||||||
AboutTextWithLink(vbox, _("This software comes with <b>absolutely no warranty</b>.\n"
|
AboutTextWithLink(vbox, _("This software comes with <b>absolutely no warranty</b>.\n"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ Description: Fix spelling errors in binaries
|
|||||||
|
|
||||||
--- a/preferences.c
|
--- a/preferences.c
|
||||||
+++ b/preferences.c
|
+++ b/preferences.c
|
||||||
@@ -1627,7 +1627,7 @@
|
@@ -1532,7 +1532,7 @@
|
||||||
"The values include the borders: 0-100 will read 101 sectors.\n\n"
|
"The values include the borders: 0-100 will read 101 sectors.\n\n"
|
||||||
|
|
||||||
"<b>Note:</b> Limiting the reading range is not recommended for <i>adaptive reading</i> since it might "
|
"<b>Note:</b> Limiting the reading range is not recommended for <i>adaptive reading</i> since it might "
|
||||||
@@ -11,8 +11,8 @@ Description: Fix spelling errors in binaries
|
|||||||
+ "prevent sectors from being read which are required for a successful error correction.\n\n"
|
+ "prevent sectors from being read which are required for a successful error correction.\n\n"
|
||||||
"These settings are only effective for the current session and will not be saved."));
|
"These settings are only effective for the current session and will not be saved."));
|
||||||
|
|
||||||
/** Image properties */
|
/*** Image recognization */
|
||||||
@@ -1911,7 +1911,7 @@
|
@@ -1902,7 +1902,7 @@
|
||||||
"<b>0x20</b> This is the <i>recommended</i> mode. "
|
"<b>0x20</b> This is the <i>recommended</i> mode. "
|
||||||
"The drive tries to apply "
|
"The drive tries to apply "
|
||||||
"the built-in error correction to the best possible extent "
|
"the built-in error correction to the best possible extent "
|
||||||
@@ -21,17 +21,6 @@ Description: Fix spelling errors in binaries
|
|||||||
"<b>0x21</b> In this mode the drive skips the last stage "
|
"<b>0x21</b> In this mode the drive skips the last stage "
|
||||||
"of its internal error correction and returns the "
|
"of its internal error correction and returns the "
|
||||||
"uncorrected sector instead. This may result in sectors "
|
"uncorrected sector instead. This may result in sectors "
|
||||||
--- a/rs01-create.c
|
|
||||||
+++ b/rs01-create.c
|
|
||||||
@@ -216,7 +216,7 @@
|
|
||||||
|
|
||||||
/*** Test the image file and create the CRC sums */
|
|
||||||
|
|
||||||
- /* Explicitly unlinking the ecc file removes superflous segments
|
|
||||||
+ /* Explicitly unlinking the ecc file removes superfluous segments
|
|
||||||
in FAT mode if the ecc file already existed. */
|
|
||||||
|
|
||||||
LargeUnlink(Closure->eccName);
|
|
||||||
--- a/rs01-fix.c
|
--- a/rs01-fix.c
|
||||||
+++ b/rs01-fix.c
|
+++ b/rs01-fix.c
|
||||||
@@ -246,7 +246,7 @@
|
@@ -246,7 +246,7 @@
|
||||||
|
|||||||
Reference in New Issue
Block a user