xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refresh patches.

Browse Source 
debian/paches/04-manpage.patch: Removed (upstream merged).
This commit is contained in:
TANIGUCHI Takaki
2012-04-08 21:55:52 +09:00
parent 02429d92bc
commit ec90405195
8 changed files with 21 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@@ -1,3 +1,9 @@
dvdisaster (0.72.4-1) UNRELEASED; urgency=low
* New upstream; debian/patches/glib-single-include.patch: Fix glib include. (Closes: #665522)
-- TANIGUCHI Takaki <takaki@asis.media-as.org> Sun, 08 Apr 2012 21:49:37 +0900
dvdisaster (0.72.3-2) unstable; urgency=low
* debian/patches/libpng15: Build with libpng15. (Closes: #649555)

6
debian/patches/02-encryption.patch vendored
View File

@@ -3,9 +3,9 @@ Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
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 @@
--- dvdisaster.orig/scsi-layer.c 2012-04-08 21:51:10.995588783 +0900
+++ dvdisaster/scsi-layer.c 2012-04-08 21:51:29.259678075 +0900
@@ -2693,11 +2693,12 @@
return NULL;
}
}

151
debian/patches/04-manpage.patch vendored
View File

@@ -1,151 +0,0 @@
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.
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
.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.
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
-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.
@@ -213,7 +213,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.
@@ -235,12 +235,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
@@ -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
-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.
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
-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.
@@ -243,12 +243,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
@@ -260,7 +260,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
@@ -277,7 +277,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.
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
.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.

17
debian/patches/05-help-dialog.patch vendored
View File

@@ -3,8 +3,8 @@ Description: Customizes the help-dialog according to README.MODIFYING.
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
--- dvdisaster.orig/help-dialogs.c 2012-04-08 21:41:14.000000000 +0900
+++ dvdisaster/help-dialogs.c 2012-04-08 21:53:29.300264928 +0900
@@ -402,7 +402,7 @@
ShowTextfile(_("windowtitle|GNU General Public License"),
_("<big>GNU General Public License</big>\n"
@@ -23,19 +23,6 @@ Index: dvdisaster/help-dialogs.c
}
static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -723,9 +723,9 @@
#ifdef MODIFIED_SOURCE
AboutTextWithLink(vbox,
- _("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-2011 Carsten Gnoerlich"),
+ "http://www.debian.org/");
#else
AboutText(vbox, _("Copyright 2004-2011 Carsten Gnoerlich"));
#endif
@@ -742,14 +742,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"

8
debian/patches/07-fix-spelling-errors-in-binaries.patch vendored
View File

@@ -3,8 +3,8 @@ Description: Fix spelling errors in binaries
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
--- dvdisaster.orig/preferences.c 2012-04-08 21:55:06.732741250 +0900
+++ dvdisaster/preferences.c 2012-04-08 21:55:13.004771913 +0900
@@ -1627,7 +1627,7 @@
"The values include the borders: 0-100 will read 101 sectors.\n\n"
@@ -25,8 +25,8 @@ Index: dvdisaster/preferences.c
"uncorrected sector instead. This may result in sectors "
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
--- dvdisaster.orig/rs01-fix.c 2012-04-08 21:55:06.732741250 +0900
+++ dvdisaster/rs01-fix.c 2012-04-08 21:55:13.004771913 +0900
@@ -246,7 +246,7 @@
if(Closure->guiMode)
{ int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL,

24
debian/patches/glib-single-include.patch vendored
View File

@@ -1,24 +0,0 @@
Index: dvdisaster/dvdisaster.h
===================================================================
--- dvdisaster.orig/dvdisaster.h 2012-03-06 21:38:26.679568254 +0900
+++ dvdisaster/dvdisaster.h 2012-03-25 23:24:25.297416599 +0900
@@ -41,7 +41,6 @@
#include <gtk/gtk.h>
#include <glib/gprintf.h>
-#include <glib/gstrfuncs.h>
#include <ctype.h>
#include <errno.h>
Index: dvdisaster/memtrack.c
===================================================================
--- dvdisaster.orig/memtrack.c 2012-03-06 21:38:26.687568293 +0900
+++ dvdisaster/memtrack.c 2012-03-25 23:24:25.405417128 +0900
@@ -30,7 +30,6 @@
#include <glib.h>
#include <glib/gprintf.h>
-#include <glib/gstrfuncs.h>
/*
* We're not pulling in dvdisaster.h on purpose...

10
debian/patches/libpng15 vendored
View File

@@ -23,11 +23,13 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- dvdisaster-0.72.3.orig/tools/pngio.h
+++ dvdisaster-0.72.3/tools/pngio.h
@@ -21,6 +21,10 @@
#define PNGIO_H
Index: dvdisaster/tools/pngio.h
===================================================================
--- dvdisaster.orig/tools/pngio.h 2012-04-08 21:51:11.671592091 +0900
+++ dvdisaster/tools/pngio.h 2012-04-08 21:51:13.799602501 +0900
@@ -22,6 +22,10 @@
#include <zlib.h>
#include <png.h>
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+ #include <zlib.h>

2
debian/patches/series vendored
View File

@@ -1,8 +1,6 @@
glib-single-include.patch
libpng15
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