From da276c7fc4718e7a4cf84e5da83bb2571a305097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= Date: Mon, 7 Dec 2009 16:22:30 -0200 Subject: [PATCH] Refresh patches to avoid potential problems with the buildds. --- debian/patches/01-docdir.patch | 28 ++++++++++++---------------- debian/patches/02-encryption.patch | 7 +++---- debian/patches/03-dvdrom.patch | 7 +++---- debian/patches/04-manpage.patch | 5 ++--- debian/patches/05-help-dialog.patch | 13 ++++++------- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/debian/patches/01-docdir.patch b/debian/patches/01-docdir.patch index 6a7e309..d46e08d 100644 --- a/debian/patches/01-docdir.patch +++ b/debian/patches/01-docdir.patch @@ -1,10 +1,9 @@ Author: Daniel Baumann 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. +--- a/documentation/dvdisaster.cs.1 ++++ b/documentation/dvdisaster.cs.1 +@@ -119,7 +119,7 @@ .SH VIZ TÉŽ .B Dokumentace DVDISASTER je dokumentován svým vlastním manuálem, nainstalovaným v @@ -13,10 +12,9 @@ diff -Naurp dvdisaster.orig/documentation/dvdisaster.cs.1 dvdisaster/documentati .SH AUTOR DVDISASTER napsal Carsten Gnoerlich . -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 +--- a/documentation/dvdisaster.de.1 ++++ b/documentation/dvdisaster.de.1 +@@ -235,7 +235,7 @@ .SH SIEHE AUCH .B Dokumentation DVDISASTER ist in seinem eigenen Handbuch dokumentiert, welches in @@ -25,10 +23,9 @@ diff -Naurp dvdisaster.orig/documentation/dvdisaster.de.1 dvdisaster/documentati 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. +--- a/documentation/dvdisaster.en.1 ++++ b/documentation/dvdisaster.en.1 +@@ -224,7 +224,7 @@ .SH SEE ALSO .B Documentation DVDISASTER is documented by its own manual, installed in @@ -37,10 +34,9 @@ diff -Naurp dvdisaster.orig/documentation/dvdisaster.en.1 dvdisaster/documentati .SH AUTHOR DVDISASTER was written by Carsten Gnoerlich . -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. +--- a/documentation/dvdisaster.it.1 ++++ b/documentation/dvdisaster.it.1 +@@ -115,7 +115,7 @@ .SH "VEDERE ANCHE" .B Documentation DVDISASTER is documented by its own manual, installed in diff --git a/debian/patches/02-encryption.patch b/debian/patches/02-encryption.patch index 675565e..6d2dc3e 100644 --- a/debian/patches/02-encryption.patch +++ b/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; } } diff --git a/debian/patches/03-dvdrom.patch b/debian/patches/03-dvdrom.patch index 1ee435e..f39daa5 100644 --- a/debian/patches/03-dvdrom.patch +++ b/debian/patches/03-dvdrom.patch @@ -1,10 +1,9 @@ Author: Corey Wright 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; } diff --git a/debian/patches/04-manpage.patch b/debian/patches/04-manpage.patch index f43e466..24b9194 100644 --- a/debian/patches/04-manpage.patch +++ b/debian/patches/04-manpage.patch @@ -1,9 +1,8 @@ Author: Daniel Baumann Description: Fixes typo in manpages. -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" diff --git a/debian/patches/05-help-dialog.patch b/debian/patches/05-help-dialog.patch index db3392e..ddd79d9 100644 --- a/debian/patches/05-help-dialog.patch +++ b/debian/patches/05-help-dialog.patch @@ -1,10 +1,9 @@ Author: Daniel Baumann 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"), _("GNU General Public License\n" "The license terms of dvdisaster."), @@ -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"), _("Modifying dvdisaster\n" "Your changes are not ours."), @@ -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 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"),