prepare release

This reverts commit 1a6b38f9a5.

.gitignore

@@ -0,0 +1,3 @@
+.pc
+*.o
+*~

debian/changelog

@@ -0,0 +1,417 @@
+dvdisaster (0.79.5-2) unstable; urgency=medium
+
+  [ Carlos Maddela ]
+  * Team upload.
+  * Bump Standards Version to 4.0.0.
+  * Remove unnecessary calls to dpkg-parsechangelog from debian/rules.
+  * debian/watch: Avoid repacking upstream tarballs unnecessarily.
+  * Fix more typos in error messages and docs.
+  * Fix FTBFS on Hurd and kFreeBSD.
+  * Remove incorrect use of 'Origin: vendor' from DEP-3 patch headers.
+  * Improve support for Hurd and kFreeBSD systems, although Hurd still
+    builds without SCSI.
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Mon, 07 Aug 2017 17:34:01 +0900
+
+dvdisaster (0.79.5-1) unstable; urgency=medium
+
+  [ Carlos Maddela ]
+  * 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.
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Thu, 02 Feb 2017 22:28:25 +0900
+
+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)
+  * debian/paches/04-manpage.patch: Removed (merged by upstream).
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Sun, 08 Apr 2012 22:02:16 +0900
+
+dvdisaster (0.72.3-2) unstable; urgency=low
+
+  * debian/patches/libpng15: Build with libpng15. (Closes: #649555) 
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Mon, 19 Mar 2012 11:08:53 +0900
+
+dvdisaster (0.72.3-1) unstable; urgency=low
+
+  [ Rogério Brito ]
+  * debian/patches/*: refresh and adapt every patch
+  * debian/patches/04-manpage.patch: escape one hyphen
+
+  [ TANIGUCHI Takaki ]
+  * New upstream 0.72.3 (Closes: #643869)
+  * Bump Standards-Version to 3.9.3
+  * debian/patches/*: Refreshed.
+  * Depend unversion libpng-dev (Closes: #662306)
+  * debian/rules: Rewrite in dh7 style
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Tue, 06 Mar 2012 12:44:08 +0900
+
+dvdisaster (0.72.1-2) unstable; urgency=low
+
+  * [da276c7] Refresh patches to avoid potential problems with the
+    buildds.
+  * [3ee8b47] Initial migration to format "3.0 (quilt)".
+  * [af26379] Wrap some long lines for legibility.
+  * [2372076] Wrap one extra line.
+  * [00e1968] Don't patch the documentation directly.
+  * [fac6933] Add missing misc-depends on dvdisaster
+  * [70a6efd] Rewrap the build-depends line, for diff-friendliness.
+  * [9fe0db4] Fix incorrect place of misc:depends.
+  * [6576482] Remove unneeded patch
+  * [7771474] Remove duplicate section field for dvdisaster
+  * [f51c51a] Add debian/watch file to more closely follow upstream
+  * [2194941] Remove UTF-8 encoding from desktop file
+  * [57e4fab] Update patch to deal with hyphens used as minus signs
+  * [80e291c] Add description for the patch
+  * [cea78c3] Add patch to fix spelling errors in the binaries
+  * [96b581b] Fix for another typo in the manpage
+  * [b8f0e62] Update standards version with no changes needed
+
+ -- Rogério Brito <rbrito@ime.usp.br>  Tue, 24 Aug 2010 12:10:21 -0300
+
+dvdisaster (0.72.1-1) unstable; urgency=low
+
+  * New maintainer (Closes: 543876)
+  * new upstream version.
+  * debian/control: update Homepage:
+  * debian/README.source: create 
+  * debian/control: add Vcs-*.
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Mon, 23 Nov 2009 10:29:09 +0900
+
+dvdisaster (0.72-2) unstable; urgency=low
+
+  * Updating to standards version 3.8.3.
+  * Removing vcs fields.
+  * Orphaning package.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 27 Aug 2009 10:24:34 +0200
+
+dvdisaster (0.72-1) unstable; urgency=low
+
+  * Using correct rfc-2822 date formats in changelog.
+  * Merging upstream version 0.72.
+  * Removing shebang.patch, not required anymore.
+  * Updating standards version to 3.8.2.
+  * Tidy rules file.
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 07 Jul 2009 01:11:52 +0200
+
+dvdisaster (0.72~rc1-1) unstable; urgency=low
+
+  * Merging upstream version 0.72~rc1.
+  * Upgrading to standards 3.8.1.
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 17 Apr 2009 21:20:00 +0200
+
+dvdisaster (0.71.28-1) unstable; urgency=medium
+
+  * Merging upstream version 0.71.28:
+    - Fixes "illegal instruction" crashes on x86 machines which do not support
+      SSE2 (Closes: #515950).
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 17 Mar 2009 09:55:00 +0100
+
+dvdisaster (0.71.27-1) unstable; urgency=low
+
+  * Using patch-stamp rather than patch in rules file.
+  * Replacing obsolete dh_clean -k with dh_prep.
+  * Merging upstream version 0.71.27.
+  * Rediffing help-dialog.dpatch.
+  * Using quilt rather than dpatch.
+  * Updating year in copyright.
+  * Adding longtitle and description in menu file.
+  * Using usual name for pixmaps directory.
+  * Updating rules to current state of the art.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 25 Jan 2009 14:01:00 +0100
+
+dvdisaster (0.71.26-2) unstable; urgency=medium
+
+  * Updating to standards 3.8.0.
+  * Updating vcs fields in control file.
+  * Correcting 03-dvdrom.dpatch to not crash when opening a DVD-ROM.
+    Thanks to Tobias Gruetzmacher <tobias-debian@23.gs> (Closes: #498296).
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 08 Sep 2008 22:08:00 +0200
+
+dvdisaster (0.71.26-1) unstable; urgency=medium
+
+  * Reordering rules file.
+  * Using examples debhelper to install examples.
+  * Removing 08-xdg.dpatch, went upstream.
+  * Removing 07-adaptive-read.dpatch, went upstream.
+  * Rediffing 05-help-dialog.dpatch.
+  * Rediffing 03-dvdrom.dpatch.
+  * Rediffing 02-encryption.dpatch.
+  * Removing watch file.
+  * Removing useless whitespaces at end of debian gmkrs02 example.
+  * Rewriting copyright file in machine-interpretable format.
+  * Adding vcs fields in control file.
+  * Upgrading package to debhelper 7.
+  * Merging upstream version 0.71.26.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 03 May 2008 11:34:00 +0200
+
+dvdisaster (0.71~devel23-7) unstable; urgency=low
+
+  * Bumping to new policy.
+  * Updating menu file to new policy.
+  * Don't hide make errors in clean target of rules.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 23 Dec 2007 13:26:00 +0100
+
+dvdisaster (0.71~devel23-6) unstable; urgency=low
+
+  * Using xdg-open rather than gnome-open.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 29 Nov 2007 10:39:00 +0100
+
+dvdisaster (0.71~devel23-5) unstable; urgency=low
+
+  * Setting configure shebang to bash.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 24 Oct 2007 06:14:00 +0200
+
+dvdisaster (0.71~devel23-4) unstable; urgency=low
+
+  * Fixed clean target in rules (Closes: #442559).
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 17 Sep 2007 00:37:00 +0200
+
+dvdisaster (0.71~devel23-3) unstable; urgency=medium
+
+  * Applied patch from Wolfgang Weisselberg <g35fckt001@sneakemail.com> to fix
+    segfault when reading CD with --adaptive-read (Closes: #427980).
+  * Including example script from Osamu Aoki <osamu@debian.org> to provide a
+    GUI for creating RS02 supplimented ISO images (Closes: #442145).
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 14 Sep 2007 11:13:00 +0200
+
+dvdisaster (0.71~devel23-2) unstable; urgency=low
+
+  * Fix shebang in configure.
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 04 Sep 2007 22:53:00 +0200
+
+dvdisaster (0.71~devel23-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 14 May 2007 10:46:00 +0200
+
+dvdisaster (0.71~devel22-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 29 Apr 2007 16:47:00 +0200
+
+dvdisaster (0.70.4-2) unstable; urgency=low
+
+  * Uploading to unstable.
+  * Bumped package to debhelper 5.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 08 Mar 2007 10:35:00 +0100
+
+dvdisaster (0.70.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 27 Jan 2007 18:05:00 +0100
+
+dvdisaster (0.70.3-2) unstable; urgency=medium
+
+  * Added patch from Carsten Gnoerlich <carsten@dvdisaster.com> to fix issues
+    with glib threading (Closes: #405757).
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 17 Jan 2007 10:42:00 +0100
+
+dvdisaster (0.70.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 13 Dec 2006 11:57:00 +0100
+
+dvdisaster (0.70.2-2) unstable; urgency=medium
+
+  * Adjusted 05-help-dialog.dpatch as suggested by
+    Corey Wright <undefined@pobox.com> (Closes: #393671).
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 17 Oct 2006 14:01:00 +0200
+
+dvdisaster (0.70.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added patch to customize the help-dialog according to README.MODIFYING.
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 03 Oct 2006 20:58:00 +0200
+
+dvdisaster (0.70.1-2) unstable; urgency=low
+
+  * Added patch from upstream to fix some code errors (Closes: #388304).
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 21 Sep 2006 01:29:00 +0200
+
+dvdisaster (0.70.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 22 Aug 2006 23:09:00 +0200
+
+dvdisaster (0.70-1) unstable; urgency=low
+
+  * New upstream release (Closes: #377757).
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 11 Jul 2006 07:19:00 +0200
+
+dvdisaster (0.66-4) unstable; urgency=low
+
+  * New email address.
+  * Fixed typo in manpage (Closes: #376752).
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 07 Jul 2006 09:01:00 +0200
+
+dvdisaster (0.66-3) unstable; urgency=low
+
+  * Fixed docsubdir (Closes: #366274).
+  * Disabled skipping of encrypted disks (Closes: #366399).
+  * Added patch for DVD-ROM medias (Closes: #366392).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Mon, 15 May 2006 03:17:00 -0500
+
+dvdisaster (0.66-2) unstable; urgency=low
+
+  * Set dvdisaster-doc to recommends instead of suggests (Closes: #363291).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Tue, 18 Apr 2006 16:35:00 +0100
+
+dvdisaster (0.66-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added pixmap.
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Tue, 28 Mar 2006 10:13:00 +0100
+
+dvdisaster (0.65-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed patch stack buffer patch (went upstream).
+  * Removed manpage patches (went upstream).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Tue, 17 Jan 2006 14:32:00 +0100
+
+dvdisaster (0.64.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Now using dpatch for updating manpages.
+  * Fixed definitely the documentation path in the manpages (Closes: #333591).
+  * Added patch from Robert Bihlmeyer <robbe@orcus.priv.at> to fix segfault on
+    allocating stack buffer (Closes: #335792).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Fri, 25 Nov 2005 11:01:00 +0100
+
+dvdisaster (0.63.2-1) unstable; urgency=low
+
+  * New upstream release:
+    - no longer needs gawk.
+    - manpage updated and moved to upstream.
+    - manpage now mentions correct documentation-location (Closes: #322187).
+  * Now update config.{guess,sub} via .diff.gz.
+  * Corrected non-ascii chars in the German and Italian manpage.
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Sat, 06 Aug 2005 20:03:00 +0200
+
+dvdisaster (0.63-1) unstable; urgency=low
+
+  * Initial release (Closes: #319742).
+  * Fixed Makefile for $(DESTDIR)-use.
+  * Added manpage.
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Sun, 24 Jul 2005 13:35:00 +0200

debian/compat

@@ -0,0 +1 @@
+10

debian/control

@@ -0,0 +1,45 @@
+Source: dvdisaster
+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>
+Build-Depends: debhelper (>= 10),
+               dh-exec,
+               dpkg-dev (>= 1.16.1.1),
+               gettext,
+               libbz2-dev,
+               libcam-dev [kfreebsd-any],
+               libgtk2.0-dev,
+               libpng-dev,
+               pkg-config
+# Build-Depends-Indep: texlive-fonts-recommended,
+#                      texlive-latex-base,
+#                      texlive-latex-extra
+Standards-Version: 4.0.0
+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/
+Testsuite: autopkgtest
+
+Package: dvdisaster
+Architecture: any
+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
+ 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.
+
+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)
+ 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.
+ .
+ This package contains the documentation.

debian/copyright

@@ -0,0 +1,49 @@
+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: 2004–2015, Carsten Gnörlich <carsten@dvdisaster.org>
+License: GPL-3+
+
+Files: debian/*
+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 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 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 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".

debian/dvdisaster-doc.doc-base

@@ -0,0 +1,10 @@
+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: PDF
+Files: /usr/share/doc/dvdisaster-doc/manual.pdf.gz

debian/dvdisaster-doc.docs

@@ -0,0 +1 @@
+documentation/user-manual/manual.pdf

debian/dvdisaster-doc.links

@@ -0,0 +1 @@
+usr/share/doc/dvdisaster-doc/manual.pdf.gz usr/share/doc/dvdisaster/manual.pdf.gz

debian/dvdisaster.docs

@@ -0,0 +1,5 @@
+CHANGELOG
+CREDITS.*
+README.MODIFYING
+TODO
+TRANSLATION.HOWTO

debian/dvdisaster.examples

@@ -0,0 +1 @@
+debian/examples/*

debian/dvdisaster.install

@@ -0,0 +1,10 @@
+#!/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

debian/examples/gmkrs02

@@ -0,0 +1,41 @@
+#!/bin/sh -e
+# Copyright (C) 2007 Osamu Aoki <osamu@debian.org>, Public Domain
+set -x
+# Initialize variables
+DATA_SRC=""
+DATA_ISO="$HOME/Desktop/iso-$$.img"
+LABEL=$(date +%Y%m%d-%H%M%S-%Z)
+error_exit()
+{
+  echo "$1" >&2
+  exit 1
+}
+# Erase disk image
+rm -f "$DATA_ISO" || true
+# Select directory for creating ISO image from folder on desktop
+DATA_SRC=$(zenity --file-selection --directory  \
+  --title="Select the directory tree root to create ISO image") \
+  || error_exit "Exit on directry selection"
+# Check size of archive
+xterm -T "Check size $DATA_SRC" -e du -s $DATA_SRC/*
+SIZE=$(($(du -s $DATA_SRC | awk '{print $1}')/1024))
+if [ $SIZE -le 520 ] ; then
+  zenity --info --title="Dvdisaster RS02" --width 640  --height 400 \
+    --text="The data size is good for CD backup:\\n $SIZE MB"
+elif [ $SIZE -le 3500 ]; then
+  zenity --info --title="Dvdisaster RS02" --width 640  --height 400 \
+    --text="The data size is good for DVD backup :\\n $SIZE MB"
+else
+  zenity --info --title="Dvdisaster RS02" --width 640  --height 400 \
+    --text="The data size is too big to backup : $SIZE MB"
+  error_exit "The data size is too big to backup :\\n $SIZE MB"
+fi
+# only xterm is sure to have working -e option
+# Create raw ISO image
+xterm -T "genisoimage $DATA_ISO" \
+  -e genisoimage -r -J -V "$LABEL" -o "$DATA_ISO" "$DATA_SRC"
+# Create RS02 supplimental redundancy
+xterm -T "dvdisaster $DATA_ISO" -e  dvdisaster -i "$DATA_ISO" -mRS02 -c
+zenity --info --title="Dvdisaster RS02" --width 640  --height 400 \
+  --text="ISO/RS02 data ($SIZE MB) \\n created at: $DATA_ISO"
+# EOF

debian/patches/02-encryption.patch

@@ -0,0 +1,32 @@
+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(-)
+
+diff --git a/scsi-layer.c b/scsi-layer.c
+index d68533b..6717b12 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -2711,12 +2711,13 @@ Image* OpenImageFromDevice(char *device)
+        	 return NULL;
+       }
+    }
+-
++/*
+    if(dh->mainType == DVD && query_copyright(dh))
+    {  CloseImage(image);
+       Stop(_("This software does not support encrypted media.\n"));
+       return NULL;
+    }
++*/
+ 
+    /* Create the bitmap of simulated defects */
+ 

debian/patches/03-dvdrom.patch

@@ -0,0 +1,29 @@
+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(+)
+
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 6717b12..64a3dba 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -908,6 +908,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only)
+ 	    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;

debian/patches/05-help-dialog.patch

@@ -0,0 +1,55 @@
+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(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 4d6f9bb..eae04f2 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -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>"),
+-	       "COPYING", NULL, NULL);
++	       "/usr/share/common-licenses/GPL-2", NULL, NULL);
+ }
+ 
+ /*
+@@ -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>"),
+-	       "README.MODIFYING", NULL, NULL);
++	       "/usr/share/doc/dvdisaster/README.MODIFYING", NULL, NULL);
+ }
+ 
+ static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
+@@ -746,11 +746,11 @@ void AboutDialog()
+ 			"GPL");
+ 
+ #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");

debian/patches/08-fix-gnu-make-detection.patch

@@ -0,0 +1,41 @@
+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>
+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 f68ecab..d62f5d7 100644
+--- a/scripts/bash-based-configure
++++ b/scripts/bash-based-configure
+@@ -313,13 +313,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

debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch

@@ -0,0 +1,28 @@
+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>
+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;

debian/patches/11-no-cruft.patch

@@ -0,0 +1,58 @@
+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>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 26 --------------------------
+ 1 file changed, 26 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index a3074c7..6fda92b 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -228,12 +228,6 @@ install: dvdisaster manual
+ 	install -d $(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)
+-	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-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 -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 -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..."

debian/patches/12-fix-spelling-of-up-to.patch

@@ -0,0 +1,397 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 06:03:48 +1100
+Subject: Fix spelling: upto -> up to
+
+Description: Fix spelling: upto -> up to
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ debug.c                            |  2 +-
+ documentation/codec-specs/rs01.tex |  2 +-
+ documentation/codec-specs/rs02.tex |  2 +-
+ documentation/dvdisaster.en.1      |  4 ++--
+ documentation/user-manual/qa.tex   |  2 +-
+ dvdisaster.c                       |  2 +-
+ dvdisaster.h                       |  4 ++--
+ locale/cs.po                       |  6 +++---
+ locale/de.po                       |  6 +++---
+ locale/it.po                       |  8 ++++----
+ locale/pt_BR.po                    | 10 +++++-----
+ locale/ru.po                       | 12 ++++++------
+ locale/sv.po                       |  6 +++---
+ preferences.c                      |  4 ++--
+ 14 files changed, 35 insertions(+), 35 deletions(-)
+
+diff --git a/debug.c b/debug.c
+index df70416..b4ffc21 100644
+--- a/debug.c
++++ b/debug.c
+@@ -1023,7 +1023,7 @@ void RawSector(char *arg)
+  *
+  * ./dvdisaster --debug --send-cdb 12,00,00,00,24,00:24
+  *
+- * The first six bytes make up the cdb; cdbs with upto 12 bytes are possible.
++ * The first six bytes make up the cdb; cdbs with up to 12 bytes are possible.
+  * The :24 arg is the allocation length. 
+  * Note that the allocation length must match those specified in the cdb;
+  * differing values may crash the system.
+diff --git a/documentation/codec-specs/rs01.tex b/documentation/codec-specs/rs01.tex
+index ebb1ee5..a8c0d90 100644
+--- a/documentation/codec-specs/rs01.tex
++++ b/documentation/codec-specs/rs01.tex
+@@ -172,7 +172,7 @@ The $d_{i,j}$ denote the $i-th$ byte in the $j-th$ layer.
+ In order to create the first ecc block, bytes $d_{1,1}$ to  $d_{1,n}$ are taken from the
+ $n$ layers. Then the RS(255,k) code is calculated (see appendix \ref{rs} for its parameters)
+ and the 
+-resulting $k$ parity bytes $e_{1,1}$ upto $e_{k,1}$ are stored
++resulting $k$ parity bytes $e_{1,1}$ up to $e_{k,1}$ are stored
+ in the ecc file. The resulting ecc block is marked grey in the
+ figure. The next ecc blocks are calculated and stored accordingly.
+ In total, the ecc section contains $k*ls$ bytes of parity information,
+diff --git a/documentation/codec-specs/rs02.tex b/documentation/codec-specs/rs02.tex
+index 3cf5fb1..c026772 100644
+--- a/documentation/codec-specs/rs02.tex
++++ b/documentation/codec-specs/rs02.tex
+@@ -133,7 +133,7 @@ Its format is described in appendix \ref{eh}. For RS02, only the data fields
+ marked with ``all'' or ``RS02'' are relevant; all other fields should be set to zero.
+ 
+ Data layer $n$ does also contain the CRC32 checksums of each data sector
+-upto the ecc header. If the .iso image contains $s$ sectors, 
++up to the ecc header. If the .iso image contains $s$ sectors,
+ then the CRC field contains $4s$ bytes, rounded up
+ to the nearest multiple of 2048. 
+ CRC32 checksums are calculated over a whole CD sector comprising 2048 bytes.
+diff --git a/documentation/dvdisaster.en.1 b/documentation/dvdisaster.en.1
+index 028c6e0..95faa5a 100644
+--- a/documentation/dvdisaster.en.1
++++ b/documentation/dvdisaster.en.1
+@@ -274,7 +274,7 @@ Selects between the sg (SG_IO) driver (default setting) and the
+ older cdrom (CDROM_SEND_PACKET) driver for accessing the optical drives.
+ Both drivers should work equally well; however the cdrom driver is known
+ to cause system failures on some ancient SCSI controllers. 
+-The older cdrom driver was the default upto and including dvdisaster 0.72.x;
++The older cdrom driver was the default up to and including dvdisaster 0.72.x;
+ if the now pre-selected sg driver changes something to the worse for you
+ please switch back to the older driver using \-\-driver=cdrom.
+ .TP
+@@ -376,7 +376,7 @@ the uncorrected sector instead.
+ .RE
+ .TP
+ .B \-\-read-attempts n-m
+-attempts n upto m reads of a defective sector.
++attempts n up to m reads of a defective sector.
+ .TP
+ .B \-\-read-medium n
+ read the whole medium up to n times.
+diff --git a/documentation/user-manual/qa.tex b/documentation/user-manual/qa.tex
+index 5d4b35a..91befa1 100644
+--- a/documentation/user-manual/qa.tex
++++ b/documentation/user-manual/qa.tex
+@@ -457,6 +457,6 @@ drive for reading images in these cases.}
+ 
+ \qa{``Ecc file has been created with version 0.40.7.''}
+       {Some developer versions of dvdisaster mark their ecc files with a special bit.
+-        This causes dvdisaster versions upto 0.65 to falsely display the above error
++        This causes dvdisaster versions up to 0.65 to falsely display the above error
+         message. Please use the developer versions only together with dvdisaster
+         0.66 or newer versions. }
+diff --git a/dvdisaster.c b/dvdisaster.c
+index a24e599..d549676 100644
+--- a/dvdisaster.c
++++ b/dvdisaster.c
+@@ -917,7 +917,7 @@ int main(int argc, char *argv[])
+       PrintCLI(_("  --old-ds-marker        - mark missing sectors compatible with dvdisaster <= 0.70\n"));
+       PrintCLI(_("  --prefetch-sectors n   - prefetch n sectors for RS03 encoding (uses ~nMiB)\n"));
+       PrintCLI(_("  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"));
+-      PrintCLI(_("  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"));
++      PrintCLI(_("  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"));
+       PrintCLI(_("  --read-medium n        - read the whole medium up to n times\n"));
+       PrintCLI(_("  --read-raw             - performs read in raw mode if possible\n"));
+       PrintCLI(_("  --resource-file p      - get resource file from given path\n"));
+diff --git a/dvdisaster.h b/dvdisaster.h
+index 2507ab9..db2031e 100644
+--- a/dvdisaster.h
++++ b/dvdisaster.h
+@@ -101,7 +101,7 @@
+ 
+ #define MAX_CODEC_THREADS 1024           /* not including IO and GUI */
+ #define MAX_OLD_CACHE_SIZE  8096         /* old cache for RS01/RS02  */
+-#define MAX_PREFETCH_CACHE_SIZE (512*1024)   /* upto 0.5TB RS03  */
++#define MAX_PREFETCH_CACHE_SIZE (512*1024)   /* up to 0.5TB RS03  */
+ 
+ /* Choices for I/O strategy */
+ 
+@@ -364,7 +364,7 @@ typedef struct _LargeFile
+ #define FINGERPRINT_SECTOR 16 /* Sector currently used to calculate the fingerprint. */
+                               /* This is the ISO filesystem root sector which contains */
+                               /* the volume label and creation time stamps. */
+-                              /* Versions upto 0.64 used sector 257, */
++                              /* Versions up to 0.64 used sector 257, */
+                               /* but that was not a wise choice for CD media.*/
+ 
+ #define MFLAG_DEVEL (1<<0)    /* for methodFlags[3] */
+diff --git a/locale/cs.po b/locale/cs.po
+index bdec530..ed1fc65 100644
+--- a/locale/cs.po
++++ b/locale/cs.po
+@@ -658,7 +658,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n           - režim přímého čtení pro CD disky (20 nebo 21)\n"
+ 
+ #: dvdisaster.c:920
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m    - zkusit n až m opakovaných čtení poškozeného sektoru\n"
+ 
+ #: dvdisaster.c:921
+@@ -2000,7 +2000,7 @@ msgstr "Přečtení sektoru nezkoušet více než %d krát"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2072,7 +2072,7 @@ msgstr " krát"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+diff --git a/locale/de.po b/locale/de.po
+index af978eb..bbbfdcc 100644
+--- a/locale/de.po
++++ b/locale/de.po
+@@ -700,7 +700,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n           - \"raw-modus\" zum Lesen von CD (20 or 21)\n"
+ 
+ #: dvdisaster.c:920
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m    - versucht beschädigten Sektor n bis m-mal zu lesen\n"
+ 
+ #: dvdisaster.c:921
+@@ -2057,7 +2057,7 @@ msgstr "Höchstens %d Leseversuche pro Sektor"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2129,7 +2129,7 @@ msgstr " mal lesen"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+diff --git a/locale/it.po b/locale/it.po
+index 9f3a97b..a074339 100644
+--- a/locale/it.po
++++ b/locale/it.po
+@@ -625,7 +625,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:920
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:921
+@@ -1824,7 +1824,7 @@ msgstr ""
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -1883,7 +1883,7 @@ msgstr ""
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+@@ -6054,7 +6054,7 @@ msgstr ""
+ #~ msgstr "Se potete verificate se la dimensione dell'immagine è corretta,\n"
+ 
+ #~ msgid ""
+-#~ "please send in the whole dvdisaster output upto this line\n"
++#~ "please send in the whole dvdisaster output up to this line\n"
+ #~ "to have your drive included in the internal data base.\n"
+ #~ msgstr ""
+ #~ "Prego inviare l'intero output di dvdisaster fino a questa linea\n"
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index b557c84..573531b 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -641,7 +641,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n            - modo para leitura de mídia CD em modo raw (20 ou 21)\n"
+ 
+ #: dvdisaster.c:920
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m     - tenta de n a m leituras em um setor defeituoso\n"
+ 
+ #: dvdisaster.c:921
+@@ -1935,7 +1935,7 @@ msgstr "Máx. de %d tentativas de leitura por setor"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2007,7 +2007,7 @@ msgstr " vezes"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+@@ -6450,7 +6450,7 @@ msgstr "<i>Novidades dessa versão:</i>"
+ #~ "  --internal-rereads n   - drive may attempt n rereads before reporting an error\n"
+ #~ "  --query-size n         - query drive/udf/ecc for image size (default: ecc)\n"
+ #~ "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+-#~ "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++#~ "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ #~ "  --read-medium n        - read the whole medium up to n times\n"
+ #~ "  --read-raw             - performs read in raw mode if possible\n"
+ #~ "  --speed-warning n      - print warning if speed changes by more than n percent\n"
+@@ -6469,7 +6469,7 @@ msgstr "<i>Novidades dessa versão:</i>"
+ #~ msgid ""
+ #~ "<b>File splitting</b>\n"
+ #~ "\n"
+-#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over upto 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
++#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over up to 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
+ #~ msgstr ""
+ #~ "<b>Separação de arquivos</b>\n"
+ #~ "\n"
+diff --git a/locale/ru.po b/locale/ru.po
+index 34b1796..a9fc25c 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -640,7 +640,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n           - режим для низкоуровневого чтения CD-носителей (20 или 21)\n"
+ 
+ #: dvdisaster.c:920
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m    - делается от n до m попыток чтения поврежденного сектора\n"
+ 
+ #: dvdisaster.c:921
+@@ -1938,7 +1938,7 @@ msgstr "Макс. %d попыток чтения на сектор"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2010,7 +2010,7 @@ msgstr " раз"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+@@ -6511,7 +6511,7 @@ msgstr "<i>Новое в этой версии:</i>"
+ #~ "  --internal-rereads n   - drive may attempt n rereads before reporting an error\n"
+ #~ "  --query-size n         - query drive/udf/ecc for image size (default: ecc)\n"
+ #~ "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+-#~ "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++#~ "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ #~ "  --read-medium n        - read the whole medium up to n times\n"
+ #~ "  --read-raw             - performs read in raw mode if possible\n"
+ #~ "  --speed-warning n      - print warning if speed changes by more than n percent\n"
+@@ -6528,7 +6528,7 @@ msgstr "<i>Новое в этой версии:</i>"
+ #~ msgid ""
+ #~ "<b>File splitting</b>\n"
+ #~ "\n"
+-#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over upto 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
++#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over up to 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
+ #~ msgstr ""
+ #~ "<b>Разбиение файлов</b>\n"
+ #~ "\n"
+@@ -6574,7 +6574,7 @@ msgstr "<i>Новое в этой версии:</i>"
+ #~ "  --internal-rereads n   - drive may attempt n rereads before reporting an error\n"
+ #~ "  --query-size n         - query drive/udf/ecc for image size (default: ecc)\n"
+ #~ "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+-#~ "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++#~ "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ #~ "  --read-medium n        - read the whole medium up to n times\n"
+ #~ "  --read-raw             - performs read in raw mode if possible\n"
+ #~ "  --speed-warning n      - print warning if speed changes by more than n percent\n"
+diff --git a/locale/sv.po b/locale/sv.po
+index f69035e..9f70808 100644
+--- a/locale/sv.po
++++ b/locale/sv.po
+@@ -626,7 +626,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:920
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:921
+@@ -1830,7 +1830,7 @@ msgstr ""
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -1889,7 +1889,7 @@ msgstr ""
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+diff --git a/preferences.c b/preferences.c
+index 4f1fe5c..f5ef889 100644
+--- a/preferences.c
++++ b/preferences.c
+@@ -2221,7 +2221,7 @@ void CreatePreferencesWindow(void)
+ 		       _("<b>Maximum number of reading attempts</b>\n\n"
+ 			 "When the minimum number of reading attempts is reached "
+ 			 "without success, dvdisaster might choose to perform additional "
+-			 "reading attempts upto this number.\n\n"
++			 "reading attempts up to this number.\n\n"
+ 
+ 			 "The decision to do more attempts depends on the quality of "
+ 			 "data gathered so far, which in turn is influenced by the "
+@@ -2336,7 +2336,7 @@ void CreatePreferencesWindow(void)
+       AddHelpParagraph(lwoh, 
+ 		       _("<b>Media read attempts</b> for the linear reading strategy\n\n"
+ 			 "If unreadable sectors remain after reading the medium from start to end, "
+-			 "the medium is read again upto he given number of times.\n\n"
++			 "the medium is read again up to he given number of times.\n\n"
+ 			 "Only the missing sectors will be tried in the additional reading passes."));
+ 
+       /** Defective sector caching */

debian/patches/13-fix-missing-language-field-in-po-files.patch

@@ -0,0 +1,41 @@
+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>
+Forwarded: no
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ locale/pt_BR.po | 2 +-
+ locale/ru.po    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index 573531b..04b33b5 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -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"
+diff --git a/locale/ru.po b/locale/ru.po
+index a9fc25c..6cd3789 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -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"

debian/patches/14-make-builds-reproducible.patch

@@ -0,0 +1,31 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 09:39:49 +1100
+Subject: Make builds reproducible.
+
+Description: Make builds reproducible.
+ Use the Debian changelog details to derive a build number and date,
+ so that we can make reproducible binaries.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2016-12-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scripts/time-stamper.bash | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/time-stamper.bash b/scripts/time-stamper.bash
+index fd28794..60fe91a 100755
+--- a/scripts/time-stamper.bash
++++ b/scripts/time-stamper.bash
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+ 
+-build=$(grep BUILD $1  | cut -d\  -f3)
+-build=$((build+1))
++# Use Debian changelog details to derive build number and date.
++build=$(dpkg-parsechangelog -S Version | sed 's/.*-\([0-9]\+\).*/\1/')
+ echo "#define BUILD $build" >$1
+-date=$(date +"%d.%m.%y (%A, %H:%M)")
++date=$(date --date="$(dpkg-parsechangelog -S Date)" +"%d.%m.%y (%A, %H:%M)")
+ echo "#define BDATE \"$date\"" >>$1

debian/patches/15-show-new-pkg-tracker.patch

@@ -0,0 +1,28 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 12:02:51 +1100
+Subject: Update help dialog to show link to the new Debian package tracker.
+
+Description: Update help dialog to show link to the new Debian
+ package tracker.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2016-12-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index eae04f2..c89c552 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -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"),
+-			     "http://packages.qa.debian.org/dvdisaster");
++			     "https://tracker.debian.org/pkg/dvdisaster");
+ 
+ #else
+    lang = g_getenv("LANG");

debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch

@@ -0,0 +1,33 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 22 Dec 2016 02:20:30 +1100
+Subject: Don't build and install documentation automatically.
+
+Description: Don't build and install documentation automatically.
+ This allows for better control over binary-arch and binary-indep builds.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index 6fda92b..d9bef11 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -223,12 +223,11 @@ show:
+ .PHONY : install uninstall clean distclean arch
+ .PHONY : srcdist
+ 
+-install: dvdisaster manual
++install: dvdisaster
+ 	@echo "Installing package..."
+ 	install -d $(BUILDROOT)$(BINDIR)
+ 	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)/de/man1
+ 	cd documentation; \

debian/patches/17-fix-all-but-deprecated-api-warnings.patch

@@ -0,0 +1,312 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 22 Dec 2016 11:19:20 +1100
+Subject: Fix all warnings except for those related to deprecated API.
+
+Description: Fix all warnings except for those related to deprecated API.
+Author: Carlos Maddela <e7appew@gmail.com>
+Bug-Debian: https://bugs.debian.org/748416
+Forwarded: no
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ closure.c     |  8 +++++---
+ curve.c       |  2 +-
+ menubar.c     |  2 +-
+ rs01-create.c | 10 +++++-----
+ rs01-verify.c |  2 +-
+ rs03-create.c | 24 ++++++++++++------------
+ rs03-fix.c    |  8 ++++----
+ scsi-layer.c  |  4 ++++
+ smart-lec.c   | 10 +++++-----
+ 9 files changed, 38 insertions(+), 32 deletions(-)
+
+diff --git a/closure.c b/closure.c
+index 7568cba..0e2f889 100644
+--- a/closure.c
++++ b/closure.c
+@@ -196,7 +196,7 @@ void ReadDotfile()
+       /* Get first MAX_LINE_LEN bytes of line, discard the rest */
+      
+       line[MAX_LINE_LEN-1] = 1;
+-      fgets(line, MAX_LINE_LEN, dotfile);
++      if(!fgets(line, MAX_LINE_LEN, dotfile)) break;
+       if(!line[MAX_LINE_LEN-1])  /* line longer than buffer */
+ 	while(!feof(dotfile) && fgetc(dotfile) != '\n')
+ 	  ;
+@@ -225,12 +225,14 @@ void ReadDotfile()
+       if(!strcmp(symbol, "last-image"))      { g_free(Closure->imageName);
+ 	                                       if(!strcmp(value, "none"))
+ 						    Closure->imageName = g_strdup("");
+-					       else Closure->imageName = g_strdup(value); continue; 
++					       else Closure->imageName = g_strdup(value);
++					       continue;
+                                              }
+       if(!strcmp(symbol, "last-ecc"))        { g_free(Closure->eccName);
+ 	                                       if(!strcmp(value, "none"))
+ 						    Closure->eccName = g_strdup("");
+-                                               else Closure->eccName = g_strdup(value); continue; 
++                                               else Closure->eccName = g_strdup(value);
++					       continue;
+                                              }
+       if(!strcmp(symbol, "adaptive-read"))   { Closure->adaptiveRead   = atoi(value); continue; }
+       if(!strcmp(symbol, "auto-suffix"))     { Closure->autoSuffix  = atoi(value); continue; }
+diff --git a/curve.c b/curve.c
+index 668bc40..61b81a9 100644
+--- a/curve.c
++++ b/curve.c
+@@ -123,7 +123,7 @@ int CurveLogY(Curve *curve, gdouble y) /* not really a log */
+    hfact = (gdouble)(curve->bottomLY - curve->topLY);
+  
+    if(y==1) return curve->bottomLY - ((log(2)/log(curve->logMaxY)) * hfact)/2;
+-            return curve->bottomLY - (log(y)/log(curve->logMaxY)) * hfact;
++   return curve->bottomLY - (log(y)/log(curve->logMaxY)) * hfact;
+ }
+ 
+ /***
+diff --git a/menubar.c b/menubar.c
+index 8258cfd..12f1933 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -414,7 +414,7 @@ void set_path(GtkWidget *entry, char *path)
+    else
+    {  char buf[PATH_MAX + strlen(path) + 2];
+ 
+-      getcwd(buf, PATH_MAX);
++      if(!getcwd(buf, PATH_MAX)) return;
+       strcat(buf,"/");
+ 
+       strcat(buf,path);
+diff --git a/rs01-create.c b/rs01-create.c
+index 5cad591..88c352a 100644
+--- a/rs01-create.c
++++ b/rs01-create.c
+@@ -107,12 +107,12 @@ static void unlink_image(GtkWidget *label)
+ 		       _("\nImage file %s deleted.\n"), Closure->imageName);
+    }
+    else 
+-   {  if(!Closure->guiMode)
+-       PrintLog("\n");
++   {    if(!Closure->guiMode)
++	  PrintLog("\n");
+ 
+-       ModalWarning(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, NULL,
+-		    _("Image file %s not deleted: %s\n"),
+-		    Closure->imageName, strerror(errno));
++        ModalWarning(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, NULL,
++		     _("Image file %s not deleted: %s\n"),
++		     Closure->imageName, strerror(errno));
+    }
+ }
+ 
+diff --git a/rs01-verify.c b/rs01-verify.c
+index 3315659..431a6d0 100644
+--- a/rs01-verify.c
++++ b/rs01-verify.c
+@@ -830,7 +830,7 @@ process_ecc:
+       {  if(!Closure->guiMode)
+ 	      PrintProgress(_("- ecc md5sum       : %3d%%"),percent);
+ 	 else SetLabelText(GTK_LABEL(wl->cmpEccMd5Sum), "%3d%%", percent);
+-	      last_percent = percent;
++	 last_percent = percent;
+       }
+ 
+       if(Closure->stopActions)   
+diff --git a/rs03-create.c b/rs03-create.c
+index 40066d2..b2c6033 100644
+--- a/rs03-create.c
++++ b/rs03-create.c
+@@ -31,9 +31,9 @@
+ 
+ //#define VERBOSE 1
+ #ifdef VERBOSE
+-  #define verbose(format,args...) printf(format, ## args)
++  #define verbose(format,...) printf(format, __VA_ARGS__)
+ #else
+-  #define verbose(format,args...)
++  #define verbose(format,...)
+ #endif
+ 
+ #ifdef HAVE_MMAP
+@@ -688,7 +688,7 @@ static void flush_crc(ecc_closure *ec, LargeFile *file_out)
+ 
+    /* Write out the CRC layer */
+       
+-   verbose("IO: writing CRC layer\n");
++   verbose("%s", "IO: writing CRC layer\n");
+    crc_sect = 2048*(ec->encoderChunk+lay->firstCrcPos);
+    if(!LargeSeek(file_out, crc_sect))
+    {  ec->abortImmediately = TRUE;
+@@ -709,7 +709,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
+ 
+    /* Write out the created parity. */
+ 
+-   verbose("IO: writing parity...\n");
++   verbose("%s", "IO: writing parity...\n");
+    for(k=0; k<lay->nroots; k++)
+    {  gint64 idx=0;
+ 
+@@ -726,7 +726,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
+ 	 }
+       }
+    }
+-   verbose("IO: parity written.\n");
++   verbose("%s", "IO: parity written.\n");
+ }
+ 
+ static gpointer io_thread(ecc_closure *ec)
+@@ -741,7 +741,7 @@ static gpointer io_thread(ecc_closure *ec)
+    int parity_available = 0;
+    int i;
+ 
+-   verbose("Reader thread initializing\n");
++   verbose("%s", "Reader thread initializing\n");
+ 
+    /*** Allocate local parity buffer aligned at 128bit boundary */
+ 
+@@ -809,7 +809,7 @@ static gpointer io_thread(ecc_closure *ec)
+       {  read_next_chunk(ec, chunk);
+ 	 //	 flush_crc(ec, file_out);  // FIXME
+ 	 needs_preload = 0;
+-	 verbose("IO: first chunk loaded\n");
++	 verbose("%s", "IO: first chunk loaded\n");
+ 	 continue;
+       }
+ 
+@@ -856,7 +856,7 @@ static gpointer io_thread(ecc_closure *ec)
+       g_mutex_lock(ec->lock);
+       cpu_bound = ec->buffersToEncode;
+       while(ec->buffersToEncode)
+-      {  verbose("IO: Waiting for encoders to finish\n");
++      {  verbose("%s", "IO: Waiting for encoders to finish\n");
+ 	 g_cond_wait(ec->ioCond, ec->lock);
+       }
+       g_mutex_unlock(ec->lock);
+@@ -898,7 +898,7 @@ static gpointer io_thread(ecc_closure *ec)
+    ec->slicesFree = TRUE;  /* we have saved the slices; go ahead */
+    g_cond_broadcast(ec->ioCond);
+    while(ec->buffersToEncode)
+-   {  verbose("IO: Waiting for encoders to finish last chunk\n");
++   {  verbose("%s", "IO: Waiting for encoders to finish last chunk\n");
+       g_cond_wait(ec->ioCond, ec->lock);
+    }
+    g_mutex_unlock(ec->lock);
+@@ -911,7 +911,7 @@ static gpointer io_thread(ecc_closure *ec)
+    flush_crc(ec, file_out);
+    flush_parity(ec, file_out);
+ 
+-   verbose("IO: finished\n"); fflush(stdout);
++   verbose("%s", "IO: finished\n"); fflush(stdout);
+    return NULL;
+ }
+ 
+@@ -1098,7 +1098,7 @@ static gpointer encoder_thread(ecc_closure *ec)
+       ec->buffersToEncode-=enc_size;
+       if(!ec->buffersToEncode)
+       {  g_cond_broadcast(ec->ioCond);
+-	 verbose("ENC: processed last buffer; telling IO process.\n");
++	 verbose("%s", "ENC: processed last buffer; telling IO process.\n");
+ 	 fflush(stdout);
+       }
+       g_mutex_unlock(ec->lock);
+@@ -1198,7 +1198,7 @@ static void create_reed_solomon(ecc_closure *ec)
+       verbose("SCHED: joined with worker %d\n", i);
+       fflush(stdout);
+    }
+-   verbose("SCHED: scheduler finished.\n");
++   verbose("%s", "SCHED: scheduler finished.\n");
+ }
+ 
+ /***
+diff --git a/rs03-fix.c b/rs03-fix.c
+index 0a7a1d3..e162e5e 100644
+--- a/rs03-fix.c
++++ b/rs03-fix.c
+@@ -829,10 +829,10 @@ void RS03Fix(Image *image)
+ 	      if we were processing an augmented image. */
+ 
+ 	   if(lay->target == ECC_FILE && i >= ndata-1)
+-	   {  
+-              if(!LargeSeek(image->eccFile, (gint64)(2048*sec)))
+-		 Stop(_("Failed seeking to sector %lld in ecc file [%s]: %s"),
+-		      sec, "FW", strerror(errno));
++	   {
++		 if(!LargeSeek(image->eccFile, (gint64)(2048*sec)))
++		    Stop(_("Failed seeking to sector %lld in ecc file [%s]: %s"),
++			 sec, "FW", strerror(errno));
+ 
+ 		 n = LargeWrite(image->eccFile, cache_offset+fc->imgBlock[i], 2048);
+ 		 if(n != 2048)
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 64a3dba..3be21ff 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -31,7 +31,9 @@
+ 
+ static int query_type(DeviceHandle*, int);
+ static gint64 query_size(Image*);
++#if 0
+ static int query_copyright(DeviceHandle*);
++#endif
+ 
+ static int read_dvd_sector(DeviceHandle*, unsigned char*, int, int);
+ static int read_cd_sector(DeviceHandle*, unsigned char*, int, int);
+@@ -1649,6 +1651,7 @@ reset_mode_page:
+  * Find out whether we are allowed to create an image from the DVD.
+  */
+ 
++#if 0
+ static int query_copyright(DeviceHandle *dh)
+ {  Sense sense;
+    AlignedBuffer *ab = CreateAlignedBuffer(2048);
+@@ -1709,6 +1712,7 @@ static int query_copyright(DeviceHandle *dh)
+ 
+    return result;
+ }
++#endif
+ 
+ /*
+  * See whether a sector lies within the user area.
+diff --git a/smart-lec.c b/smart-lec.c
+index 8da74ff..0355879 100644
+--- a/smart-lec.c
++++ b/smart-lec.c
+@@ -27,9 +27,9 @@
+ 
+ #define VERBOSE 1
+ #ifdef VERBOSE
+-  #define verbose(format,args...) printf(format, ## args)
++  #define verbose(format,...) printf(format, __VA_ARGS__)
+ #else
+-  #define verbose(format,args...)
++  #define verbose(format,...)
+ #endif
+ 
+ /***
+@@ -432,7 +432,7 @@ static void update_pq_state(sh_context *shc)
+ static void print_pq_state(sh_context *shc)
+ {  int i;
+ 
+-   verbose("PQ states: \n");
++   verbose("%s", "PQ states: \n");
+ 
+    for(i=0; i<N_P_VECTORS; i++)
+    {  if(shc->pState[i] == 1)
+@@ -1354,7 +1354,7 @@ static void swap_p_for_new_improvement(sh_context *shc)
+ 		  count++;
+ 
+ 	    if(count < 2)
+-	    {  verbose(" pruned");
++	    {  verbose("%s", " pruned");
+ 	       goto decrement;
+ 	    }
+ 
+@@ -1417,7 +1417,7 @@ decrement:
+ 	    if(index >= n_q) break;
+ 	    selection[index]=0;
+ 
+-	    verbose("\n");
++	    verbose("%s", "\n");
+ 	 }
+       }
+    }

debian/patches/18-update-copyright-in-about-dialog.patch

@@ -0,0 +1,30 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 21 Dec 2016 07:25:17 +1100
+Subject: Update copyright notice in about dialog.
+
+Description: Update copyright notice in about dialog.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index c89c552..0f4e3b2 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -723,8 +723,9 @@ void AboutDialog()
+    g_free(text);
+ 
+ #ifdef MODIFIED_SOURCE
+-   AboutTextWithLink(vbox, 
+-		     _("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-2015 Carsten Gnoerlich"),
+ 		     "MODIFYING");
+ #else

debian/patches/19-show-text-files-with-abs-path.patch

@@ -0,0 +1,43 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 21 Dec 2016 09:08:05 +1100
+Subject: Allow ShowTextFile() to work with absolute path names.
+
+Description: Allow ShowTextFile() to work with absolute path names.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 0f4e3b2..6214429 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -423,6 +423,24 @@ char *find_file(char *file, size_t *size, char *lang)
+       lang_suffix[1] = lang[1];
+    }
+ 
++   /* Test for absolute path first. */
++   if(*file == '/')
++   {
++      if(lang)
++	 path = g_strdup_printf("%s.%s", file, lang_suffix);
++      else
++	 path = g_strdup(file);
++
++      if(LargeStat(path, &stat_size))
++      {
++	 *size = stat_size;
++	 return path;
++      }
++
++      g_free(path);
++      return NULL;
++   }
++
+    /* Try file in bin dir */
+ 
+    if(Closure->binDir) 

debian/patches/20-display-changelog-credits-and-todo.patch

@@ -0,0 +1,46 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 21 Dec 2016 09:59:58 +1100
+Subject: Fix display of changelog, credits and to-do files.
+
+Description: Fix display of changelog, credits and to-do files.
+ Use absolute paths to compensate for the fact that we don't install
+ duplicates in /usr/share/doc/dvdisaster-doc or build with source
+ path embedded anymore.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ menubar.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/menubar.c b/menubar.c
+index 12f1933..15ce4ad 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -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>"),
+-		     "CHANGELOG", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/CHANGELOG", NULL, NULL);
+ 	break;
+ 
+       case MENU_HELP_CREDITS:
+         ShowTextfile(_("windowtitle|Credits"), 
+ 		     _("<big>Credits</big>\n"
+ 		       "<i>Thanks go out to...</i>"),
+-		     "CREDITS", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/CREDITS", NULL, NULL);
+ 	break;
+ 
+       case MENU_HELP_TODO:
+ 	ShowTextfile(_("windowtitle|To do list"), 
+ 		     _("<big>To do list</big>\n"
+ 		       "<i>A sneak preview of coming features ... perhaps ;-)</i>"),
+-		     "TODO", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/TODO", NULL, NULL);
+ 	break;
+ 
+       default:

debian/patches/22-fix-hurd-i386-ftbfs.patch

@@ -0,0 +1,31 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 4 Jan 2017 03:55:58 +1100
+Subject: Fix FTBFS for hurd-i386.
+
+Description: Fix FTBFS for hurd-i386.
+ Hurd does not have path length restrictions, so doesn't define
+ PATH_MAX. Assuming a PATH_MAX of 4096 as a quick workaround.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2017-01-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ menubar.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/menubar.c b/menubar.c
+index 15ce4ad..df4203c 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -24,6 +24,10 @@
+ 
+ #include <limits.h>
+ 
++#ifndef PATH_MAX
++  #define PATH_MAX 4096
++#endif
++
+ /***
+  *** Forward declarations
+  ***/

debian/patches/23-add-bdrom-support.patch

@@ -0,0 +1,32 @@
+From: Corey Wright <undefined@pobox.com>
+Date: Sat, 24 Sep 2016 14:16:10 -0500
+Subject: Add support for BD-ROM media-type.
+
+Description: Add support for BD-ROM media-type.
+ The attached patch adds support to dvdisaster for the BD-ROM
+ media-type.  This allows dvdisaster to scan and read (ie create ISO
+ images of) BD-ROM media.
+Author: Corey Write <undefined@pobox.com>
+Origin: other, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849518;filename=dvdisaster-add_bdrom_support.patch;msg=5
+Bug-Debian: https://bugs.debian.org/849518
+Forwarded: no
+Last-Update: 2016-12-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scsi-layer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 3be21ff..b70a4a4 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -1029,7 +1029,7 @@ static int query_bd(DeviceHandle *dh, int probe_only)
+ 
+    if(!strncmp((char*)&buf[4+8], "BDO", 3))
+    {  dh->typeDescr = g_strdup("BD-ROM");
+-      dh->subType = UNSUPPORTED;
++      dh->subType = BD;
+    }
+ 
+    if(!strncmp((char*)&buf[4+8], "BDW", 3))

debian/patches/24-show-gpl3-license.patch

@@ -0,0 +1,27 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 14:36:27 +1100
+Subject: Update help dialog to show GPL-3 license.
+
+Description: Update help dialog to show GPL-3 license.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 6214429..5065e76 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -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>"),
+-	       "/usr/share/common-licenses/GPL-2", NULL, NULL);
++	       "/usr/share/common-licenses/GPL-3", NULL, NULL);
+ }
+ 
+ /*

debian/patches/25-fix-man-pages.patch

@@ -0,0 +1,32 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 18:51:49 +1100
+Subject: Fix generated man pages.
+
+Description: Fix generated man pages.
+ The generated man pages incorrectly direct users to the directory of
+ the old HTML documentation, which is no longer available.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index d9bef11..d80932d 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -232,9 +232,9 @@ install: dvdisaster
+ 	install -d $(BUILDROOT)$(MANDIR)/de/man1
+ 	cd documentation; \
+ 	  ESCAPED_DOCSUBDIR=`echo $(DOCSUBDIR) | sed -e 's/\//\\\\\//g'`; \
+-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/html/" <dvdisaster.en.1 >dvdisaster.updated; \
++	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.en.1 >dvdisaster.updated; \
+ 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/man1/dvdisaster.1; \
+-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/html/" <dvdisaster.de.1 >dvdisaster.updated; \
++	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.de.1 >dvdisaster.updated; \
+ 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/de/man1/dvdisaster.1; \
+ 	  rm dvdisaster.updated
+ 	if echo $(WITH_OPTIONS) | grep "NLS_YES" >/dev/null; then \

debian/patches/26-fix-display-of-manual.pdf.patch

@@ -0,0 +1,47 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 18:59:30 +1100
+Subject: Fix display of manual.pdf.
+
+Description: Fix display of manual.pdf.
+ The PDF file is automatically compressed by Debhelper, so we need to
+ account for this.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ show-manual.c    | 4 ++--
+ welcome-window.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/show-manual.c b/show-manual.c
+index d53c9a5..ecb0922 100644
+--- a/show-manual.c
++++ b/show-manual.c
+@@ -287,8 +287,8 @@ void ShowPDF(char *target)
+ 
+    /* If no target is given, show the manual. */
+ 
+-   if(!target) 
+-   {    bi->path = g_strdup_printf("%s/manual.pdf",Closure->docDir); 
++   if(!target)
++   {    bi->path = g_strdup_printf("%s/manual.pdf.gz",Closure->docDir);
+    }
+    else 
+       if(*target != '/') bi->path = g_strdup_printf("%s/%s",Closure->docDir, target); 
+diff --git a/welcome-window.c b/welcome-window.c
+index 1046bc8..3261b7c 100644
+--- a/welcome-window.c
++++ b/welcome-window.c
+@@ -138,8 +138,8 @@ void CreateWelcomePage(GtkNotebook *notebook)
+    AboutText(box, _("\ndvdisaster creates error correction data to protect\n"
+ 		    "optical media (CD,DVD,BD) against data loss.\n"));
+ 
+-   AboutTextWithLink(box, _("Please see the [manual] for typical uses of dvdisaster.\n\n"), 
+-		     "manual.pdf");
++   AboutTextWithLink(box, _("Please see the [manual] for typical uses of dvdisaster.\n\n"),
++		     "manual.pdf.gz");
+ 
+    AboutText(box, _("<i>New in this Version:</i>"));
+ 

debian/patches/27-allow-opening-in-browser-again.patch

@@ -0,0 +1,485 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 19:11:38 +1100
+Subject: Resurrect old code to support opening URLs in a browser.
+
+Description: Resurrect old code to support opening URLs in a browser.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ closure.c      |   2 +
+ dvdisaster.h   |   7 +
+ help-dialogs.c |   3 +-
+ show-html.c    | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 413 insertions(+), 1 deletion(-)
+ create mode 100644 show-html.c
+
+diff --git a/closure.c b/closure.c
+index 0e2f889..632c103 100644
+--- a/closure.c
++++ b/closure.c
+@@ -467,6 +467,7 @@ void InitClosure()
+    Closure->deviceNames = g_ptr_array_new();
+    Closure->deviceNodes = g_ptr_array_new();
+    Closure->viewer      = g_strdup("xdg-open");
++   Closure->browser      = g_strdup("xdg-open");
+    Closure->methodList  = g_ptr_array_new();
+    Closure->methodName  = g_strdup("RS01");
+    Closure->dDumpDir    = g_strdup(Closure->homeDir);
+@@ -598,6 +599,7 @@ void FreeClosure()
+    cond_free(Closure->binDir);
+    cond_free(Closure->docDir);
+    cond_free(Closure->viewer);
++   cond_free(Closure->browser);
+    cond_free(Closure->errorTitle);
+    cond_free(Closure->simulateCD);
+    cond_free(Closure->dDumpDir);
+diff --git a/dvdisaster.h b/dvdisaster.h
+index db2031e..22eab5a 100644
+--- a/dvdisaster.h
++++ b/dvdisaster.h
+@@ -213,6 +213,7 @@ typedef struct _GlobalClosure
+    char *binDir;        /* place where the binary resides */
+    char *docDir;        /* place where our documentation resides */
+    char *viewer;        /* Name of preferred PDF viewer */
++   char *browser;       /* Name of preferred browser */
+ 
+    GMutex progressLock; /* A mutex protected the stuff below */
+    char bs[256];        /* A string of 255 backspace characters */
+@@ -1299,6 +1300,12 @@ int ProbeAltiVec(void);
+ void ShowPDF(char*);
+ 
+ /***
++ *** show-html.c
++ ***/
++
++void ShowHTML(char*);
++
++/***
+  *** smart-lec.c
+  ***/
+ 
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 5065e76..3874463 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -599,7 +599,8 @@ static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
+    {  case GDK_BUTTON_PRESS: 
+         if(!inside) return FALSE; /* Defect in certain Gtk versions? */
+         if(!strcmp(label,"GPL")) ShowGPL(); 
+-        else if(!strcmp(label,"MODIFYING")) show_modifying(); 
++        else if(!strcmp(label,"MODIFYING")) show_modifying();
++        else if(strlen(label) > 4 && !strncmp(label, "http", 4)) ShowHTML(g_strdup(label));
+         else ShowPDF(g_strdup(label));
+ 	break; 
+       case GDK_ENTER_NOTIFY: 
+diff --git a/show-html.c b/show-html.c
+new file mode 100644
+index 0000000..608e8ec
+--- /dev/null
++++ b/show-html.c
+@@ -0,0 +1,402 @@
++/*  dvdisaster: Additional error correction for optical media.
++ *  Copyright (C) 2004-2012 Carsten Gnoerlich.
++ *  Project home page: http://www.dvdisaster.com
++ *  Email: carsten@dvdisaster.com  -or-  cgnoerlich@fsfe.org
++ *
++ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA,
++ *  or direct your browser at http://www.gnu.org.
++ */
++
++#include "dvdisaster.h"
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#include <sys/wait.h>
++#endif
++
++#ifdef SYS_MINGW
++#include "windows.h"
++#include "shellapi.h"
++#endif
++
++/***
++ *** Ask user to specify his browser
++ ***/
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++
++#define SEARCH_BUTTON 1
++
++typedef struct
++{  GtkWidget *dialog;
++   GtkWidget *entry;
++   GtkWidget *search;
++   GtkWidget *filesel;
++   GtkWidget *fileok;
++   GtkWidget *filecancel;
++   char *url;
++} browser_dialog_info;
++
++static void response_cb(GtkWidget *widget, int response, gpointer data)
++{  browser_dialog_info *bdi = (browser_dialog_info*)data; 
++
++   switch(response)
++   {  case GTK_RESPONSE_ACCEPT:
++	if(Closure->browser) g_free(Closure->browser);
++	Closure->browser = g_strdup(gtk_entry_get_text(GTK_ENTRY(bdi->entry)));
++	ShowHTML(bdi->url);
++	break;
++
++      case GTK_RESPONSE_REJECT:
++	if(bdi->url) g_free(bdi->url);
++        break;
++   }
++   gtk_widget_destroy(widget);
++   if(bdi->filesel)
++     gtk_widget_destroy(bdi->filesel);
++   g_free(bdi);
++}
++
++static void search_cb(GtkWidget *widget, gpointer data)
++{  browser_dialog_info *bdi = (browser_dialog_info*)data; 
++
++   if(widget == bdi->search) 
++   {  bdi->filesel = gtk_file_selection_new(_utf("windowtitle|Choose a browser"));
++      bdi->fileok = GTK_FILE_SELECTION(bdi->filesel)->ok_button;
++      bdi->filecancel = GTK_FILE_SELECTION(bdi->filesel)->cancel_button;
++      ReverseCancelOK(GTK_DIALOG(bdi->filesel));
++      gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(bdi->filesel));
++      g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(bdi->filesel)->ok_button), "clicked", 
++		       G_CALLBACK(search_cb), bdi);
++    
++      g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(bdi->filesel)->cancel_button), "clicked", 
++		       G_CALLBACK(search_cb), bdi);
++      
++      gtk_widget_show(bdi->filesel);
++   }
++
++   if(widget == bdi->fileok)
++   {
++      if(Closure->browser) g_free(Closure->browser);
++      Closure->browser = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(bdi->filesel)));
++      ShowHTML(bdi->url);
++      gtk_widget_destroy(bdi->filesel);
++      gtk_widget_destroy(bdi->dialog);
++      g_free(bdi);
++      return;
++   }
++
++   if(widget == bdi->filecancel)
++   {  gtk_widget_destroy(bdi->filesel);
++      bdi->filesel = NULL;
++   }
++}
++
++static void browser_dialog(char *url)
++{  GtkWidget *dialog, *vbox, *hbox, *label, *entry, *button;
++   browser_dialog_info *bdi = g_malloc0(sizeof(browser_dialog_info));
++
++   /* Create the dialog */
++
++   dialog = gtk_dialog_new_with_buttons(_utf("windowtitle|Browser required"), 
++				       Closure->window, GTK_DIALOG_DESTROY_WITH_PARENT,
++				       GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, 
++				       GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
++   bdi->dialog = dialog;
++   if(url)
++   {  bdi->url = g_strdup(url);
++   }
++
++   vbox = gtk_vbox_new(FALSE, 0);
++   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, FALSE, FALSE, 0);
++   gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
++
++   /* Insert the contents */
++
++   label = gtk_label_new(NULL);
++   gtk_label_set_markup(GTK_LABEL(label), _utf("<b>Could not find a suitable browser.</b>\n\n"
++                                               "Which browser would you like to use\n"
++                                               "for reading the online documentation?\n\n"
++			                       "Please enter its name (e.g. mozilla) or\n"
++			                       "use the \"Search\" button for a file dialog.\n")),
++			      gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 10);
++
++   hbox = gtk_hbox_new(FALSE, 0);
++   gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 10);
++
++   bdi->entry = entry = gtk_entry_new();
++   gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 10);
++
++   bdi->search = button = gtk_button_new_with_label(_utf("Search"));
++   g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(search_cb), bdi);
++   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 10);
++
++   /* Show it */
++
++   g_signal_connect(dialog, "response", G_CALLBACK(response_cb), bdi);
++
++   gtk_widget_show_all(dialog);
++}
++#endif /* SYS_ unix-like */
++
++/***
++ *** Show the manual in an external browser
++ ***/
++
++/*
++ * Check the child processes exit status
++ * to find whether the browser could be invoked.
++ */
++
++typedef struct
++{  pid_t pid;
++   char *url;
++   GtkWidget *msg;
++   int seconds;
++} browser_info;
++
++
++static void msg_destroy_cb(GtkWidget *widget, gpointer data)
++{  browser_info *bi = (browser_info*)data;
++
++   bi->msg = NULL; 
++}
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) ||  defined(SYS_NETBSD)
++
++/* 
++ * The following list of browsers and html wrappers
++ * will be tried one at a time until one entry succeeds by:
++ * - returning zero
++ * - not returning within 60 seconds
++ */
++
++static int browser_index;
++static void try_browser(browser_info*);
++
++static char *browsers[] = 
++{  "user-selection",
++   "xdg-open",
++   "gnome-open",
++   "htmlview",
++   "firefox",
++   "mozilla",
++   "konqueror",
++   "epiphany",
++   "opera",
++   "/Applications/Safari.app/Contents/MacOS/Safari",  /* better way to do this? */
++   NULL
++};
++
++static gboolean browser_timeout_func(gpointer data)
++{  browser_info *bi = (browser_info*)data;
++   int status;
++
++   waitpid(bi->pid, &status, WNOHANG);
++
++   /* At least mozilla returns random values under FreeBSD on success,
++      so we can't rely on the return value exept our own 110 one. */
++
++   if(WIFEXITED(status))
++   {
++      switch(WEXITSTATUS(status))
++      {  case 110: /* browser did not execute */
++	   browser_index++;
++	   if(!browsers[browser_index]) /* all browsers from the list failed */
++	   {  browser_dialog(bi->url);
++
++	      if(bi->msg) 
++		gtk_widget_destroy(bi->msg);
++	      if(bi->url) 
++		g_free(bi->url);
++	      g_free(bi);
++	   }
++	   else                        /* try next browser from list */
++	   {  bi->seconds = 0;  
++	      try_browser(bi);
++	   }
++	   return FALSE;
++
++         case 0:  /* browser assumed to be successful */
++         default:
++	   if(bi->msg) 
++	     gtk_widget_destroy(bi->msg);
++	   if(bi->url) 
++	     g_free(bi->url);
++	   g_free(bi);
++	   return FALSE;
++      }
++   }
++
++   bi->seconds++;
++   if(bi->seconds == 10 && bi->msg)
++   {  gtk_widget_destroy(bi->msg);
++      bi->msg = NULL;
++   }
++
++   return bi->seconds > 60 ? FALSE : TRUE;
++}
++#endif /* SYS_ unix-like */
++
++#ifdef SYS_MINGW
++static gboolean browser_timeout_func(gpointer data)
++{  browser_info *bi = (browser_info*)data;
++   
++   bi->seconds++;
++
++   if(bi->seconds >= 10)
++   {  if(bi->msg)
++      {  gtk_widget_destroy(bi->msg);
++         bi->msg = NULL;
++      }
++      if(bi->url) g_free(bi->url);
++      g_free(bi);
++      return FALSE;
++   }
++
++   return TRUE;
++}
++#endif /* SYS_MINGW */
++
++/*
++ * Invoke the browser
++ */
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++static void try_browser(browser_info *bi)
++{  pid_t pid;
++
++   bi->pid = pid = fork();
++
++   if(pid == -1)
++   {  printf("fork failed\n");
++      return;
++   }
++
++   /* make the parent remember and wait() for the browser */
++
++   if(pid > 0)  
++   {  g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
++
++      if(browser_index)
++      {  g_free(Closure->browser);
++	 Closure->browser = g_strdup(browsers[browser_index]);
++      }
++   }
++
++   /* try calling the browser */
++
++   if(pid == 0)
++   {  char *argv[10];
++      int argc = 0;
++
++      argv[argc++] = browser_index ? browsers[browser_index] : Closure->browser;
++      argv[argc++] = bi->url;
++      argv[argc++] = NULL;
++      execvp(argv[0], argv);
++
++      _exit(110); /* couldn't execute */
++   }
++}
++#endif /* SYS_ unix-like */
++
++
++void ShowHTML(char *target)
++{  browser_info *bi = g_malloc0(sizeof(browser_info));
++   guint64 ignore;
++   const char *lang;
++   char *path = NULL;
++   int http_url;
++
++   /* If no target is given, select between translations of the manual. */
++
++   if(!target) target = g_strdup("index.html");
++
++   http_url = strlen(target) > 4 && !strncmp(target, "http", 4);
++
++   if(!http_url && !strchr(target, '/'))  /* create full path */
++   { 
++      if(!Closure->docDir)
++      {  
++	 CreateMessage(_("Documentation not installed."), GTK_MESSAGE_ERROR);
++         g_free(bi);
++         return;
++      }
++
++      lang = g_getenv("LANG");
++
++      if(lang)
++      {  if(!strncmp(lang, "ru", 2)) 
++#ifdef SYS_MINGW
++	     path = g_strdup_printf("%s\\ru\\%s",Closure->docDir,target); 
++#else
++	     path = g_strdup_printf("%s/ru/%s",Closure->docDir,target); 
++#endif
++         else if(!strncmp(lang, "de", 2)) 
++#ifdef SYS_MINGW
++	     path = g_strdup_printf("%s\\de\\%s",Closure->docDir,target); 
++#else
++	     path = g_strdup_printf("%s/de/%s",Closure->docDir,target); 
++#endif
++      }
++
++      if(!path)
++      {
++#ifdef SYS_MINGW
++         path = g_strdup_printf("%s\\en\\%s",Closure->docDir,target); 
++#else
++         path = g_strdup_printf("%s/en/%s",Closure->docDir,target); 
++#endif
++      }
++
++#ifdef SYS_MINGW      
++      if(!LargeStat(path, &ignore))
++      {  
++	 g_free(path);  /* the local dir is Windows specific */
++	 path = g_strdup_printf("%s\\local\\%s",Closure->docDir,target);
++      }
++#endif
++      g_free(target);
++      bi->url = path;
++   }
++   else bi->url = target;
++
++   if(!http_url && !LargeStat(bi->url, &ignore))
++   {  
++      CreateMessage(_("Documentation file\n%s\nnot found.\n"), GTK_MESSAGE_ERROR, bi->url);
++      g_free(bi);
++      g_free(bi->url);
++      return;
++   }
++
++   /* Lock the help button and show a message for 10 seconds. */
++
++   TimedInsensitive(Closure->helpButton, 10000);
++   bi->msg = CreateMessage(_("Please hang on until the browser comes up!"), GTK_MESSAGE_INFO);
++   g_signal_connect(G_OBJECT(bi->msg), "destroy", G_CALLBACK(msg_destroy_cb), bi);
++
++#ifdef SYS_MINGW
++   /* Okay, Billy wins big time here ;-) */
++
++   ShellExecute(NULL, "open", bi->url, NULL, NULL, SW_SHOWNORMAL);
++   g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
++#endif
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++   /* Try the first browser */
++
++   browser_index = 0;
++   try_browser(bi);
++#endif
++}

debian/patches/28-fudge-pdf-doc-ids.patch

@@ -0,0 +1,26 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 19:14:35 +1100
+Subject: Generate the same PDF document IDs for build reproducibility.
+
+Description: Generate the same PDF IDs for build reproducibility.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ documentation/user-manual/manual.tex | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/documentation/user-manual/manual.tex b/documentation/user-manual/manual.tex
+index 60fb51e..aaab4fa 100644
+--- a/documentation/user-manual/manual.tex
++++ b/documentation/user-manual/manual.tex
+@@ -65,6 +65,7 @@
+ \fancyfoot{}
+ \fancyfoot[LE,RO]{page \thepage\ of \pageref{LastPage}}
+ 
++\pdftrailerid{dvdisaster}
+ \begin{document}
+ 
+ \definecolor{lightorange}{RGB}{255,224,150}

debian/patches/29-fix-more-typos.patch

@@ -0,0 +1,173 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sun, 6 Aug 2017 02:16:17 +1000
+Subject: Fix more typos in error messages and docs.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Description: Fix more typos in error messages and docs.
+ 'sucessful' → 'successful'
+ 'improvment' → 'improvement'
+Author: Carlos Maddela <e7appew@gmail.com>
+Last-Update: 2017-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ documentation/user-manual/howtos.tex | 2 +-
+ locale/cs.po                         | 2 +-
+ locale/de.po                         | 2 +-
+ locale/it.po                         | 2 +-
+ locale/pt_BR.po                      | 2 +-
+ locale/ru.po                         | 2 +-
+ locale/sv.po                         | 2 +-
+ preferences.c                        | 4 ++--
+ regtest/rs01.bash                    | 2 +-
+ scsi-layer.c                         | 2 +-
+ smart-lec.c                          | 2 +-
+ 11 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/documentation/user-manual/howtos.tex b/documentation/user-manual/howtos.tex
+index 51ff827..80fe9d3 100644
+--- a/documentation/user-manual/howtos.tex
++++ b/documentation/user-manual/howtos.tex
+@@ -1822,7 +1822,7 @@ process of creating error correction files using these options. The
+ first option marked green lets dvdisaster create the error correction
+ file immediately after the medium has been (completely) read.
+ The second option marked green deletes the image when the error correction
+-file has been sucessfully created.
++file has been successfully created.
+ 
+ \bigskip
+ 
+diff --git a/locale/cs.po b/locale/cs.po
+index ed1fc65..9010d21 100644
+--- a/locale/cs.po
++++ b/locale/cs.po
+@@ -1903,7 +1903,7 @@ msgid "Media ejection"
+ msgstr "Vysunutí disku"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Po úspěšném načtení vysunout disk"
+ 
+ #: preferences.c:2091
+diff --git a/locale/de.po b/locale/de.po
+index bbbfdcc..bb5baa6 100644
+--- a/locale/de.po
++++ b/locale/de.po
+@@ -1959,7 +1959,7 @@ msgid "Media ejection"
+ msgstr "Datenträger auswerfen"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Datenträger nach erfolgreichem Lesen auswerfen"
+ 
+ #: preferences.c:2091
+diff --git a/locale/it.po b/locale/it.po
+index a074339..000d5c3 100644
+--- a/locale/it.po
++++ b/locale/it.po
+@@ -1749,7 +1749,7 @@ msgid "Media ejection"
+ msgstr ""
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr ""
+ 
+ #: preferences.c:2091
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index 04b33b5..00bcaee 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -1839,7 +1839,7 @@ msgid "Media ejection"
+ msgstr "Ejeção da mídia"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Ejetar mídia após uma leitura completa"
+ 
+ #: preferences.c:2091
+diff --git a/locale/ru.po b/locale/ru.po
+index 6cd3789..1c677d4 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -1841,7 +1841,7 @@ msgid "Media ejection"
+ msgstr "Извлечь носитель"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Извлечь носитель после успешного чтения"
+ 
+ #: preferences.c:2091
+diff --git a/locale/sv.po b/locale/sv.po
+index 9f70808..5cd4927 100644
+--- a/locale/sv.po
++++ b/locale/sv.po
+@@ -1755,7 +1755,7 @@ msgid "Media ejection"
+ msgstr ""
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr ""
+ 
+ #: preferences.c:2091
+diff --git a/preferences.c b/preferences.c
+index f5ef889..5a24200 100644
+--- a/preferences.c
++++ b/preferences.c
+@@ -2061,8 +2061,8 @@ void CreatePreferencesWindow(void)
+       frame = gtk_frame_new(_utf("Media ejection"));
+       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+ 
+-      lwoh = CreateLabelWithOnlineHelp(_("Eject medium after sucessful read"), 
+-				       _("Eject medium after sucessful read"));
++      lwoh = CreateLabelWithOnlineHelp(_("Eject medium after successful read"),
++				       _("Eject medium after successful read"));
+       RegisterPreferencesHelpWindow(lwoh);
+ 
+       for(i=0; i<2; i++)
+diff --git a/regtest/rs01.bash b/regtest/rs01.bash
+index 46bfac4..45f7611 100755
+--- a/regtest/rs01.bash
++++ b/regtest/rs01.bash
+@@ -1327,7 +1327,7 @@ if try "reading medium in 3 passes; 3rd pass recovers some" read_multipass_parti
+   run_regtest read_multipass_partial_success "--read-medium=3 --spinup-delay=0 -r" $TMPISO  $ISODIR/no.ecc
+ fi
+ 
+-# Do a second sucessful read attempt at an incomplete image;
++# Do a second successful read attempt at an incomplete image;
+ # see whether correct results are reported when ecc data is present
+ # since CRC caching is a bit complicated in this case.
+ 
+diff --git a/scsi-layer.c b/scsi-layer.c
+index b70a4a4..515cc93 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -2474,7 +2474,7 @@ int ReadSectors(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors)
+       if(Closure->readRaw && dh->rawBuffer)
+ 	recommended_attempts = dh->rawBuffer->recommendedAttempts;
+ 
+-      if(status)  /* current try was unsucessful */
++      if(status)  /* current try was unsuccessful */
+       {  int last_key, last_asc, last_ascq;
+ 
+ 	 if(Closure->stopActions)  /* user break */
+diff --git a/smart-lec.c b/smart-lec.c
+index 0355879..e33ad8f 100644
+--- a/smart-lec.c
++++ b/smart-lec.c
+@@ -1609,7 +1609,7 @@ static int smart_lec_iteration(sh_context *shc, char *message)
+    shc->bestBonus = 0;
+    shc->bestMalus = 100000;
+    memcpy(shc->bestFrame, rb->recovered, rb->sampleSize);
+-   sprintf(shc->msg, "smart_lec: no further improvment");
++   sprintf(shc->msg, "smart_lec: no further improvement");
+ 
+    update_pq_state(shc);
+    print_pq_state(shc);

debian/patches/30-hurd-kfreebsd-ftbfs.patch

@@ -0,0 +1,46 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sun, 6 Aug 2017 02:40:33 +1000
+Subject: Fix FTBFS on Hurd and kFreeBSD.
+
+Description: Fix FTBFS on Hurd and kFreeBSD.
+ Make sure MMAP_FLAGS gets defined.
+Author: Carlos Maddela <e7appew@gmail.com>
+Last-Update: 2017-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ rs03-create.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/rs03-create.c b/rs03-create.c
+index b2c6033..b14e326 100644
+--- a/rs03-create.c
++++ b/rs03-create.c
+@@ -39,16 +39,19 @@
+ #ifdef HAVE_MMAP
+   #include <sys/mman.h>
+ 
+-#ifdef SYS_LINUX
+-  #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) 
+-#endif
++#if defined(SYS_LINUX)
+ 
+-#ifdef SYS_FREEBSD
+-  #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) 
+-#endif
++  #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE)
++
++#elif defined(SYS_FREEBSD)
++
++  #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ)
++
++#else
++
++  /* SYS_NETBSD and others. */
++  #define MMAP_FLAGS (MAP_SHARED)
+ 
+-#ifdef SYS_NETBSD
+-  #define MMAP_FLAGS (MAP_SHARED) 
+ #endif
+ 
+ #endif

debian/patches/31-improve-hurd-and-kfreebsd-support.patch

@@ -0,0 +1,322 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sun, 6 Aug 2017 10:37:18 +1000
+Subject: Add better support for HURD and kFreeBSD systems.
+
+Description: Add better support for HURD and kFreeBSD systems.
+ Hurd still compiles without SCSI layer, however.
+Author: Carlos Maddela <e7appew@gmail.com>
+Last-Update: 2017-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ cacheprobe.c                 | 16 +++++++++-------
+ closure.c                    |  6 ++++--
+ rs03-create.c                |  2 +-
+ scripts/bash-based-configure | 18 ++++++++++++++++++
+ scsi-freebsd.c               |  4 ++--
+ scsi-layer.c                 | 10 ++++++----
+ scsi-layer.h                 | 17 +++++++++--------
+ scsi-unknown.c               |  4 ++--
+ show-html.c                  | 15 ++++++++++-----
+ 9 files changed, 61 insertions(+), 31 deletions(-)
+
+diff --git a/cacheprobe.c b/cacheprobe.c
+index 60c55f9..f30f5d3 100644
+--- a/cacheprobe.c
++++ b/cacheprobe.c
+@@ -22,7 +22,8 @@
+ 
+ #include "dvdisaster.h"
+ 
+-#ifdef SYS_LINUX
++#if defined(SYS_LINUX)
++
+ int ProbeCacheLineSize()
+ {  int cl_size = 0;
+ 
+@@ -36,9 +37,9 @@ int ProbeCacheLineSize()
+ 
+    return cl_size;
+ }
+-#endif
+ 
+-#ifdef SYS_FREEBSD
++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
++
+ #include <sys/param.h>
+ 
+ int ProbeCacheLineSize()
+@@ -52,9 +53,9 @@ int ProbeCacheLineSize()
+ 
+    return cl_size;
+ }
+-#endif
+ 
+-#ifdef SYS_NETBSD
++#elif defined(SYS_NETBSD)
++
+ #include <sys/param.h>
+ 
+ int ProbeCacheLineSize()
+@@ -68,13 +69,14 @@ int ProbeCacheLineSize()
+ 
+    return cl_size;
+ }
+-#endif
+ 
+-#ifdef SYS_UNKNOWN
++#else /* SYS_UNKNOWN and others. */
++
+ int ProbeCacheLineSize()
+ {
+   return 64;
+ }
++
+ #endif
+ 
+ 
+diff --git a/closure.c b/closure.c
+index 632c103..7c8b3bd 100644
+--- a/closure.c
++++ b/closure.c
+@@ -50,7 +50,8 @@ static void get_base_dirs()
+    /*** Otherwise try the installation directory. 
+ 	On Unices this is a hardcoded directory. */
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_UNKNOWN)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD) || defined(SYS_UNKNOWN)
+    if(DirStat(BINDIR))
+      Closure->binDir = g_strdup(BINDIR);
+ 
+@@ -425,7 +426,8 @@ void InitClosure()
+ 
+    /* Generate a more comprehensive version string */
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+   #ifdef HAVE_64BIT
+     #define BITNESS_STRING " 64bit"
+   #else
+diff --git a/rs03-create.c b/rs03-create.c
+index b14e326..7a22bae 100644
+--- a/rs03-create.c
++++ b/rs03-create.c
+@@ -43,7 +43,7 @@
+ 
+   #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE)
+ 
+-#elif defined(SYS_FREEBSD)
++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+ 
+   #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ)
+ 
+diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
+index d62f5d7..9abcf96 100644
+--- a/scripts/bash-based-configure
++++ b/scripts/bash-based-configure
+@@ -136,6 +136,15 @@ case "$cfg_uname" in
+ 	}
+ 	;;
+ 
++  GNU/kFreeBSD*) cfg_system=kfreebsd
++	CFG_SYS_OPTIONS="-DSYS_KFREEBSD"
++	CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/kFreeBSD\\\""
++	CFG_EXE_SUFFIX=""
++	function add_linker_flags()
++	{  lflags_return="-L$1 -Wl,-rpath,$1 $2"
++	}
++	;;
++
+   NetBSD*) cfg_system=netbsd
+         CFG_SYS_OPTIONS="-DSYS_NETBSD"
+ 	CFG_SYS_NAME="-DSYS_NAME=\\\"NetBSD\\\""
+@@ -146,6 +155,15 @@ case "$cfg_uname" in
+ 	}
+ 	;;
+ 
++  GNU*) cfg_system=hurd
++	CFG_SYS_OPTIONS="-DSYS_HURD"
++	CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/Hurd\\\""
++	CFG_EXE_SUFFIX=""
++	function add_linker_flags()
++	{  lflags_return="-L$1 -Wl,-rpath,$1 $2"
++	}
++	;;
++
+   *) cfg_system=unknown-system
+         CFG_SYS_OPTIONS="-DSYS_UNKNOWN"
+ 	CFG_SYS_NAME="-DSYS_NAME=\\\"Unknown\\\""
+diff --git a/scsi-freebsd.c b/scsi-freebsd.c
+index 78d0be4..793f206 100644
+--- a/scsi-freebsd.c
++++ b/scsi-freebsd.c
+@@ -25,7 +25,7 @@
+ #include "scsi-layer.h"
+ #include "udf.h"
+ 
+-#ifdef SYS_FREEBSD
++#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+ 
+ /* SCSI wrappers for FreeBSD are still work in progress. */
+ 
+@@ -241,4 +241,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char
+    return -1;
+ }
+ 
+-#endif /* SYS_FREEBSD */
++#endif /* defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) */
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 515cc93..609cb73 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -2005,12 +2005,13 @@ static gint64 query_size(Image *image)
+  */
+ 
+ gint64 CurrentMediumSize(int get_blank_size)
+-{  Image *image;
++{
++#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
++   return 0;
++#else
++   Image *image;
+    gint64 size;
+ 
+-#ifdef SYS_UNKNOWN
+-   return 0;
+-#endif
+ 
+    image = OpenImageFromDevice(Closure->device);
+    if(!image) return 0;
+@@ -2051,6 +2052,7 @@ gint64 CurrentMediumSize(int get_blank_size)
+    CloseImage(image);
+ 
+    return size;
++#endif
+ }
+ 
+ /***
+diff --git a/scsi-layer.h b/scsi-layer.h
+index cc7d9fc..0706a22 100644
+--- a/scsi-layer.h
++++ b/scsi-layer.h
+@@ -28,7 +28,7 @@
+ #include <linux/cdrom.h>
+ #endif
+ 
+-#ifdef SYS_FREEBSD
++#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+ #include <camlib.h>
+ #endif
+ 
+@@ -49,19 +49,21 @@
+  * Linux already has one 
+  */
+ 
+-#ifdef SYS_LINUX
++#if defined(SYS_LINUX)
++
+ #define MAX_CDB_SIZE CDROM_PACKET_SIZE
+ 
+ /* Now globally defined for all OSes here */
+ //typedef struct request_sense Sense;
+-#endif
+ 
+-#ifdef SYS_FREEBSD
++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
++
+ #define MAX_CDB_SIZE SCSI_MAX_CDBLEN
+-#endif
+ 
+-#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD)
++#else /* SYS_UNKNOWN and others. */
++
+ #define MAX_CDB_SIZE 16   /* longest possible SCSI command */
++
+ #endif
+ 
+ /* 
+@@ -101,8 +103,7 @@ typedef struct _DeviceHandle
+     */
+ #if defined(SYS_LINUX) || defined(SYS_NETBSD)
+    int fd;                    /* device file descriptor */
+-#endif
+-#ifdef SYS_FREEBSD
++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+    struct cam_device *camdev; /* camlib device handle */
+    union ccb *ccb;
+ #endif
+diff --git a/scsi-unknown.c b/scsi-unknown.c
+index e9183f6..ef54552 100644
+--- a/scsi-unknown.c
++++ b/scsi-unknown.c
+@@ -25,7 +25,7 @@
+ #include "scsi-layer.h"
+ #include "udf.h"
+ 
+-#ifdef SYS_UNKNOWN
++#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
+ 
+ /* Dummy routines so that we can compile on unknown architectures
+    for which we don't have SCSI support yet. */
+@@ -51,4 +51,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char
+    return -1;
+ }
+ 
+-#endif /* SYS_UNKNOWN */
++#endif /* defined(SYS_UNKNOWN) || defined(SYS_HURD) */
+diff --git a/show-html.c b/show-html.c
+index 608e8ec..20715f4 100644
+--- a/show-html.c
++++ b/show-html.c
+@@ -21,7 +21,8 @@
+ 
+ #include "dvdisaster.h"
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ #include <sys/wait.h>
+ #endif
+ 
+@@ -34,7 +35,8 @@
+  *** Ask user to specify his browser
+  ***/
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ 
+ #define SEARCH_BUTTON 1
+ 
+@@ -173,7 +175,8 @@ static void msg_destroy_cb(GtkWidget *widget, gpointer data)
+    bi->msg = NULL; 
+ }
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) ||  defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ 
+ /* 
+  * The following list of browsers and html wrappers
+@@ -273,7 +276,8 @@ static gboolean browser_timeout_func(gpointer data)
+  * Invoke the browser
+  */
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ static void try_browser(browser_info *bi)
+ {  pid_t pid;
+ 
+@@ -393,7 +397,8 @@ void ShowHTML(char *target)
+    g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
+ #endif
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+    /* Try the first browser */
+ 
+    browser_index = 0;

debian/patches/series

@@ -0,0 +1,25 @@
+02-encryption.patch
+03-dvdrom.patch
+05-help-dialog.patch
+08-fix-gnu-make-detection.patch
+10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch
+11-no-cruft.patch
+12-fix-spelling-of-up-to.patch
+13-fix-missing-language-field-in-po-files.patch
+14-make-builds-reproducible.patch
+15-show-new-pkg-tracker.patch
+16-remove-auto-build-of-doco-from-install-rule.patch
+17-fix-all-but-deprecated-api-warnings.patch
+18-update-copyright-in-about-dialog.patch
+19-show-text-files-with-abs-path.patch
+20-display-changelog-credits-and-todo.patch
+22-fix-hurd-i386-ftbfs.patch
+23-add-bdrom-support.patch
+24-show-gpl3-license.patch
+25-fix-man-pages.patch
+26-fix-display-of-manual.pdf.patch
+27-allow-opening-in-browser-again.patch
+28-fudge-pdf-doc-ids.patch
+29-fix-more-typos.patch
+30-hurd-kfreebsd-ftbfs.patch
+31-improve-hurd-and-kfreebsd-support.patch

debian/rules

@@ -0,0 +1,61 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) -Wall -Wno-deprecated-declarations -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+include /usr/share/dpkg/pkg-info.mk
+export FORCE_SOURCE_DATE = 1
+
+MUTABLE_FILES := build.h $(wildcard locale/*.po) \
+	documentation/config/version.tex
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	for f in $(MUTABLE_FILES); do \
+		cp -an $$f $$f.orig; \
+	done
+	dh_auto_configure -- \
+		--localedir=\$${prefix}/share/locale \
+		--docdir=\$${prefix}share/doc \
+		--docsubdir=dvdisaster-doc \
+		--with-embedded-src-path=no
+
+override_dh_clean:
+	dh_clean -X.orig
+	for f in $(MUTABLE_FILES); do \
+		test ! -f $$f.orig || mv -f $$f.orig $$f; \
+	done
+
+override_dh_auto_build-arch:
+	make all
+
+# For the time being, we'll just package the upstream-generated
+# manual.pdf, since we can't build the PDF reproducibly ourselves.
+# The reason we can't is most probably due to the fact that the
+# LaTeX document embeds other PDF documents and PNG images.
+# Although we are able to reproduce the PDF's creation and mod
+# dates, as well as its PDF IDs, the stream elements representing
+# the embedded images are always what seem to differ each time we
+# try to generate the PDF.
+override_dh_auto_build-indep:
+	# make manual
+	true
+
+override_dh_auto_install-arch:
+	dh_auto_install -a -- BUILDROOT=$(CURDIR)/debian/tmp
+
+override_dh_auto_install-indep:
+	true
+
+# Ensure that none of the text files that the application
+# tries to display directly are not compressed, as it doesn't
+# automatically decompress text files.
+override_dh_compress:
+	dh_compress -p dvdisaster \
+		-XCHANGELOG -XCREDITS -XREADME.MODIFYING -XTODO
+	dh_compress --remaining-packages

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/options

@@ -0,0 +1 @@
+no-unapply-patches

debian/tests/control

@@ -0,0 +1,2 @@
+Tests: unknown-system
+Depends: dvdisaster

debian/tests/unknown-system

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# Make sure we haven't built for an unknown system.
+! (dvdisaster --version | grep -qiw unknown)

debian/upstream/signing-key.asc

@@ -0,0 +1,73 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBD9GYJcRBACXa6CzZ0WPqUvit1d7LvnSOqLDxYQiiphnzjQc+ssJvScNxv9+
+ThELKXHxaKfDpL9/C4+5qh1pfrsEEpuQ7m+RfXFqz5UPZITgza5Ko/5WPhhVRxkh
+8b8ux7DIeFlbgmd5YSFPoYIwGWCAtI5OiUC6qa149gAq7k0vtgb+hbxn2wCg0lTu
+XGNjX7qMNggbnx3aBVVd9SMD/RYWIr2c66w6Kt/EYLLgYGqgZL9MkmocuUoJVgiI
+Y2pi3SPbIvX3enk1OIRBCFbweEgXiVw+FWu6aK09eZrJcDv2Uns4ecTvzz1d83RH
+gssV7ulB6P5mU3u6NT39CHW6fJ5Xi1HPkw380+y3dbaRxh/1htmk5Ao0DmDGRohL
+vzgIA/9P/bdqh0WG0j4qY+8pcsNn0/ymiJXPZzvyr2cEc56AaHgLAVZHMUyE3Rd9
+9rSZjVS+x/oGbkzVOd8IySUSRx7f2Sxve1sxoaNlwdqcE0vq16PH1iMBQ6KJAvUA
+NAM4QZhAI7Lav9yB/tXblGrHHjll+fwFB/9t6G0hO9JoJDaEgbQmQ2Fyc3RlbiBH
+bsO2cmxpY2ggKHBrZyBzaWduaW5nIGtleSAjMSmIXgQTEQIAHgUCQCvkqQIbAwYL
+CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRBaWQ7+9fbEbGfsAJ9NrkdlRobMhtWpAyeW
+wPUe8XHzsACfYbMooS0D/UmRGo7wW7rBnrVqLxy5AQ0EP0ZgmBAEAKJos9WBWgw1
+sGFFM/1eKEzZqGYMt8qk2r/djPyZYEIzqT47aR7P9gPIXDTplOmBgL43hU8MlE9K
+Q92s4RVP/x/OvMWF04vSO3vBEmeR3HncpbIk4AP17MZGuqEGtyAe1e5hcGiho1CL
+/6fSanYydC2iciKbfyyfzL9oISHedad7AAMFA/4wtrdqwTI2p05NAGxRA2r4egYI
+m7x+ixyYuHGkzZzHMdos5zDg/dzNRnarib98JgAkZR+EVT6K0Ez6ykz57oteCt6f
+jyGjOwI9bUyOFa+LyGJ+QRaeVozhqLLu/b4wgKCuBcKNt2ebpKFHi9JKiGE9hOJz
+4nanjCbtihUJaf1DLIhJBBgRAgAJBQI/RmCYAhsMAAoJEFpZDv719sRsbk4An2JZ
+q/8GBvugzgfu5AxacsuiZzfgAKCwzLAuoUTw/Sz6bYaAUfec362gFw==
+=Sidz
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFYS0XkBEACxsIQ1dI0k1TiybBztU6BC3DeQsDGC9TeaGBgYDo+62B8U5uiJ
+AD9ofBXglj0/DOweAIoLdcVsvFzU0sxk4tUnb84plk09qG+UfU2227DWeKTP3YPv
+E8A6uWopr6Yoc8WGG9mKl9L1CCiqQmNB4L4Um2/yDPrhtN3TxzpMLBoNUo/f271Q
+yLxQZMEsUDTZq7JxbEQ9hLbBn69zIptsZHyNJwCerqXqhzQcB11BVqZyLrRC+0ZT
+eUtO1o10Y/EAEi86ivi1upLsgVi5u2LcP9ICIhTVv6MQ+turhThFOIcEvbw/15Hp
+4Vlb0yZlBx2j4Hr4tDSrWeQ1lmBNA1qhrLkPOIQv+scXhcyzY5nKIjRDKYS1v8OM
+uMhfVakK/YS+flN5nyS4Ku0x99sae75+PArMjbLNfP738Zw4ywC4i+i958SEIcky
+4Bia+kyTCPRZWZ5BJe3+GAPDdI1XntS0D1uXPiwi8u91jg1cAEChwjwe2pr0RG+h
+8ft5BTezJyAeZ9haU8OyrW5GZNddhyBH4QxdRYvMTdmQIbjxNuTYGpBXl4qgTqKn
+A7Gxbr24hgdUHKIe//AlDQ41VbBTdyBmgyORGCL+uaSpDerADPXh+bwE2vQsKs13
++HcVldLBJmL9tYeRZvpvR/vwFBvfkrgAN8+NdPnSzwvLI0JMrL50DOhapwARAQAB
+tB9kdmRpc2FzdGVyIChwa2cgc2lnbmluZyBrZXkgIzIpiQI4BBMBAgAiBQJWEtF5
+AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCw28p9ZPdwsivVD/4wiomj
+IFNUG0lb4sIvXHZR2sv0rVz1eN74B+Ngefp3viZvjvmXji2cbzPhTsoAq4ys5/nD
+m9fLnm+mG2TfLKTqXBNRDeEDmknK0aXlFVbdUfgeExvU9Tj1giOORTvTiNPdJpkF
+qKMrjvtB4t2sHuuL/SNwQAWlWfDUuK52yf1SAZasdFPTAvAuzo+lqfYbi5tnjIY/
+GkR9e3ZjMEaWvxc0N5CJg7ibKpuX476eo+04oKkNvSbyE7Lpcho4AHy6e4UoJ9e+
+UBL3o84MtChwrlP5HmMPan1hIL5iyswDUrxUfL36GqAEcAM8tIbZ6A6CfQT+FgnI
+e/E1dm3FWEje8F7uD2xkCGRBYTN8BG5+UMTF9MaQGU3kxBMPt8xvHmCNZHR6QrdL
++vysa+02QmSM1jZz4J37yctM69WY1x3JDC+HGHMxCX3G+BrDntLG3yQkox1nBi2l
+8JiKTdoX7LhRn1xCijIpYdbszMao0lN/XEiOgx2eygG9a3fQDOqR/yi9tTqmKQM4
+H/il88tkdsaioWXspWEhrS+8MhiUdr8yz3LA9+DawddnW8ZbTee2R4ARMlKhfXBE
+kvXO2L37Ub2sX97S9qbKkwaYIs2PHn7NFNRB6OP8Oz0scMuritvUZrNfNjaGba3e
+YNgR36NFvroM3R2a+Yr0zjbY+rqjJSdNSfcsxLkCDQRWEtF5ARAA3KvEpeB7vbCx
+olIlzxuF/RHJ770GUYSfTVbYIKSl4HbywrDak7uXlDWIJ/u1lunu5+albUEHIadu
+YolrzaTG6A/sslXHgk8RUxZonzAw2/8C0fQCBAPjs2nlwzt61g75/EPJlESocapd
+Ri97EleGmGGK5L6N2CyTX8pjj1DkXwiWX95EOcgWRoLXpf/bpThqFCsRjoJfHO7z
+cA0b5iIR7LQenMG/3AeGFRr1Oh2UzAL60MuPypu8NBv3IUXZ6mXdFTNM4bQc/Rlm
+VDoB8B8mz4M1IL0fP98LN+b9ZfUUDz1zk9W8H+OCvfdOVj1srDq+uhaSwDC6jDu7
+wTaFlaJaPBoqCXCk7xGbVxKdZot6oN5ZrAvMMnD0Jc+QX+MKSodMk5LQRFB+WGI8
+2IwgeS7kqQX2Bt0w7d4xL/3AKTNgQQAGzXRi7dzXR//diKEmESSmaRccVpLZYtR4
+PdUuY6ZXyayEvZCosV6B7P+lV842lN9Q/KgrZjH09SYKK8pzqRPoAIvPJNT4fP8F
+eTztnKu9gfS0Zs2MnkKjEK85E8OMSidpISqn0xgHeuldMPL7gGxJKj95BF4jFUs4
+fQa8nD1jnnUbKdAsGd5ujpEAjAfV+kkGZPUyVrJokhGlCLLt2dG4PrgZ4tNXdEQw
+VGNskHYjs6YU+CGYjzfopvrUPast+cUAEQEAAYkCHwQYAQIACQUCVhLReQIbDAAK
+CRCw28p9ZPdwsrmqD/sFsulD6nl5DRznofkqBJwwl6zdtNN9OKsEi8UKc10iuq+Z
+vynWFbcARqW9sgbBCoCM5KuA5zMIQ0hvrvlb+HOt8v7DA2D0d/IPU1BPnxoEuMDq
+5g+a3MYzmP+4Wmp8r6NNAW0ArWhazQsNdIhAVv4ItUCos7+S7q8srsflpEVG78/f
+C4Fw4sRjAaCd1NsP6D3vHwENtbuoQaT63kyfPK+r6EADTxmeFe7anovQo6MirRCn
+Loo3NdPVfQlgXkdL3wiBpwm7W/PYY+9Z6HIfE2AIBs+C5SdxYPR+tVz3+3QC9998
+egxTRnJMaKkDQ+nG/ROSVpCqXwhzob6HlrKhoe7H7GKVZyl/IVllpUQHKi5C03S8
+JQxpaJoB85/C5ZlcMtb0e1YUYeVhTKWIREFsx5FlxXcJh5CLVplZKxfn0oiIgnyK
+HtCOeNcXP2mOYClN8RmhW+/Z198bTmzMrB2jq7a3xbLGWKJqfgfZ6EPwCEu/jZTB
+SQgyssrrGahyyOIDadEcyfYV+r5pUm1++1YxSe0/hZ89RjGAIneWmo6sDLwPd44G
+LKAAb/E/yS/320bu031426gU8Zdw7bK1dVNVQxWOpRc/RTRjmVjrO9NIN+7DSNOF
+nvep13/48UEDSFXkNnh+VgxGpvpOouw2xUBVNZuhjPr589pvAEQFUyxCTI0uwQ==
+=mXsc
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -0,0 +1,4 @@
+version=3
+opts="pgpsigurlmangle=s/$/.gpg/" \
+http://dvdisaster.net/en/index.html \
+     (?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate