[Pkg-opt-media-team] [SCM] dvdisaster packaging branch, master, updated. debian/0.79.2-1-5-gf18c101
Rogério Brito
rbrito at ime.usp.br
Mon Dec 13 20:23:57 UTC 2010
The following commit has been merged in the master branch:
commit 7d95600ddb0b313341e20c741abdcec13d5831c5
Author: Rogério Brito <rbrito at ime.usp.br>
Date: Mon Dec 13 14:37:08 2010 -0200
Remove patches that were applied upstream
diff --git a/debian/patches/04-manpage.patch b/debian/patches/04-manpage.patch
deleted file mode 100644
index 7022bcb..0000000
--- a/debian/patches/04-manpage.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Authors: Daniel Baumann <daniel at debian.org>
- Rogério Theodoro de Brito <rbrito at ime.usp.br>
-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
-@@ -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
-@@ -111,8 +111,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.
-@@ -192,7 +192,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.
-@@ -215,12 +215,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 \-\-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
--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
-@@ -119,8 +119,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.
-@@ -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 @@
- 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
-@@ -254,7 +254,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
-@@ -271,7 +271,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.
diff --git a/debian/patches/06-remove-encoding-from-desktop-file.patch b/debian/patches/06-remove-encoding-from-desktop-file.patch
deleted file mode 100644
index cb4a820..0000000
--- a/debian/patches/06-remove-encoding-from-desktop-file.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Author: Rogério Theodoro de Brito <rbrito at 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
diff --git a/debian/patches/07-fix-spelling-errors-in-binaries.patch b/debian/patches/07-fix-spelling-errors-in-binaries.patch
deleted file mode 100644
index 160bc47..0000000
--- a/debian/patches/07-fix-spelling-errors-in-binaries.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Rogério Theodoro de Brito <rbrito at ime.usp.br>
-Description: Fix spelling errors in binaries
-
---- a/preferences.c
-+++ b/preferences.c
-@@ -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 "
-- "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 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 "
-- "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-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);
-
diff --git a/debian/patches/series b/debian/patches/series
index 24dc9e4..d115250 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
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
--
dvdisaster packaging
More information about the Pkg-opt-media-team
mailing list