[Pkg-opt-media-team] [SCM] dvdisaster packaging branch, master, updated. debian/0.72.1-1-24-ge4fb88e

Rogério Brito rbrito at ime.usp.br
Sun Nov 7 00:03:28 UTC 2010 

The following commit has been merged in the master branch:
commit 774cba89323de1524f0ad4336292a391fc148942
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Sat Nov 6 21:01:14 2010 -0200

    debian/patches/*: refresh and adapt every patch

diff --git a/debian/patches/02-encryption.patch b/debian/patches/02-encryption.patch
index 6d2dc3e..79afc35 100644
--- a/debian/patches/02-encryption.patch
+++ b/debian/patches/02-encryption.patch
@@ -3,7 +3,7 @@ Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
 
 --- a/scsi-layer.c
 +++ b/scsi-layer.c
-@@ -2658,11 +2658,12 @@
+@@ -2675,11 +2675,12 @@
         	 return NULL;
        }
     }
diff --git a/debian/patches/03-dvdrom.patch b/debian/patches/03-dvdrom.patch
index f39daa5..7627a22 100644
--- a/debian/patches/03-dvdrom.patch
+++ b/debian/patches/03-dvdrom.patch
@@ -3,7 +3,7 @@ Description: Adds support for DVD-ROM medium-type.
 
 --- a/scsi-layer.c
 +++ b/scsi-layer.c
-@@ -890,6 +890,11 @@
+@@ -911,6 +911,11 @@
  	    break;
  	 }
  
diff --git a/debian/patches/04-manpage.patch b/debian/patches/04-manpage.patch
index 9eed912..5324385 100644
--- a/debian/patches/04-manpage.patch
+++ b/debian/patches/04-manpage.patch
@@ -5,15 +5,6 @@ Description: Fixes typo in manpages.
 
 --- a/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É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 @@
  Obecné příklady použití:
  .TP
@@ -36,7 +27,7 @@ Description: Fixes typo in manpages.
  předpokládá disk DAO; neořezávat konec obrazu.
 --- a/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):
  .TP
  .B \-r, \-\-read
@@ -47,7 +38,7 @@ Description: Fixes typo in manpages.
  .TP
  .B \-c, \-\-create
  Create .ecc information for the medium image.
-@@ -163,7 +163,7 @@
+@@ -192,7 +192,7 @@
  automatically add .iso and .ecc file suffixes.
  .TP
  .B \-\-cache-size n
@@ -56,7 +47,7 @@ Description: Fixes typo in manpages.
  .TP
  .B \-\-dao
  assume DAO disc; do not trim image end.
-@@ -178,12 +178,12 @@
+@@ -215,12 +215,12 @@
  continue reading after potentially fatal error condition.
  .TP
  .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.
  .RE
  .TP
- .B \-\-query-size n
-@@ -196,7 +196,7 @@
+ .B \-\-old-ds-marker
+@@ -245,7 +245,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 
@@ -83,7 +74,7 @@ Description: Fixes typo in manpages.
  the uncorrected sector instead.
 --- a/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):
  .TP
  .B \-r, \-\-read
@@ -94,7 +85,7 @@ Description: Fixes typo in manpages.
  .TP
  .B \-c, \-\-create
  Erzeugt Fehlerkorrektur-Daten f\[:u]r das Abbild.
-@@ -186,12 +186,12 @@
+@@ -225,12 +225,12 @@
  Lesen nach m\[:o]glicherweise schwerwiegenden Fehlern fortsetzen.
  .TP
  .B \-\-internal-rereads n
@@ -110,7 +101,7 @@ Description: Fixes typo in manpages.
  die Standardeinstellungen des Laufwerks zu verwenden.
  .RE
  .TP
-@@ -203,7 +203,7 @@
+@@ -254,7 +254,7 @@
  .RE
  .TP
  .B \-\-raw-mode n
@@ -119,7 +110,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 
-@@ -220,7 +220,7 @@
+@@ -271,7 +271,7 @@
  liest den gesamten Datentr\[:a]ger bis zu n-mal.
  .TP
  .B \-\-read-raw
diff --git a/debian/patches/05-help-dialog.patch b/debian/patches/05-help-dialog.patch
index ddd79d9..92109c9 100644
--- a/debian/patches/05-help-dialog.patch
+++ b/debian/patches/05-help-dialog.patch
@@ -25,14 +25,14 @@ Description: Customizes the help-dialog according to README.MODIFYING.
  
  #ifdef MODIFIED_SOURCE
     AboutTextWithLink(vbox, 
--		     _("Modified version Copyright 2009 (please fill in - [directions])\n"
--		       "Copyright 2004-2009 Carsten Gnoerlich"),
+-		     _("Modified version Copyright 2010 (please fill in - [directions])\n"
+-		       "Copyright 2004-2010 Carsten Gnoerlich"),
 -		     "MODIFYING");
 +		     _("Modified version for [Debian GNU/Linux]\n"
-+		       "Original Copyright 2004-2009 Carsten Gnoerlich"),
++		       "Original Copyright 2004-2010 Carsten Gnoerlich"),
 +		     "http://www.debian.org/");
  #else
-    AboutText(vbox, _("Copyright 2004-2009 Carsten Gnoerlich"));
+    AboutText(vbox, _("Copyright 2004-2010 Carsten Gnoerlich"));
  #endif
 @@ -725,14 +725,14 @@
     AboutTextWithLink(vbox, _("This software comes with  <b>absolutely no warranty</b>.\n"
diff --git a/debian/patches/07-fix-spelling-errors-in-binaries.patch b/debian/patches/07-fix-spelling-errors-in-binaries.patch
index af353bb..160bc47 100644
--- a/debian/patches/07-fix-spelling-errors-in-binaries.patch
+++ b/debian/patches/07-fix-spelling-errors-in-binaries.patch
@@ -3,7 +3,7 @@ Description: Fix spelling errors in binaries
 
 --- a/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"
  
  			 "<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"
  			 "These settings are only effective for the current session and will not be saved."));
  
-       /** Image properties */
-@@ -1911,7 +1911,7 @@
+       /*** Image recognization */
+@@ -1902,7 +1902,7 @@
  			 "<b>0x20</b> This is the <i>recommended</i> mode. "
  			 "The drive tries to apply "
  			 "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 "
  			 "of its internal error correction and returns the "
  			 "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
 +++ b/rs01-fix.c
 @@ -246,7 +246,7 @@

-- 
dvdisaster packaging

More information about the Pkg-opt-media-team mailing list