Update the changelog

It is in the repository, if we happen to need it.

debian/README.source

@@ -1,4 +0,0 @@
-The source package uses quilt for the modifications of the upstream source. 
-If you want to change something it is best to use the quilt approach as
-documented in 
-        /usr/share/doc/quilt/README.source

debian/changelog

@@ -1,3 +1,26 @@
+dvdisaster (0.72.1-2) unstable; urgency=low
+
+  * [da276c7] Refresh patches to avoid potential problems with the
+    buildds.
+  * [3ee8b47] Initial migration to format "3.0 (quilt)".
+  * [af26379] Wrap some long lines for legibility.
+  * [2372076] Wrap one extra line.
+  * [00e1968] Don't patch the documentation directly.
+  * [fac6933] Add missing misc-depends on dvdisaster
+  * [70a6efd] Rewrap the build-depends line, for diff-friendliness.
+  * [9fe0db4] Fix incorrect place of misc:depends.
+  * [6576482] Remove unneeded patch
+  * [7771474] Remove duplicate section field for dvdisaster
+  * [f51c51a] Add debian/watch file to more closely follow upstream
+  * [2194941] Remove UTF-8 encoding from desktop file
+  * [57e4fab] Update patch to deal with hyphens used as minus signs
+  * [80e291c] Add description for the patch
+  * [cea78c3] Add patch to fix spelling errors in the binaries
+  * [96b581b] Fix for another typo in the manpage
+  * [b8f0e62] Update standards version with no changes needed
+
+ -- Rogério Brito <rbrito@ime.usp.br>  Tue, 24 Aug 2010 12:10:21 -0300
+
 dvdisaster (0.72.1-1) unstable; urgency=low
 
   * New maintainer (Closes: 543876)

debian/control

@@ -5,14 +5,18 @@ Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org
 Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
         Rogério Brito <rbrito@ime.usp.br>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), quilt, gettext, libbz2-dev, libgtk2.0-dev, libpng12-dev, pkg-config
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7),
+	       gettext,
+	       libbz2-dev,
+	       libgtk2.0-dev,
+	       libpng12-dev,
+	       pkg-config
+Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvdisaster.git 
 Vcs-Git: git://git.debian.org/pkg-opt-media/dvdisaster.git
 Homepage: http://dvdisaster.net/
 
 Package: dvdisaster
-Section: otherosfs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, xdg-utils
 Recommends: dvdisaster-doc
@@ -24,6 +28,7 @@ Description: data loss/scratch/aging protection for CD/DVD media
 Package: dvdisaster-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: dvdisaster
 Description: data loss/scratch/aging protection for CD/DVD media (documentation)
  dvdisaster provides a margin of safety against data loss on CD and DVD media

debian/patches/01-docdir.patch

@@ -1,51 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Hardcode documentation subdirectory, autodetection doesn't work.
-
-diff -Naurp dvdisaster.orig/documentation/dvdisaster.cs.1 dvdisaster/documentation/dvdisaster.cs.1
---- dvdisaster.orig/documentation/dvdisaster.cs.1	2009-01-19 20:53:35.000000000 +0000
-+++ dvdisaster/documentation/dvdisaster.cs.1	2009-01-25 12:51:13.000000000 +0000
-@@ -119,7 +119,7 @@ rozdělí soubory na segmenty <= 2 GB.
- .SH VIZ TÉŽ
- .B Dokumentace
- DVDISASTER je dokumentován svým vlastním manuálem, nainstalovaným v
--.IR %docdir%.
-+.IR /usr/share/doc/dvdisaster-doc/html.
- 
- .SH AUTOR
- DVDISASTER napsal Carsten Gnoerlich <carsten@dvdisaster.com>.
-diff -Naurp dvdisaster.orig/documentation/dvdisaster.de.1 dvdisaster/documentation/dvdisaster.de.1
---- dvdisaster.orig/documentation/dvdisaster.de.1	2009-01-19 20:53:35.000000000 +0000
-+++ dvdisaster/documentation/dvdisaster.de.1	2009-01-25 12:51:13.000000000 +0000
-@@ -231,7 +231,7 @@ Abbild in mehrere Dateien <= 2GB aufteil
- .SH SIEHE AUCH
- .B Dokumentation
- DVDISASTER ist in seinem eigenen Handbuch dokumentiert, welches in
--.IR %docdir%
-+.IR /usr/share/doc/dvdisaster-doc/html
- installiert ist.
- 
- .SH AUTHOR
-diff -Naurp dvdisaster.orig/documentation/dvdisaster.en.1 dvdisaster/documentation/dvdisaster.en.1
---- dvdisaster.orig/documentation/dvdisaster.en.1	2009-01-19 20:53:35.000000000 +0000
-+++ dvdisaster/documentation/dvdisaster.en.1	2009-01-25 12:51:13.000000000 +0000
-@@ -220,7 +220,7 @@ split image into files <= 2GB.
- .SH SEE ALSO
- .B Documentation
- DVDISASTER is documented by its own manual, installed in
--.IR %docdir%
-+.IR /usr/share/doc/dvdisaster-doc/html
- 
- .SH AUTHOR
- DVDISASTER was written by Carsten Gnoerlich <carsten@dvdisaster.com>.
-diff -Naurp dvdisaster.orig/documentation/dvdisaster.it.1 dvdisaster/documentation/dvdisaster.it.1
---- dvdisaster.orig/documentation/dvdisaster.it.1	2009-01-19 20:53:35.000000000 +0000
-+++ dvdisaster/documentation/dvdisaster.it.1	2009-01-25 12:51:13.000000000 +0000
-@@ -115,7 +115,7 @@ Suddividere l'immagine in file <= 2GB.
- .SH "VEDERE ANCHE"
- .B Documentation
- DVDISASTER is documented by its own manual, installed in
--.IR %docdir%
-+.IR /usr/share/doc/dvdisaster-doc/html
- 
- .SH AUTORI
- DVDISASTER was written by Carsten Gnoerlich <carsten@dvdisaster.com>.

debian/patches/02-encryption.patch

@@ -1,10 +1,9 @@
 Author: n/a
 Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
 
-diff -Naurp dvdisaster.orig/scsi-layer.c dvdisaster/scsi-layer.c
---- dvdisaster.orig/scsi-layer.c	2008-03-30 09:10:52.000000000 +0000
-+++ dvdisaster/scsi-layer.c	2008-05-03 08:31:12.000000000 +0000
-@@ -2438,11 +2438,12 @@ DeviceHandle* OpenAndQueryDevice(char *d
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -2658,11 +2658,12 @@
         	 return NULL;
        }
     }

debian/patches/03-dvdrom.patch

@@ -1,10 +1,9 @@
 Author: Corey Wright <undefined@pobox.com>
 Description: Adds support for DVD-ROM medium-type.
 
-diff -Naurp dvdisaster.orig/scsi-layer.c dvdisaster/scsi-layer.c
---- dvdisaster.orig/scsi-layer.c	2008-03-30 09:10:52.000000000 +0000
-+++ dvdisaster/scsi-layer.c	2008-05-03 08:32:22.000000000 +0000
-@@ -719,6 +719,11 @@ static int query_dvd(DeviceHandle *dh, i
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -890,6 +890,11 @@
  	    break;
  	 }
  

debian/patches/04-manpage.patch

@@ -1,9 +1,10 @@
-Author: Daniel Baumann <daniel@debian.org>
+Authors: Daniel Baumann <daniel@debian.org>
+	 Rogério Theodoro de Brito <rbrito@ime.usp.br>
 Description: Fixes typo in manpages.
+ The patch also deals with hyphens used as minus signs.
 
-diff -Naurp dvdisaster.orig/documentation/dvdisaster.cs.1 dvdisaster/documentation/dvdisaster.cs.1
---- dvdisaster.orig/documentation/dvdisaster.cs.1	2009-01-19 20:53:35.000000000 +0000
-+++ dvdisaster/documentation/dvdisaster.cs.1	2009-01-25 12:53:36.000000000 +0000
+--- 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"
@@ -13,3 +14,139 @@ diff -Naurp dvdisaster.orig/documentation/dvdisaster.cs.1 dvdisaster/documentati
  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
+ .B \-r, \-\-read
+-Načte obraz média na pevný disk. Použijte -rn-m k načtení určitého rozsahu sektorů,
+-t.j. -r100-200.
++Načte obraz média na pevný disk. Použijte \-rn-m k načtení určitého rozsahu sektorů,
++t.j. \-r100-200.
+ .TP
+ .B \-c, \-\-create
+ Vytvoří informaci .ecc pro obraz média.
+@@ -98,7 +98,7 @@
+ automaticky přidá souborové přípony .img a .ecc.
+ .TP
+ .B \-\-cache-size n
+-velikost varovnávací paměti v MB v průběhu akce -c (výchozí: 32 MB).
++velikost varovnávací paměti v MB v průběhu akce \-c (výchozí: 32 MB).
+ .TP
+ .B \-\-dao
+ předpokládá disk DAO; neořezávat konec obrazu.
+--- a/documentation/dvdisaster.en.1
++++ b/documentation/dvdisaster.en.1
+@@ -102,8 +102,8 @@
+ Action selection (at least one action must be specified):
+ .TP
+ .B \-r, \-\-read
+-Read the medium image to hard disc. Use -rn-m to read a certain sector range,
+-e.g. -r100-200.
++Read the medium image to hard disc. Use \-rn-m to read a certain sector range,
++e.g. \-r100-200.
+ .TP
+ .B \-c, \-\-create
+ Create .ecc information for the medium image.
+@@ -163,7 +163,7 @@
+ automatically add .iso and .ecc file suffixes.
+ .TP
+ .B \-\-cache-size n
+-image cache size in MB during -c mode (default: 32MB).
++image cache size in MB during \-c mode (default: 32MB).
+ .TP
+ .B \-\-dao
+ assume DAO disc; do not trim image end.
+@@ -178,12 +178,12 @@
+ continue reading after potentially fatal error condition.
+ .TP
+ .B \-\-internal-rereads n
+-internal read attempts for defective CD media sectors (default: -1)
++internal read attempts for defective CD media sectors (default: \-1)
+ .RS
+ The drive firmware usually retries unreadable sectors a few times before
+ giving up and returning a read error. It is more efficient to set this to 0 or 1
+-and manage read attempts through the --read-attempts parameter. Most drives ignore
+-this setting anyways. Use -1 to leave the drive at its default setting.
++and manage read attempts through the \-\-read-attempts parameter. Most drives ignore
++this setting anyways. Use \-1 to leave the drive at its default setting.
+ .RE
+ .TP
+ .B \-\-query-size n
+@@ -196,7 +196,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 
+-correction to the best possible extent before transfering a defective sector.
++correction to the best possible extent before transferring a defective sector.
+ 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
+@@ -110,8 +110,8 @@
+ Aktions-Auswahl (mindestens eine Aktion muss gew\[:a]hlt werden):
+ .TP
+ .B \-r, \-\-read
+-Datentr\[:a]ger-Abbild auf Festplatte einlesen. -rn-m liest einen Bereich von
+-Sektoren, z.B. -r100-200.
++Datentr\[:a]ger-Abbild auf Festplatte einlesen. \-rn-m liest einen Bereich von
++Sektoren, z.B. \-r100-200.
+ .TP
+ .B \-c, \-\-create
+ Erzeugt Fehlerkorrektur-Daten f\[:u]r das Abbild.
+@@ -186,12 +186,12 @@
+ Lesen nach m\[:o]glicherweise schwerwiegenden Fehlern fortsetzen.
+ .TP
+ .B \-\-internal-rereads n
+-Leseversuche innerhalb des Laufwerks f\[:u]r besch\[:a]digte CD-Sektoren (Standard: -1)
++Leseversuche innerhalb des Laufwerks f\[:u]r besch\[:a]digte CD-Sektoren (Standard: \-1)
+ .RS
+ Laufwerke unternehmen normalerweise mehrere Versuche um einen besch\[:a]digten Sektor 
+ zu lesen. Es ist typischerweise g\[:u]nstiger diesen Wert auf 0 oder 1 zu setzen
+-und die Anzahl der Leseversuche \[:u]ber den Parameter --read-attempts zu steuern.
+-Viele Laufwerke ignorieren diese Einstellung ohnehin. Benutzen Sie den Wert -1 um 
++und die Anzahl der Leseversuche \[:u]ber den Parameter \-\-read-attempts zu steuern.
++Viele Laufwerke ignorieren diese Einstellung ohnehin. Benutzen Sie den Wert \-1 um
+ die Standardeinstellungen des Laufwerks zu verwenden.
+ .RE
+ .TP
+@@ -203,7 +203,7 @@
+ .RE
+ .TP
+ .B \-\-raw-mode n
+-"Raw"-Lese-Verfahren f\[:u]r besch\[:a]digte CD-Sektoren (default: 20)
++"Raw"\-Lese-Verfahren f\[:u]r besch\[:a]digte CD-Sektoren (default: 20)
+ .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 @@
+ liest den gesamten Datentr\[:a]ger bis zu n-mal.
+ .TP
+ .B \-\-read-raw
+-liest in der "raw"-Betriebsart sofern m\[:o]glich.
++liest in der "raw"\-Betriebsart sofern m\[:o]glich.
+ .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
+@@ -43,8 +43,8 @@
+ Tipici esempi di utilizzo:
+ .TP
+ .B \-r, \-\-read
+-Estrae l'immagine del supporto sull'hard disc. Usare -rn-m per leggere un
+-determinato intervallo di settori, ad es. -r100-200.
++Estrae l'immagine del supporto sull'hard disc. Usare \-rn-m per leggere un
++determinato intervallo di settori, ad es. \-r100-200.
+ .TP
+ .B \-c, \-\-create
+ Crea l'informazione .ecc per l'immagine del supporto.
+@@ -92,7 +92,7 @@
+ aggiungi automaticamente i suffissi .img e .ecc.
+ .TP
+ .B \-\-cache-size n
+-Dimensione della cache in MB con la modalit\[`a] -c (Standard: 32MB).
++Dimensione della cache in MB con la modalit\[`a] \-c (Standard: 32MB).
+ .TP
+ .B \-\-dao
+ Utilizza la modalit\[`a] DAO; Il disco non sar\[`a] finalizzato.

debian/patches/05-help-dialog.patch

@@ -1,10 +1,9 @@
 Author: Daniel Baumann <daniel@debian.org>
 Description: Customizes the help-dialog according to README.MODIFYING.
 
-diff -Naurp dvdisaster.orig/help-dialogs.c dvdisaster/help-dialogs.c
---- dvdisaster.orig/help-dialogs.c	2009-01-19 20:53:35.000000000 +0000
-+++ dvdisaster/help-dialogs.c	2009-01-25 12:49:22.000000000 +0000
-@@ -385,7 +385,7 @@ void ShowGPL()
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -402,7 +402,7 @@
    ShowTextfile(_("windowtitle|GNU General Public License"), 
  	       _("<big>GNU General Public License</big>\n"
  		 "<i>The license terms of dvdisaster.</i>"),
@@ -13,7 +12,7 @@ diff -Naurp dvdisaster.orig/help-dialogs.c dvdisaster/help-dialogs.c
  }
  
  /*
-@@ -541,7 +541,7 @@ static void show_modifying(void)
+@@ -549,7 +549,7 @@
  {  ShowTextfile(_("windowtitle|Modifying dvdisaster"), 
  	       _("<big>Modifying dvdisaster</big>\n"
  		 "<i>Your changes are not ours.</i>"),
@@ -22,7 +21,7 @@ diff -Naurp dvdisaster.orig/help-dialogs.c dvdisaster/help-dialogs.c
  }
  
  static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
-@@ -698,9 +698,9 @@ void AboutDialog()
+@@ -706,9 +706,9 @@
  
  #ifdef MODIFIED_SOURCE
     AboutTextWithLink(vbox, 
@@ -35,7 +34,7 @@ diff -Naurp dvdisaster.orig/help-dialogs.c dvdisaster/help-dialogs.c
  #else
     AboutText(vbox, _("Copyright 2004-2009 Carsten Gnoerlich"));
  #endif
-@@ -717,14 +717,14 @@ void AboutDialog()
+@@ -725,14 +725,14 @@
     AboutTextWithLink(vbox, _("This software comes with  <b>absolutely no warranty</b>.\n"
  				"This is free software and you are welcome to redistribute it\n"
  				"under the conditions of the [GNU General Public License].\n"), 

debian/patches/06-remove-encoding-from-desktop-file.patch

@@ -0,0 +1,10 @@
+Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
+Description: Remove unneeded Encoding-key from desktop file
+
+--- a/contrib/dvdisaster.desktop
++++ b/contrib/dvdisaster.desktop
+@@ -10,4 +10,3 @@
+ Terminal=false
+ Type=Application
+ Categories=Application;System;
+-Encoding=UTF-8

debian/patches/07-fix-spelling-errors-in-binaries.patch

@@ -0,0 +1,45 @@
+Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
+Description: Fix spelling errors in binaries
+
+--- a/preferences.c
++++ b/preferences.c
+@@ -1627,7 +1627,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 "
+-			 "prevent sectors from being read which are required for a succesful 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."));
+ 
+       /** Image properties */
+@@ -1911,7 +1911,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 "
+-			 "before transfering a defective sector.\n\n"
++			 "before transferring a defective sector.\n\n"
+ 			 "<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 @@
+       if(Closure->guiMode)
+       {  int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL,
+ 				  _("The image file is %d bytes longer than noted\n"
+-				    "in the ecc file. Shall the superflous bytes\n"
++				    "in the ecc file. Shall the superfluous bytes\n"
+ 				    "be removed from the image file?\n"),
+ 				    difference);
+ 

debian/patches/series

@@ -1,5 +1,6 @@
-01-docdir.patch
 02-encryption.patch
 03-dvdrom.patch
 04-manpage.patch
 05-help-dialog.patch
+06-remove-encoding-from-desktop-file.patch
+07-fix-spelling-errors-in-binaries.patch

debian/rules

@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -14,10 +12,16 @@ clean: unpatch
 	dh_clean
 
 configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
 	dh_testdir
 
-	./configure --prefix=/usr --bindir=\$${prefix}/bin --docdir=\$${prefix}share/doc --docsubdir=dvdisaster-doc/html --localedir=\$${prefix}/share/locale --mandir=\$${prefix}/share/man
+	./configure \
+		--prefix=/usr \
+		--bindir=\$${prefix}/bin \
+		--docdir=\$${prefix}share/doc \
+		--docsubdir=dvdisaster-doc/html \
+		--localedir=\$${prefix}/share/locale \
+		--mandir=\$${prefix}/share/man
 
 	touch configure-stamp
 
@@ -34,7 +38,9 @@ install: build
 	dh_testroot
 	dh_prep
 
-	$(MAKE) BINDIR=$(CURDIR)/debian/tmp/usr/bin DOCDIR=$(CURDIR)/debian/tmp/usr/share/doc DOCSUBDIR=$(CURDIR)/debian/tmp/usr/share/doc/dvdisaster-doc/html LOCALEDIR=$(CURDIR)/debian/tmp/usr/share/locale MANDIR=$(CURDIR)/debian/tmp/usr/share/man install
+	$(MAKE) \
+		BUILDROOT=$(CURDIR)/debian/tmp \
+		install
 
 	# Installing desktop file
 	install -D -m 0644 contrib/dvdisaster.desktop debian/dvdisaster/usr/share/applications/dvdisaster.desktop

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/watch

@@ -0,0 +1,2 @@
+version=3
+http://dvdisaster.net/downloads/dvdisaster-(.*)\.tar\.bz2