Commit f7d26c5d authored by TANIGUCHI Takaki's avatar TANIGUCHI Takaki

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

parents 5249b889 5fe15556
dvdisaster (0.72.4-3) unstable; urgency=medium
[ Carlos Maddela ]
* Team upload.
* Bump compat level to 10.
* debian/watch: Relax upstream version restriction.
* Use original name for the duplicate uncompressed upstream CHANGELOG.
* Backup and restore mutable files to allow multiple builds.
* Fix FTBFS for hurd-i386.
[ Corey Wright ]
* Add support for BD-ROM media-type. (Closes: #849518)
-- Carlos Maddela <e7appew@gmail.com> Sat, 07 Jan 2017 00:29:19 +1100
dvdisaster (0.72.4-2) unstable; urgency=medium
* Team upload.
* Make builds reproducible:
+ Use the Debian changelog details to derive a build number and date.
+ Don't build with source path embedded in binary.
* debian/control:
+ Update to Standards Version 3.9.8.
- Format security warnings required fixing in tools/memory.c as
a result.
+ Update VCS details.
+ Remove obsolete DM-Upload-Alllowed control field.
+ Perform wrap and sort.
+ Mark dvdisaster-doc as a multi-arch foreign package.
* debian/rules:
+ Build with all hardening flags set.
+ Link required libraries as needed.
+ Fix installation of desktop file and icon images.
+ Tidy up installation of doc files.
+ Fix clean up.
+ Separate binary-arch and binary-indep rules.
+ Silence deprecated API warnings.
* debian/*:
+ Update uscan rules.
+ Drop debian/dvdisaster.menu file in favour of desktop file.
+ Convert copyright file into proper DEP5 format and update.
+ Drop no longer required debian/pixmaps/dvdisaster.xpm.
+ Add debian/dvdisaster-doc.doc-base file.
+ Add link to html docs in dvdisaster-doc package.
+ Remove unnecessary duplication of doc files in the two packages.
+ Link all duplicate doc files.
+ Fix installation of thumbnails for Czech doco.
* debian/patches/*:
+ Fix headers to work with git-buildpackage, retaining as much
meta info as possible.
+ Fix GNU Make detection. (Closes: #848811)
+ Fix path of GPL-2 license in 05-help-dialog.patch. (Closes: #708384)
+ Fix all warnings except for those related to deprecated API.
(Closes: #748416)
+ Use non-size-specific icon and add keywords to desktop file.
+ Fix spelling: upto -> up to
+ Fix missing language fields in PO files.
+ Update help dialog to show link to the new Debian package tracker.
+ Update copyright notice in about dialog.
+ Allow ShowTextFile() to work with absolute path names.
+ Fix display of changelog, credits and to-do files.
+ Remove link to the newsfeed, to fix Lintian privacy-breach-generic
warning. The news feed no longer works anyway.
-- Carlos Maddela <e7appew@gmail.com> Fri, 23 Dec 2016 15:53:13 +1100
dvdisaster (0.72.4-1) unstable; urgency=low
* New upstream (Closes: #665522)
......
documentation/*/*/*.png
documentation/*/*.png
......@@ -3,22 +3,23 @@ Section: otherosfs
Priority: optional
Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org>
Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
Rogério Brito <rbrito@ime.usp.br>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~),
gettext,
libbz2-dev,
libgtk2.0-dev,
libpng-dev,
pkg-config
Standards-Version: 3.9.3
Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvdisaster.git
Vcs-Git: git://git.debian.org/pkg-opt-media/dvdisaster.git
Rogério Brito <rbrito@ime.usp.br>
Build-Depends: debhelper (>= 10),
dh-exec,
dpkg-dev (>= 1.16.1.1),
gettext,
libbz2-dev,
libgtk2.0-dev,
libpng-dev,
pkg-config
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
Homepage: http://dvdisaster.net/
Package: dvdisaster
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xdg-utils
Depends: xdg-utils, ${misc:Depends}, ${shlibs:Depends}
Recommends: dvdisaster-doc
Description: data loss/scratch/aging protection for CD/DVD media
dvdisaster provides a margin of safety against data loss on CD and DVD media
......@@ -28,6 +29,7 @@ Description: data loss/scratch/aging protection for CD/DVD media
Package: dvdisaster-doc
Section: doc
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: dvdisaster
Description: data loss/scratch/aging protection for CD/DVD media (documentation)
......
Author: Carsten Gnoerlich <cgnoerlich@fsfe.org>
Download: http://www.dvdisaster.com/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: Carsten Gnörlich <carsten@dvdisaster.org>
Upstream-Name: dvdisaster
Source: http://dvdisaster.net/
Files: *
Copyright: Copyright (C) 2004-2009 Carsten Gnoerlich <cgnoerlich@fsfe.org>
Copyright: 2004–2012, Carsten Gnörlich <carsten@dvdisaster.org>
License: GPL-2+
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 2
of the License, or (at your option) any later version.
.
This program 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, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
Files: debian/*
Copyright (C) 2005-2009 Daniel Baumann <daniel@debian.org>
Copyright: 2005–2009, Daniel Baumann <daniel@debian.org>
2009–2012, TANIGUCHI Takaki <takaki@debian.org>
2009–2010, Rogério Brito <rbrito@ime.usp.br>
2016, Carlos Maddela <e7appew@gmail.com>
License: GPL-2+
License: GPL-2+
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 2
of the License, or (at your option) any later version.
This package 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 2 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
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, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Document: dvdisaster
Title: The dvdisaster User's Manual
Author: Carsten Gnörlich
Abstract: This manual describes what dvdisaster is and how it can be used
to protect optical media (CD/DVD/BD) from data loss, due to scratches
and aging.
Section: File Management
Format: HTML
Index: /usr/share/doc/dvdisaster/html/en/index.html
Files: /usr/share/doc/dvdisaster/html/en/*.html
CREDITS.cs
CREDITS.de
CREDITS.en
README.MODIFYING
TODO
TRANSLATION.HOWTO
/usr/share/doc/dvdisaster-doc
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
CREDITS.cs
CREDITS.de
CREDITS.en
CHANGELOG
CREDITS.*
README.MODIFYING
TODO
TRANSLATION.HOWTO
#!/usr/bin/dh-exec
usr/bin
usr/share/locale
usr/share/man
contrib/dvdisaster.desktop usr/share/applications
contrib/dvdisaster16.png => usr/share/icons/hicolor/16x16/apps/dvdisaster.png
contrib/dvdisaster24.png => usr/share/icons/hicolor/24x24/apps/dvdisaster.png
contrib/dvdisaster32.png => usr/share/icons/hicolor/32x32/apps/dvdisaster.png
contrib/dvdisaster48.png => usr/share/icons/hicolor/48x48/apps/dvdisaster.png
contrib/dvdisaster64.png => usr/share/icons/hicolor/64x64/apps/dvdisaster.png
?package(dvdisaster):needs="X11" section="Applications/File Management"\
title="Dvdisaster" longtitle="data loss/scratch/aging protection for CD/DVD media"\
description="dvdisaster provides a margin of safety against data loss on CD and DVD media caused by scratches or aging media. It creates error correction data which is used to recover unreadable sectors if the disc becomes damaged at a later time."\
command="/usr/bin/dvdisaster" icon="/usr/share/pixmaps/dvdisaster.xpm"
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;
Author: n/a
From: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org>
Date: Sun, 8 Apr 2012 21:51:29 +0900
Subject: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
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(-)
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 @@
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;
}
}
......
Author: Corey Wright <undefined@pobox.com>
From: Corey Wright <undefined@pobox.com>
Date: Tue, 6 Mar 2012 11:10:30 +0900
Subject: Adds support for DVD-ROM medium-type.
Description: Adds support for DVD-ROM medium-type.
Author: Corey Wright <undefined@pobox.com>
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(+)
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 @@
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;
}
......
Author: Daniel Baumann <daniel@debian.org>
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 8 Apr 2012 21:53:29 +0900
Subject: Customizes the help-dialog according to README.MODIFYING.
Description: Customizes the help-dialog according to README.MODIFYING.
.
* 2016-12-19 - Fixed path:
/usr/share/common/licenses/GPL-2 -> /usr/share/common-licenses/GPL-2
and restored use of "GPL" label.
Author: Daniel Baumann <daniel@debian.org>
Last-Update: 2016-12-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
help-dialogs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 @@
diff --git a/help-dialogs.c b/help-dialogs.c
index 793be52..ed86afe 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -402,7 +402,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);
+ "/usr/share/common-licenses/GPL-2", NULL, NULL);
}
/*
@@ -566,7 +566,7 @@
@@ -566,7 +566,7 @@ static void show_modifying(void)
{ ShowTextfile(_("windowtitle|Modifying dvdisaster"),
_("<big>Modifying dvdisaster</big>\n"
"<i>Your changes are not ours.</i>"),
......@@ -23,12 +37,8 @@ Index: dvdisaster/help-dialogs.c
}
static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -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"
"under the conditions of the [GNU General Public License].\n"),
- "GPL");
+ "/usr/share/common-licenses/GPL-2");
@@ -745,11 +745,11 @@ void AboutDialog()
"GPL");
#ifdef MODIFIED_SOURCE
- AboutTextWithLink(vbox, _("\nThis program is <b>not the original</b>. It is based on the\n"
......
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
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 @@
@@ -10,4 +10,3 @@ Icon=dvdisaster48.png
Terminal=false
Type=Application
Categories=Application;System;
......
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
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(-)
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 @@
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 "
......@@ -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 */
"<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 "
......@@ -23,11 +37,11 @@ Index: dvdisaster/preferences.c
"<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 "
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"
......
From: Carlos Maddela <e7appew@gmail.com>
Date: Sun, 18 Dec 2016 23:05:03 +1100
Subject: Fix GNU Make detection.
Description: Fix GNU Make detection.
While the previous code works with earlier versions of bash, it doesn't
seem to work with bash 4.4.5. The redirection to /dev/null somehow causes
grep to return an error code of 2.
.
This change allows for more predictable behaviour: grep returns an
error code of 0 or 1.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Bug-Debian: https://bugs.debian.org/848811
Forwarded: no
Last-Update: 2016-12-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
scripts/bash-based-configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
index f9d80c8..ffb5919 100644
--- a/scripts/bash-based-configure
+++ b/scripts/bash-based-configure
@@ -309,13 +309,13 @@ function REQUIRE_GMAKE()
echo -n "Checking for gmake: "
- if (gmake -v | grep "GNU Make") > /dev/null 2>&1 ;
+ if (gmake -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
then echo "yes"
echo "MAKE = `which gmake`" >>Makefile.config
return 0
fi;
- if (make -v | grep "GNU Make") > /dev/null 2>&1 ;
+ if (make -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
then echo "yes"
echo "MAKE = `which make`" >>Makefile.config
return 0
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++)
From: Carlos Maddela <e7appew@gmail.com>
Date: Mon, 19 Dec 2016 03:40:41 +1100
Subject: Use non-size-specific icon and add keywords to desktop file.
Description: Use non-size-specific icon and add keywords to desktop file.
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/
---
contrib/dvdisaster.desktop | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/dvdisaster.desktop b/contrib/dvdisaster.desktop
index c7661ec..1f9926b 100644
--- a/contrib/dvdisaster.desktop
+++ b/contrib/dvdisaster.desktop
@@ -6,7 +6,8 @@ Comment=Additional error protection for CD/DVD media
Comment[cs]=Přídavná ochrana pro média CD/DVD
Comment[de]=Zusätzliche Fehlerkorrektur für CD/DVD
Exec=dvdisaster
-Icon=dvdisaster48.png
+Icon=dvdisaster
Terminal=false
Type=Application
Categories=Application;System;
+Keywords=CD;DVD;media;data loss;scratch;aging;error;protection;recovery;
From: Carlos Maddela <e7appew@gmail.com>
Date: Mon, 19 Dec 2016 05:06:30 +1100
Subject: Do not install cruft.
Description: Do not install cruft.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index fe4c504..10e4524 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -315,11 +315,6 @@ install: dvdisaster images
install -d $(BUILDROOT)$(BINDIR)
install dvdisaster$(EXE_SUFFIX) $(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 -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
- @for i in $(PO_LOCALES); do \
- echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- done
- @for i in $(MAN_LOCALES); do \
- echo "rm $(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
This diff is collapsed.
From: Carlos Maddela <e7appew@gmail.com>
Date: Mon, 19 Dec 2016 07:04:02 +1100
Subject: Fix missing language fields in PO files.
Description: Fix missing language fields in PO files.
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/
---
locale/cs.po | 2 +-
locale/pt_BR.po | 2 +-
locale/ru.po | 2 +-
3 files changed, 3 insertions(+), 3 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
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""