Commit 89cf9f96 authored by TANIGUCHI Takaki's avatar TANIGUCHI Takaki

Merge remote-tracking branch 'exp/debian/experimental'

parents 1d80dd8d 66e2abac
dvdisaster (0.79.5-1) experimental; urgency=medium
* Team upload.
* New upstream version [0.79.5]
* Refresh and drop patches. The following patches have been dropped:
+ 01-libpng15.patch
+ 06-remove-encoding-from-desktop-file.patch
+ 07-fix-spelling-errors-in-binaries.patch
+ 09-fix-format-security-warnings.patch
+ 21-fix-privacy-breach-in-doco.patch
* Update license to GPL-3.
* Update clean rule as old files no longer apply.
* Update documentation build and install rules.
* debian/rules: Update mutable file list.
* Fix generated man pages. The generated man pages incorrectly direct
users to the directory of the old HTML documentation, which is no
longer available.
* Fix display of manual.pdf. The PDF file is automatically compressed
by Debhelper, so we need to account for this.
* Resurrect old code to support opening URLs in a browser.
* Ship upstream-generated manual.pdf for the time being, as we can't
generate it ourselves reproducibly.
-- Carlos Maddela <e7appew@gmail.com> Sat, 07 Jan 2017 00:36:53 +1100
dvdisaster (0.72.4-3) unstable; urgency=medium
[ Carlos Maddela ]
......
documentation/*/*/*.png
documentation/*/*.png
......@@ -12,6 +12,9 @@ Build-Depends: debhelper (>= 10),
libgtk2.0-dev,
libpng-dev,
pkg-config
# Build-Depends-Indep: texlive-fonts-recommended,
# texlive-latex-base,
# texlive-latex-extra
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git
Vcs-Git: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git
......
......@@ -4,8 +4,8 @@ Upstream-Name: dvdisaster
Source: http://dvdisaster.net/
Files: *
Copyright: 2004–2012, Carsten Gnörlich <carsten@dvdisaster.org>
License: GPL-2+
Copyright: 2004–2015, Carsten Gnörlich <carsten@dvdisaster.org>
License: GPL-3+
Files: debian/*
Copyright: 2005–2009, Daniel Baumann <daniel@debian.org>
......@@ -30,3 +30,20 @@ License: GPL-2+
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
......@@ -6,6 +6,5 @@ Abstract: This manual describes what dvdisaster is and how it can be used
and aging.
Section: File Management
Format: HTML
Index: /usr/share/doc/dvdisaster/html/en/index.html
Files: /usr/share/doc/dvdisaster/html/en/*.html
Format: PDF
Files: /usr/share/doc/dvdisaster-doc/manual.pdf.gz
documentation/user-manual/manual.pdf
usr/share/doc/dvdisaster-doc
usr/share/doc/dvdisaster-doc/html/cs/download40.html usr/share/doc/dvdisaster-doc/html/cs/download40_showall=0.html
usr/share/doc/dvdisaster-doc/html/cs/download.html usr/share/doc/dvdisaster-doc/html/cs/download_showall=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos12.html usr/share/doc/dvdisaster-doc/html/cs/howtos12_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=0&expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1&.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2&.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3&expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3&.html
usr/share/doc/dvdisaster-doc/html/cs/howtos42.html usr/share/doc/dvdisaster-doc/html/cs/howtos42_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos51.html usr/share/doc/dvdisaster-doc/html/cs/howtos51_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos52.html usr/share/doc/dvdisaster-doc/html/cs/howtos52_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos53.html usr/share/doc/dvdisaster-doc/html/cs/howtos53_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos91.html usr/share/doc/dvdisaster-doc/html/cs/howtos91_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/howtos92.html usr/share/doc/dvdisaster-doc/html/cs/howtos92_expand=0.html
usr/share/doc/dvdisaster-doc/html/cs/images/compare-icon.png usr/share/doc/dvdisaster-doc/html/cs/images/verify-icon.png
usr/share/doc/dvdisaster-doc/html/de/download40.html usr/share/doc/dvdisaster-doc/html/de/download40_showall=0.html
usr/share/doc/dvdisaster-doc/html/de/download.html usr/share/doc/dvdisaster-doc/html/de/download_showall=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos12.html usr/share/doc/dvdisaster-doc/html/de/howtos12_expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos13.html usr/share/doc/dvdisaster-doc/html/de/howtos13_crc.html
usr/share/doc/dvdisaster-doc/html/de/howtos21.html usr/share/doc/dvdisaster-doc/html/de/howtos31.html
usr/share/doc/dvdisaster-doc/html/de/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/de/howtos23_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/de/howtos23_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos33.html usr/share/doc/dvdisaster-doc/html/de/howtos33_expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=0&expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1&.html
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2&.html
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3&expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3&.html
usr/share/doc/dvdisaster-doc/html/de/howtos42.html usr/share/doc/dvdisaster-doc/html/de/howtos42_expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos51.html usr/share/doc/dvdisaster-doc/html/de/howtos51_expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos52.html usr/share/doc/dvdisaster-doc/html/de/howtos52_expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos53.html usr/share/doc/dvdisaster-doc/html/de/howtos53_expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos91.html usr/share/doc/dvdisaster-doc/html/de/howtos91_expand=0.html
usr/share/doc/dvdisaster-doc/html/de/howtos92.html usr/share/doc/dvdisaster-doc/html/de/howtos92_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/download40.html usr/share/doc/dvdisaster-doc/html/en/download40_showall=0.html
usr/share/doc/dvdisaster-doc/html/en/download.html usr/share/doc/dvdisaster-doc/html/en/download_showall=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos12.html usr/share/doc/dvdisaster-doc/html/en/howtos12_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos21.html usr/share/doc/dvdisaster-doc/html/en/howtos31.html
usr/share/doc/dvdisaster-doc/html/en/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/en/howtos23_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/en/howtos23_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos33.html usr/share/doc/dvdisaster-doc/html/en/howtos33_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=0&expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1&.html
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2&.html
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3&expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3&.html
usr/share/doc/dvdisaster-doc/html/en/howtos42.html usr/share/doc/dvdisaster-doc/html/en/howtos42_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos51.html usr/share/doc/dvdisaster-doc/html/en/howtos51_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos52.html usr/share/doc/dvdisaster-doc/html/en/howtos52_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos53.html usr/share/doc/dvdisaster-doc/html/en/howtos53_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos91.html usr/share/doc/dvdisaster-doc/html/en/howtos91_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/howtos92.html usr/share/doc/dvdisaster-doc/html/en/howtos92_expand=0.html
usr/share/doc/dvdisaster-doc/html/en/images/make-ecc2.png usr/share/doc/dvdisaster-doc/html/de/images/make-ecc2.png
usr/share/doc/dvdisaster-doc/html/en/thumbnails/make-ecc2.png usr/share/doc/dvdisaster-doc/html/de/thumbnails/make-ecc2.png
usr/share/doc/dvdisaster-doc/html/ru/download40.html usr/share/doc/dvdisaster-doc/html/ru/download40_showall=0.html
usr/share/doc/dvdisaster-doc/html/ru/download.html usr/share/doc/dvdisaster-doc/html/ru/download_showall=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos12.html usr/share/doc/dvdisaster-doc/html/ru/howtos12_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=0&expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1&expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1&.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2&expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2&.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3&expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3&.html
usr/share/doc/dvdisaster-doc/html/ru/howtos42.html usr/share/doc/dvdisaster-doc/html/ru/howtos42_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos51.html usr/share/doc/dvdisaster-doc/html/ru/howtos51_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos52.html usr/share/doc/dvdisaster-doc/html/ru/howtos52_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos53.html usr/share/doc/dvdisaster-doc/html/ru/howtos53_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos91.html usr/share/doc/dvdisaster-doc/html/ru/howtos91_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/howtos92.html usr/share/doc/dvdisaster-doc/html/ru/howtos92_expand=0.html
usr/share/doc/dvdisaster-doc/html/ru/images/compare-icon.png usr/share/doc/dvdisaster-doc/html/ru/images/verify-icon.png
usr/share/doc/dvdisaster-doc/html usr/share/doc/dvdisaster/html
usr/share/doc/dvdisaster-doc/manual.pdf.gz usr/share/doc/dvdisaster/manual.pdf.gz
From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Date: Sun, 8 Apr 2012 21:51:13 +0900
Subject: Build with libpng15.
Description: Build with libpng15.
Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
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 <zlib.h>
#include <png.h>
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+ #include <zlib.h>
+#endif
+
typedef struct
{ char *name;
......@@ -12,18 +12,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scsi-layer.c b/scsi-layer.c
index 99b2ce9..13784dd 100644
index d68533b..6717b12 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2693,11 +2693,12 @@ DeviceHandle* OpenAndQueryDevice(char *device)
@@ -2711,12 +2711,13 @@ Image* OpenImageFromDevice(char *device)
return NULL;
}
}
-
+/*
if(dh->mainType == DVD && query_copyright(dh))
{ CloseDevice(dh);
{ CloseImage(image);
Stop(_("This software does not support encrypted media.\n"));
return NULL;
}
+*/
......
......@@ -12,10 +12,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 5 insertions(+)
diff --git a/scsi-layer.c b/scsi-layer.c
index 13784dd..cd7795a 100644
index 6717b12..64a3dba 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -913,6 +913,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only)
@@ -908,6 +908,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only)
break;
}
......
......@@ -16,10 +16,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index 793be52..ed86afe 100644
index 4d6f9bb..eae04f2 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -402,7 +402,7 @@ void ShowGPL()
@@ -403,7 +403,7 @@ void ShowGPL()
ShowTextfile(_("windowtitle|GNU General Public License"),
_("<big>GNU General Public License</big>\n"
"<i>The license terms of dvdisaster.</i>"),
......@@ -28,7 +28,7 @@ index 793be52..ed86afe 100644
}
/*
@@ -566,7 +566,7 @@ static void show_modifying(void)
@@ -567,7 +567,7 @@ static void show_modifying(void)
{ ShowTextfile(_("windowtitle|Modifying dvdisaster"),
_("<big>Modifying dvdisaster</big>\n"
"<i>Your changes are not ours.</i>"),
......@@ -37,7 +37,7 @@ index 793be52..ed86afe 100644
}
static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -745,11 +745,11 @@ void AboutDialog()
@@ -746,11 +746,11 @@ void AboutDialog()
"GPL");
#ifdef MODIFIED_SOURCE
......
From: =?utf-8?q?Rog=C3=A9rio_Theodoro_de_Brito?= <rbrito@ime.usp.br>
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 <rbrito@ime.usp.br>
---
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 @@ Icon=dvdisaster48.png
Terminal=false
Type=Application
Categories=Application;System;
-Encoding=UTF-8
From: =?utf-8?q?Rog=C3=A9rio_Theodoro_de_Brito?= <rbrito@ime.usp.br>
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
Description: Fix spelling errors in binaries
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
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"
"<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 properties */
@@ -1911,7 +1911,7 @@ if(Closure->debugMode) /* hidden until version 0.80 */
"<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 "
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"
- "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);
......@@ -21,10 +21,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
index f9d80c8..ffb5919 100644
index f68ecab..d62f5d7 100644
--- a/scripts/bash-based-configure
+++ b/scripts/bash-based-configure
@@ -309,13 +309,13 @@ function REQUIRE_GMAKE()
@@ -313,13 +313,13 @@ function REQUIRE_GMAKE()
echo -n "Checking for gmake: "
......
From: Carlos Maddela <e7appew@gmail.com>
Date: Mon, 19 Dec 2016 00:58:24 +1100
Subject: Fix format security warnings.
Description: Fix format security warnings.
They are treated as errors in Standards Version 3.9.8.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2016-12-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
tools/memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/memory.c b/tools/memory.c
index f2c0c48..edf32ec 100644
--- a/tools/memory.c
+++ b/tools/memory.c
@@ -165,7 +165,7 @@ static void print_ptr(memchunk *mc, int size)
static void print_ptrs(char *msg)
{ int bucket,i,n=0;
- fprintf(stdout, msg);
+ fprintf(stdout, "%s", msg);
for(bucket=0; bucket<64; bucket++)
for(i=0; i<phCnt[bucket]; i++)
......@@ -6,48 +6,54 @@ Description: Do not install cruft.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-19
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
GNUmakefile.template | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index fe4c504..10e4524 100644
index a3074c7..6fda92b 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -315,11 +315,6 @@ install: dvdisaster images
@@ -228,12 +228,6 @@ install: dvdisaster manual
install -d $(BUILDROOT)$(BINDIR)
install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
install dvdisaster $(BUILDROOT)$(BINDIR)
install -d $(BUILDROOT)$(DOCSUBDIR)
- install -m 644 CHANGELOG $(BUILDROOT)$(DOCSUBDIR)
- install -m 644 COPYING $(BUILDROOT)$(DOCSUBDIR)
- install -m 644 CREDITS* $(BUILDROOT)$(DOCSUBDIR)
- install -m 644 README.MODIFYING $(BUILDROOT)$(DOCSUBDIR)
- install -m 644 TODO $(BUILDROOT)$(DOCSUBDIR)
for i in $(DOC_LOCALES); do \
install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
(cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
@@ -355,20 +350,7 @@ install: dvdisaster images
- install -d $(BUILDROOT)$(DOCSUBDIR)
(cd documentation/user-manual; install -m 644 manual.pdf $(BUILDROOT)$(DOCSUBDIR))
install -d $(BUILDROOT)$(MANDIR)/man1
install -d $(BUILDROOT)$(MANDIR)/de/man1
@@ -251,26 +245,6 @@ install: dvdisaster manual
install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
done \
fi
- @echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(BINDIR)/dvdisaster\" \"$(BINDIR)/dvdisaster-uninstall.sh\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CHANGELOG\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/COPYING\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CREDITS.de\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CREDITS.en\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/manual.pdf\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/README.MODIFYING\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/TODO\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rmdir \"$(DOCSUBDIR)\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @for i in $(PO_LOCALES); do \
- echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- echo "rm -f \"$(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- done
- @echo "rm -f \"$(MANDIR)/man1/dvdisaster.1\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @for i in $(MAN_LOCALES); do \
- echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- echo "rm -f \"$(MANDIR)/$$i/man1/dvdisaster.1\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- done
- @echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
-
+
uninstall:
@echo "Uninstalling package..."
rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh
......@@ -6,51 +6,37 @@ Description: Fix missing language fields in PO files.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2016-12-19
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
locale/cs.po | 2 +-
locale/pt_BR.po | 2 +-
locale/ru.po | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/cs.po b/locale/cs.po
index c26007b..89a9d7f 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: cs_CZ\n"
"X-Generator: KBabel 1.11.1\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 803288a..4cc57ee 100644
index 573531b..04b33b5 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
"PO-Revision-Date: 2010-06-09 11:13+0200\n"
"Last-Translator: cg <cg@dvdisaster.org>\n"
"Language-Team: Portuguese\n"
-"Language: \n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: closure.c:539
diff --git a/locale/ru.po b/locale/ru.po
index b4d457d..38ee2df 100644
index a9fc25c..6cd3789 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -16,7 +16,7 @@ msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
"PO-Revision-Date: 2009-07-23 08:11+0300\n"
"Last-Translator: Igor Gorbounov <igor.gorbounov@gmail.com>\n"
"Language-Team: Russian\n"
-"Language: \n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: closure.c:539
......@@ -15,10 +15,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index ed86afe..fb1b457 100644
index eae04f2..c89c552 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -749,7 +749,7 @@ void AboutDialog()
@@ -750,7 +750,7 @@ void AboutDialog()
"for Debian to support DVD-ROMs (with and without encryption).\n\n"
"Please do not bother the original authors of dvdisaster\n"
"but submit bugreports against the [debian package] instead.\n"),
......
......@@ -7,72 +7,28 @@ Description: Don't build and install documentation automatically.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-21
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
GNUmakefile.template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index 10e4524..dd91bf3 100644
index 6fda92b..d9bef11 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -68,7 +68,7 @@ OFILES = $(CFG_OFILES)
@echo "Compiling:" $*.c
@$(CC) $(COPTS) -c $*.c
@@ -223,12 +223,11 @@ show:
.PHONY : install uninstall clean distclean arch
.PHONY : srcdist
-all: time-stamp dvdisaster images
+all: time-stamp dvdisaster
# Building the dvdisaster binary
@@ -310,24 +310,10 @@ show:
.PHONY : www www-images
.PHONY : srcdist windist
-install: dvdisaster images
-install: dvdisaster manual
+install: dvdisaster
@echo "Installing package..."
install -d $(BUILDROOT)$(BINDIR)
install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
- install -d $(BUILDROOT)$(DOCSUBDIR)
- for i in $(DOC_LOCALES); do \
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
- (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/images; \
- (cd documentation/$$i; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/images); \
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails; \
- (cd documentation/$$i; install -m 644 thumbnails/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails); \
- done
- install -d $(BUILDROOT)$(DOCSUBDIR)/images
- cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
-# cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
- install -d $(BUILDROOT)$(DOCSUBDIR)/include
- cd documentation; install -m 644 include/*.css $(BUILDROOT)$(DOCSUBDIR)/include
install dvdisaster $(BUILDROOT)$(BINDIR)
install -d $(BUILDROOT)$(DOCSUBDIR)
- (cd documentation/user-manual; install -m 644 manual.pdf $(BUILDROOT)$(DOCSUBDIR))
install -d $(BUILDROOT)$(MANDIR)/man1
install -d $(BUILDROOT)$(MANDIR)/cs/man1
install -d $(BUILDROOT)$(MANDIR)/de/man1
@@ -351,6 +337,22 @@ install: dvdisaster images
done \
fi
+install-doc: images
+ install -d $(BUILDROOT)$(DOCSUBDIR)
+ for i in $(DOC_LOCALES); do \
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
+ (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/images; \
+ (cd documentation/$$i; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/images); \
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails; \
+ (cd documentation/$$i; install -m 644 thumbnails/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails); \
+ done
+ install -d $(BUILDROOT)$(DOCSUBDIR)/images
+ cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
+# cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
+ install -d $(BUILDROOT)$(DOCSUBDIR)/include
+ cd documentation; install -m 644 include/*.css $(BUILDROOT)$(DOCSUBDIR)/include
+
uninstall:
@echo "Uninstalling package..."
rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh
cd documentation; \
......@@ -6,7 +6,7 @@ Description: Update copyright notice in about dialog.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-22
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
......@@ -14,18 +14,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index fb1b457..3658bfc 100644
index c89c552..0f4e3b2 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -722,8 +722,9 @@ void AboutDialog()
@@ -723,8 +723,9 @@ void AboutDialog()
g_free(text);
#ifdef MODIFIED_SOURCE
- AboutTextWithLink(vbox,
- _("Modified version Copyright 2012 (please fill in - [directions])\n"
- _("Modified version Copyright 2015 (please fill in - [directions])\n"
+ AboutTextWithLink(vbox,
+ _("[Modified version]\n"
+ "Copyright 2005-2016 Debian Optical Media Tools Team\n"
"Copyright 2004-2012 Carsten Gnoerlich"),
"Copyright 2004-2015 Carsten Gnoerlich"),
"MODIFYING");
#else
......@@ -14,10 +14,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 18 insertions(+)
diff --git a/help-dialogs.c b/help-dialogs.c
index 3658bfc..9151d52 100644
index 0f4e3b2..6214429 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -422,6 +422,24 @@ char *find_file(char *file, size_t *size, char *lang)
@@ -423,6 +423,24 @@ char *find_file(char *file, size_t *size, char *lang)
lang_suffix[1] = lang[1];
}
......
......@@ -17,10 +17,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/menubar.c b/menubar.c
index 99ae4fc..33e6ba4 100644
index 12f1933..15ce4ad 100644
--- a/menubar.c
+++ b/menubar.c
@@ -116,21 +116,21 @@ static void menu_cb(GtkWidget *widget, gpointer data)
@@ -126,21 +126,21 @@ static void menu_cb(GtkWidget *widget, gpointer data)
ShowTextfile(_("windowtitle|Change log"),
_("<big>Change log</big>\n"
"<i>Major differences from earlier program versions.</i>"),
......
From: Carlos Maddela <e7appew@gmail.com>
Date: Fri, 23 Dec 2016 05:51:56 +1100
Subject: Don't allow doco to automatically fetch resources from the internet.
Description: Don't allow doco to automatically fetch resources from
the internet.
.
Remove link to the newsfeed, to fix Lintian privacy-breach-generic
warning. The news feed no longer works anyway.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
documentation/cs/index.html | 3 +--
documentation/de/index.html | 3 +--
documentation/en/index.html | 3 +--
documentation/ru/index.html | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/documentation/cs/index.html b/documentation/cs/index.html
index 7fa1778..920d849 100644
--- a/documentation/cs/index.html
+++ b/documentation/cs/index.html
@@ -4,7 +4,6 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Přehled</title>
<link rel="stylesheet" type="text/css" href="../include/dvdisaster.css">
-<link rel="alternate" type="application/atom+xml" href="http://dvdisaster.net/cs/feed/atom.xml" title="dvdisaster - novinky">
</head>