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

Imported Debian patch 0.72-2

Browse Source
This commit is contained in:
Daniel Baumann
2009-08-27 10:24:34 +02:00
committed by TANIGUCHI Takaki
parent a39ce4fddf
commit 8ea2ebcd2a
19 changed files with 785 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
debian/patches/01-docdir.patch vendored Normal file
View File

@@ -0,0 +1,51 @@
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>.

20
debian/patches/02-encryption.patch vendored Normal file
View File

@@ -0,0 +1,20 @@
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
return NULL;
}
}
-
+/*
if(dh->mainType == DVD && query_copyright(dh))
{ CloseDevice(dh);
Stop(_("This software does not support encrypted media.\n"));
}
+*/
/* Create the bitmap of simulated defects */

18
debian/patches/03-dvdrom.patch vendored Normal file
View File

@@ -0,0 +1,18 @@
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
break;
}
+ if(layer_type & 0x01)
+ { dh->typeDescr = g_strdup("DVD-ROM");
+ break;
+ }
+
if(layer_type & 0x06) /* strange thing: (re-)writeable but neither plus nor dash */
{ dh->typeDescr = g_strdup("DVD-ROM (fake)");
dh->subType = DVD;

15
debian/patches/04-manpage.patch vendored Normal file
View File

@@ -0,0 +1,15 @@
Author: Daniel Baumann <daniel@debian.org>
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
@@ -7,7 +7,7 @@
.\"
.TH DVDISASTER 1 "2006-01-04" "0.65" "ochrana pro média CD/DVD"
-.SH NÁZEV
+.SH JM<4A>NO
DVDISASTER \- ochrana proti ztrátě dat poškrábáním/stárnutím média CD/DVD
.SH SYNTAXE

57
debian/patches/05-help-dialog.patch vendored Normal file
View File

@@ -0,0 +1,57 @@
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()
ShowTextfile(_("windowtitle|GNU General Public License"),
_("<big>GNU General Public License</big>\n"
"<i>The license terms of dvdisaster.</i>"),
- "COPYING", NULL, NULL);
+ "/usr/share/common/licenses/GPL-2", NULL, NULL);
}
/*
@@ -541,7 +541,7 @@ static void show_modifying(void)
{ ShowTextfile(_("windowtitle|Modifying dvdisaster"),
_("<big>Modifying dvdisaster</big>\n"
"<i>Your changes are not ours.</i>"),
- "README.MODIFYING", NULL, NULL);
+ "/usr/share/doc/dvdisaster/README.MODIFYING", NULL, NULL);
}
static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -698,9 +698,9 @@ void AboutDialog()
#ifdef MODIFIED_SOURCE
AboutTextWithLink(vbox,
- _("Modified version Copyright 2009 (please fill in - [directions])\n"
- "Copyright 2004-2009 Carsten Gnoerlich"),
- "MODIFYING");
+ _("Modified version for [Debian GNU/Linux]\n"
+ "Original Copyright 2004-2009 Carsten Gnoerlich"),
+ "http://www.debian.org/");
#else
AboutText(vbox, _("Copyright 2004-2009 Carsten Gnoerlich"));
#endif
@@ -717,14 +717,14 @@ void AboutDialog()
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"),
- "GPL");
+ "/usr/share/common-licenses/GPL-2");
#ifdef MODIFIED_SOURCE
- AboutTextWithLink(vbox, _("\nThis program is <b>not the original</b>. It is based on the\n"
- "source code of dvdisaster, but contains third-party changes.\n\n"
+ AboutTextWithLink(vbox, _("\nThis version is <b>not the original</b>. It has been patched\n"
+ "for Debian to support DVD-ROMs (with and without encryption).\n\n"
"Please do not bother the original authors of dvdisaster\n"
- "([www.dvdisaster.org]) about issues with this version.\n"),
- "http://www.dvdisaster.org");
+ "but submit bugreports against the [debian package] instead.\n"),
+ "http://packages.qa.debian.org/dvdisaster");
#else
lang = g_getenv("LANG");

5
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,5 @@
01-docdir.patch
02-encryption.patch
03-dvdrom.patch
04-manpage.patch
05-help-dialog.patch