diff --git a/debian/patches/01-libpng15.patch b/debian/patches/01-libpng15.patch new file mode 100644 index 0000000..c00f39f --- /dev/null +++ b/debian/patches/01-libpng15.patch @@ -0,0 +1,29 @@ +From: Nobuhiro Iwamatsu +Date: Sun, 8 Apr 2012 21:51:13 +0900 +Subject: Build with libpng15. + +Description: Build with libpng15. +Author: Nobuhiro Iwamatsu +Origin: vendor +Last-Update: 2012-04-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + tools/pngio.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tools/pngio.h b/tools/pngio.h +index d9f884e..5d3a575 100644 +--- a/tools/pngio.h ++++ b/tools/pngio.h +@@ -22,6 +22,10 @@ + + #include + #include ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ #include ++#endif ++ + + typedef struct + { char *name; diff --git a/debian/patches/02-encryption.patch b/debian/patches/02-encryption.patch index a9383cb..e7033a7 100644 --- a/debian/patches/02-encryption.patch +++ b/debian/patches/02-encryption.patch @@ -1,11 +1,21 @@ -Author: n/a -Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption). +From: Optical Media Tools Team +Date: Sun, 8 Apr 2012 21:51:29 +0900 +Subject: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption). -Index: dvdisaster/scsi-layer.c -=================================================================== ---- 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 @@ +Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption). +Author: n/a +Last-Update: 2012-04-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + scsi-layer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/scsi-layer.c b/scsi-layer.c +index 99b2ce9..13784dd 100644 +--- a/scsi-layer.c ++++ b/scsi-layer.c +@@ -2693,11 +2693,12 @@ DeviceHandle* OpenAndQueryDevice(char *device) return NULL; } } diff --git a/debian/patches/03-dvdrom.patch b/debian/patches/03-dvdrom.patch index ce3f3de..8b65497 100644 --- a/debian/patches/03-dvdrom.patch +++ b/debian/patches/03-dvdrom.patch @@ -1,11 +1,21 @@ -Author: Corey Wright -Description: Adds support for DVD-ROM medium-type. +From: Corey Wright +Date: Tue, 6 Mar 2012 11:10:30 +0900 +Subject: Adds support for DVD-ROM medium-type. -Index: dvdisaster/scsi-layer.c -=================================================================== ---- dvdisaster.orig/scsi-layer.c 2012-03-06 11:10:17.147044691 +0900 -+++ dvdisaster/scsi-layer.c 2012-03-06 11:10:30.927044292 +0900 -@@ -913,6 +913,11 @@ +Description: Adds support for DVD-ROM medium-type. +Author: Corey Wright +Last-Update: 2012-03-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + scsi-layer.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/scsi-layer.c b/scsi-layer.c +index 13784dd..cd7795a 100644 +--- a/scsi-layer.c ++++ b/scsi-layer.c +@@ -913,6 +913,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only) break; } diff --git a/debian/patches/05-help-dialog.patch b/debian/patches/05-help-dialog.patch index ac9c31d..a8f6d66 100644 --- a/debian/patches/05-help-dialog.patch +++ b/debian/patches/05-help-dialog.patch @@ -1,11 +1,21 @@ -Author: Daniel Baumann -Description: Customizes the help-dialog according to README.MODIFYING. +From: Daniel Baumann +Date: Sun, 8 Apr 2012 21:53:29 +0900 +Subject: Customizes the help-dialog according to README.MODIFYING. -Index: dvdisaster/help-dialogs.c -=================================================================== ---- 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 @@ +Description: Customizes the help-dialog according to README.MODIFYING. +Author: Daniel Baumann +Last-Update: 2012-04-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + help-dialogs.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/help-dialogs.c b/help-dialogs.c +index 793be52..1514a7a 100644 +--- a/help-dialogs.c ++++ b/help-dialogs.c +@@ -402,7 +402,7 @@ void ShowGPL() ShowTextfile(_("windowtitle|GNU General Public License"), _("GNU General Public License\n" "The license terms of dvdisaster."), @@ -14,7 +24,7 @@ Index: dvdisaster/help-dialogs.c } /* -@@ -566,7 +566,7 @@ +@@ -566,7 +566,7 @@ static void show_modifying(void) { ShowTextfile(_("windowtitle|Modifying dvdisaster"), _("Modifying dvdisaster\n" "Your changes are not ours."), @@ -23,7 +33,7 @@ Index: dvdisaster/help-dialogs.c } static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data) -@@ -742,14 +742,14 @@ +@@ -742,14 +742,14 @@ void AboutDialog() 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"), diff --git a/debian/patches/06-remove-encoding-from-desktop-file.patch b/debian/patches/06-remove-encoding-from-desktop-file.patch index cb4a820..a8eda3f 100644 --- a/debian/patches/06-remove-encoding-from-desktop-file.patch +++ b/debian/patches/06-remove-encoding-from-desktop-file.patch @@ -1,9 +1,23 @@ -Author: Rogério Theodoro de Brito -Description: Remove unneeded Encoding-key from desktop file +From: =?utf-8?q?Rog=C3=A9rio_Theodoro_de_Brito?= +Date: Sun, 18 Dec 2016 22:01:27 +1100 +Subject: Remove unneeded Encoding-key from desktop file +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit +Description: Remove unneeded Encoding-key from desktop file +Author: Rogério Theodoro de Brito +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + contrib/dvdisaster.desktop | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/contrib/dvdisaster.desktop b/contrib/dvdisaster.desktop +index 63f2e4f..c7661ec 100644 --- a/contrib/dvdisaster.desktop +++ b/contrib/dvdisaster.desktop -@@ -10,4 +10,3 @@ +@@ -10,4 +10,3 @@ Icon=dvdisaster48.png Terminal=false Type=Application Categories=Application;System; diff --git a/debian/patches/07-fix-spelling-errors-in-binaries.patch b/debian/patches/07-fix-spelling-errors-in-binaries.patch index c9282fe..15076ac 100644 --- a/debian/patches/07-fix-spelling-errors-in-binaries.patch +++ b/debian/patches/07-fix-spelling-errors-in-binaries.patch @@ -1,11 +1,25 @@ -Author: Rogério Theodoro de Brito -Description: Fix spelling errors in binaries +From: =?utf-8?q?Rog=C3=A9rio_Theodoro_de_Brito?= +Date: Sun, 8 Apr 2012 21:55:13 +0900 +Subject: Fix spelling errors in binaries +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit -Index: dvdisaster/preferences.c -=================================================================== ---- 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 @@ +Description: Fix spelling errors in binaries +Author: Rogério Theodoro de Brito +Last-Update: 2012-04-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + preferences.c | 4 ++-- + rs01-fix.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/preferences.c b/preferences.c +index 84abf2b..2f3355c 100644 +--- a/preferences.c ++++ b/preferences.c +@@ -1627,7 +1627,7 @@ void CreatePreferencesWindow(void) "The values include the borders: 0-100 will read 101 sectors.\n\n" "Note: Limiting the reading range is not recommended for adaptive reading since it might " @@ -14,7 +28,7 @@ Index: dvdisaster/preferences.c "These settings are only effective for the current session and will not be saved.")); /** Image properties */ -@@ -1911,7 +1911,7 @@ +@@ -1911,7 +1911,7 @@ if(Closure->debugMode) /* hidden until version 0.80 */ "0x20 This is the recommended mode. " "The drive tries to apply " "the built-in error correction to the best possible extent " @@ -23,11 +37,11 @@ Index: dvdisaster/preferences.c "0x21 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 " -Index: dvdisaster/rs01-fix.c -=================================================================== ---- 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 @@ +diff --git a/rs01-fix.c b/rs01-fix.c +index a867939..fe7707b 100644 +--- a/rs01-fix.c ++++ b/rs01-fix.c +@@ -246,7 +246,7 @@ void RS01Fix(Method *method) if(Closure->guiMode) { int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL, _("The image file is %d bytes longer than noted\n" diff --git a/debian/patches/libpng15 b/debian/patches/libpng15 deleted file mode 100644 index 0f43bd6..0000000 --- a/debian/patches/libpng15 +++ /dev/null @@ -1,40 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - dvdisaster (0.72.3-1+libpng151) unstable; urgency=low - . - * Build with libpng15. -Author: Nobuhiro Iwamatsu - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - -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 - #include -+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ #include -+#endif -+ - - typedef struct - { char *name; diff --git a/debian/patches/series b/debian/patches/series index 432339a..a96b61d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -libpng15 +01-libpng15.patch 02-encryption.patch 03-dvdrom.patch 05-help-dialog.patch