diff --git a/debian/patches/02-encryption.patch b/debian/patches/02-encryption.patch index 79afc35..677d248 100644 --- a/debian/patches/02-encryption.patch +++ b/debian/patches/02-encryption.patch @@ -1,9 +1,11 @@ Author: n/a Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption). ---- a/scsi-layer.c -+++ b/scsi-layer.c -@@ -2675,11 +2675,12 @@ +Index: dvdisaster/scsi-layer.c +=================================================================== +--- dvdisaster.orig/scsi-layer.c 2012-03-06 11:10:13.371044799 +0900 ++++ dvdisaster/scsi-layer.c 2012-03-06 11:10:17.147044691 +0900 +@@ -2690,11 +2690,12 @@ return NULL; } } diff --git a/debian/patches/03-dvdrom.patch b/debian/patches/03-dvdrom.patch index 7627a22..ce3f3de 100644 --- a/debian/patches/03-dvdrom.patch +++ b/debian/patches/03-dvdrom.patch @@ -1,9 +1,11 @@ Author: Corey Wright Description: Adds support for DVD-ROM medium-type. ---- a/scsi-layer.c -+++ b/scsi-layer.c -@@ -911,6 +911,11 @@ +Index: dvdisaster/scsi-layer.c +=================================================================== +--- dvdisaster.orig/scsi-layer.c 2012-03-06 11:10:17.147044691 +0900 ++++ dvdisaster/scsi-layer.c 2012-03-06 11:10:30.927044292 +0900 +@@ -913,6 +913,11 @@ break; } diff --git a/debian/patches/04-manpage.patch b/debian/patches/04-manpage.patch index 7022bcb..12ef914 100644 --- a/debian/patches/04-manpage.patch +++ b/debian/patches/04-manpage.patch @@ -3,8 +3,10 @@ Authors: Daniel Baumann Description: Fixes typo in manpages. The patch also deals with hyphens used as minus signs. ---- a/documentation/dvdisaster.cs.1 -+++ b/documentation/dvdisaster.cs.1 +Index: dvdisaster/documentation/dvdisaster.cs.1 +=================================================================== +--- dvdisaster.orig/documentation/dvdisaster.cs.1 2012-03-06 11:06:06.000000000 +0900 ++++ dvdisaster/documentation/dvdisaster.cs.1 2012-03-06 11:12:03.263041664 +0900 @@ -49,8 +49,8 @@ Obecné příklady použití: .TP @@ -25,9 +27,11 @@ Description: Fixes typo in manpages. .TP .B \-\-dao předpokládá disk DAO; neořezávat konec obrazu. ---- a/documentation/dvdisaster.en.1 -+++ b/documentation/dvdisaster.en.1 -@@ -111,8 +111,8 @@ +Index: dvdisaster/documentation/dvdisaster.en.1 +=================================================================== +--- dvdisaster.orig/documentation/dvdisaster.en.1 2012-03-06 11:08:20.000000000 +0900 ++++ dvdisaster/documentation/dvdisaster.en.1 2012-03-06 11:12:03.263041664 +0900 +@@ -104,8 +104,8 @@ Action selection (at least one action must be specified): .TP .B \-r, \-\-read @@ -38,7 +42,7 @@ Description: Fixes typo in manpages. .TP .B \-c, \-\-create Create .ecc information for the medium image. -@@ -192,7 +192,7 @@ +@@ -213,7 +213,7 @@ automatically add .iso and .ecc file suffixes. .TP .B \-\-cache-size n @@ -47,7 +51,7 @@ Description: Fixes typo in manpages. .TP .B \-\-dao assume DAO disc; do not trim image end. -@@ -215,12 +215,12 @@ +@@ -235,12 +235,12 @@ continue reading after potentially fatal error condition. .TP .B \-\-internal-rereads n @@ -62,8 +66,8 @@ Description: Fixes typo in manpages. +this setting anyways. Use \-1 to leave the drive at its default setting. .RE .TP - .B \-\-old-ds-marker -@@ -245,7 +245,7 @@ + .B \-\-query-size n +@@ -253,7 +253,7 @@ selects raw reading mode for CD media (default: 20) .RS The recommended mode is 20, which makes the drive apply its built-in error @@ -72,9 +76,11 @@ Description: Fixes typo in manpages. However some drives can only read defective sectors using mode 21, skipping the last stage of the internal error correction and returning the uncorrected sector instead. ---- a/documentation/dvdisaster.de.1 -+++ b/documentation/dvdisaster.de.1 -@@ -119,8 +119,8 @@ +Index: dvdisaster/documentation/dvdisaster.de.1 +=================================================================== +--- dvdisaster.orig/documentation/dvdisaster.de.1 2012-03-06 11:08:20.000000000 +0900 ++++ dvdisaster/documentation/dvdisaster.de.1 2012-03-06 11:12:03.263041664 +0900 +@@ -112,8 +112,8 @@ Aktions-Auswahl (mindestens eine Aktion muss gew\[:a]hlt werden): .TP .B \-r, \-\-read @@ -85,16 +91,7 @@ Description: Fixes typo in manpages. .TP .B \-c, \-\-create Erzeugt Fehlerkorrektur-Daten f\[:u]r das Abbild. -@@ -132,7 +132,7 @@ - Untersucht den Datentr\[:a]ger auf Lesefehler. - .TP - .B \-t, \-\-test, \-tq, \-test=q --Pr\[:u]ft die Struktur der .iso und .ecc - Dateien. -+Pr\[:u]ft die Struktur der .iso und .ecc \- Dateien. - Bei Angabe der "q"-Option werden nur die Informationen ausgegeben, - die ohne vollständiges Lesen der Dateien ermittelt werden k\[:o]nnen. - .TP -@@ -225,12 +225,12 @@ +@@ -243,12 +243,12 @@ Lesen nach m\[:o]glicherweise schwerwiegenden Fehlern fortsetzen. .TP .B \-\-internal-rereads n @@ -110,7 +107,7 @@ Description: Fixes typo in manpages. die Standardeinstellungen des Laufwerks zu verwenden. .RE .TP -@@ -254,7 +254,7 @@ +@@ -260,7 +260,7 @@ .RE .TP .B \-\-raw-mode n @@ -119,7 +116,7 @@ Description: Fixes typo in manpages. .RS 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 -@@ -271,7 +271,7 @@ +@@ -277,7 +277,7 @@ liest den gesamten Datentr\[:a]ger bis zu n-mal. .TP .B \-\-read-raw @@ -128,8 +125,10 @@ Description: Fixes typo in manpages. .TP .B \-\-speed-warning n warnt bei Geschwindigkeits\[:a]nderung um mehr als n Prozent. ---- a/documentation/dvdisaster.it.1 -+++ b/documentation/dvdisaster.it.1 +Index: dvdisaster/documentation/dvdisaster.it.1 +=================================================================== +--- dvdisaster.orig/documentation/dvdisaster.it.1 2012-03-06 11:06:06.000000000 +0900 ++++ dvdisaster/documentation/dvdisaster.it.1 2012-03-06 11:12:03.267041662 +0900 @@ -43,8 +43,8 @@ Tipici esempi di utilizzo: .TP diff --git a/debian/patches/05-help-dialog.patch b/debian/patches/05-help-dialog.patch index 92109c9..6a662f9 100644 --- a/debian/patches/05-help-dialog.patch +++ b/debian/patches/05-help-dialog.patch @@ -1,8 +1,10 @@ Author: Daniel Baumann Description: Customizes the help-dialog according to README.MODIFYING. ---- a/help-dialogs.c -+++ b/help-dialogs.c +Index: dvdisaster/help-dialogs.c +=================================================================== +--- dvdisaster.orig/help-dialogs.c 2012-03-06 11:08:21.000000000 +0900 ++++ dvdisaster/help-dialogs.c 2012-03-06 11:15:39.039035508 +0900 @@ -402,7 +402,7 @@ ShowTextfile(_("windowtitle|GNU General Public License"), _("GNU General Public License\n" @@ -12,7 +14,7 @@ Description: Customizes the help-dialog according to README.MODIFYING. } /* -@@ -549,7 +549,7 @@ +@@ -566,7 +566,7 @@ { ShowTextfile(_("windowtitle|Modifying dvdisaster"), _("Modifying dvdisaster\n" "Your changes are not ours."), @@ -21,20 +23,20 @@ Description: Customizes the help-dialog according to README.MODIFYING. } static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data) -@@ -706,9 +706,9 @@ +@@ -723,9 +723,9 @@ #ifdef MODIFIED_SOURCE AboutTextWithLink(vbox, -- _("Modified version Copyright 2010 (please fill in - [directions])\n" -- "Copyright 2004-2010 Carsten Gnoerlich"), +- _("Modified version Copyright 2011 (please fill in - [directions])\n" +- "Copyright 2004-2011 Carsten Gnoerlich"), - "MODIFYING"); -+ _("Modified version for [Debian GNU/Linux]\n" -+ "Original Copyright 2004-2010 Carsten Gnoerlich"), -+ "http://www.debian.org/"); ++ _("Modified version for [Debian GNU/Linux]\n" ++ "Original Copyright 2004-2011 Carsten Gnoerlich"), ++ "http://www.debian.org/"); #else - AboutText(vbox, _("Copyright 2004-2010 Carsten Gnoerlich")); + AboutText(vbox, _("Copyright 2004-2011 Carsten Gnoerlich")); #endif -@@ -725,14 +725,14 @@ +@@ -742,14 +742,14 @@ AboutTextWithLink(vbox, _("This software comes with absolutely no warranty.\n" "This is free software and you are welcome to redistribute it\n" "under the conditions of the [GNU General Public License].\n"), diff --git a/debian/patches/07-fix-spelling-errors-in-binaries.patch b/debian/patches/07-fix-spelling-errors-in-binaries.patch index 160bc47..b949a79 100644 --- a/debian/patches/07-fix-spelling-errors-in-binaries.patch +++ b/debian/patches/07-fix-spelling-errors-in-binaries.patch @@ -1,9 +1,11 @@ Author: Rogério Theodoro de Brito Description: Fix spelling errors in binaries ---- a/preferences.c -+++ b/preferences.c -@@ -1532,7 +1532,7 @@ +Index: dvdisaster/preferences.c +=================================================================== +--- dvdisaster.orig/preferences.c 2012-03-06 11:16:16.451034441 +0900 ++++ dvdisaster/preferences.c 2012-03-06 11:18:09.563031210 +0900 +@@ -1627,7 +1627,7 @@ "The values include the borders: 0-100 will read 101 sectors.\n\n" "Note: Limiting the reading range is not recommended for adaptive reading since it might " @@ -11,8 +13,8 @@ Description: Fix spelling errors in binaries + "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.")); - /*** Image recognization */ -@@ -1902,7 +1902,7 @@ + /** Image properties */ +@@ -1911,7 +1911,7 @@ "0x20 This is the recommended mode. " "The drive tries to apply " "the built-in error correction to the best possible extent " @@ -21,8 +23,10 @@ Description: Fix spelling errors in binaries "0x21 In this mode the drive skips the last stage " "of its internal error correction and returns the " "uncorrected sector instead. This may result in sectors " ---- a/rs01-fix.c -+++ b/rs01-fix.c +Index: dvdisaster/rs01-fix.c +=================================================================== +--- dvdisaster.orig/rs01-fix.c 2012-03-06 11:16:16.451034441 +0900 ++++ dvdisaster/rs01-fix.c 2012-03-06 11:18:09.563031210 +0900 @@ -246,7 +246,7 @@ if(Closure->guiMode) { int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL,