Merge remote-tracking branch 'exp/debian/unstable'
This commit is contained in:
TANIGUCHI Takaki
66
debian/changelog
vendored
66
debian/changelog
vendored
@@ -1,3 +1,69 @@
|
||||
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)
|
||||
|
||||
2
debian/clean
vendored
Normal file
2
debian/clean
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
documentation/*/*/*.png
|
||||
documentation/*/*.png
|
||||
2
debian/compat
vendored
2
debian/compat
vendored
@@ -1 +1 @@
|
||||
7
|
||||
10
|
||||
|
||||
26
debian/control
vendored
26
debian/control
vendored
@@ -3,22 +3,23 @@ Section: otherosfs
|
||||
Priority: optional
|
||||
Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org>
|
||||
Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
|
||||
Rogério Brito <rbrito@ime.usp.br>
|
||||
DM-Upload-Allowed: yes
|
||||
Build-Depends: debhelper (>= 7.0.50~),
|
||||
gettext,
|
||||
libbz2-dev,
|
||||
libgtk2.0-dev,
|
||||
libpng-dev,
|
||||
pkg-config
|
||||
Standards-Version: 3.9.3
|
||||
Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvdisaster.git
|
||||
Vcs-Git: git://git.debian.org/pkg-opt-media/dvdisaster.git
|
||||
Rogério Brito <rbrito@ime.usp.br>
|
||||
Build-Depends: debhelper (>= 10),
|
||||
dh-exec,
|
||||
dpkg-dev (>= 1.16.1.1),
|
||||
gettext,
|
||||
libbz2-dev,
|
||||
libgtk2.0-dev,
|
||||
libpng-dev,
|
||||
pkg-config
|
||||
Standards-Version: 3.9.8
|
||||
Vcs-Browser: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git
|
||||
Vcs-Git: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git
|
||||
Homepage: http://dvdisaster.net/
|
||||
|
||||
Package: dvdisaster
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, xdg-utils
|
||||
Depends: xdg-utils, ${misc:Depends}, ${shlibs:Depends}
|
||||
Recommends: dvdisaster-doc
|
||||
Description: data loss/scratch/aging protection for CD/DVD media
|
||||
dvdisaster provides a margin of safety against data loss on CD and DVD media
|
||||
@@ -28,6 +29,7 @@ Description: data loss/scratch/aging protection for CD/DVD media
|
||||
Package: dvdisaster-doc
|
||||
Section: doc
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
Depends: ${misc:Depends}
|
||||
Suggests: dvdisaster
|
||||
Description: data loss/scratch/aging protection for CD/DVD media (documentation)
|
||||
|
||||
48
debian/copyright
vendored
48
debian/copyright
vendored
@@ -1,42 +1,32 @@
|
||||
Author: Carsten Gnoerlich <cgnoerlich@fsfe.org>
|
||||
Download: http://www.dvdisaster.com/
|
||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Contact: Carsten Gnörlich <carsten@dvdisaster.org>
|
||||
Upstream-Name: dvdisaster
|
||||
Source: http://dvdisaster.net/
|
||||
|
||||
Files: *
|
||||
Copyright: Copyright (C) 2004-2009 Carsten Gnoerlich <cgnoerlich@fsfe.org>
|
||||
Copyright: 2004–2012, Carsten Gnörlich <carsten@dvdisaster.org>
|
||||
License: GPL-2+
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
.
|
||||
On Debian systems, the complete text of the GNU General Public License
|
||||
can be found in /usr/share/common-licenses/GPL-2 file.
|
||||
|
||||
Files: debian/*
|
||||
Copyright (C) 2005-2009 Daniel Baumann <daniel@debian.org>
|
||||
Copyright: 2005–2009, Daniel Baumann <daniel@debian.org>
|
||||
2009–2012, TANIGUCHI Takaki <takaki@debian.org>
|
||||
2009–2010, Rogério Brito <rbrito@ime.usp.br>
|
||||
2016, Carlos Maddela <e7appew@gmail.com>
|
||||
License: GPL-2+
|
||||
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.
|
||||
|
||||
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 program is distributed in the hope that it will be useful,
|
||||
This package is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
.
|
||||
On Debian systems, the complete text of the GNU General Public License
|
||||
can be found in /usr/share/common-licenses/GPL-2 file.
|
||||
On Debian systems, the complete text of the GNU General
|
||||
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
||||
|
||||
11
debian/dvdisaster-doc.doc-base
vendored
Normal file
11
debian/dvdisaster-doc.doc-base
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
Document: dvdisaster
|
||||
Title: The dvdisaster User's Manual
|
||||
Author: Carsten Gnörlich
|
||||
Abstract: This manual describes what dvdisaster is and how it can be used
|
||||
to protect optical media (CD/DVD/BD) from data loss, due to scratches
|
||||
and aging.
|
||||
Section: File Management
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/dvdisaster/html/en/index.html
|
||||
Files: /usr/share/doc/dvdisaster/html/en/*.html
|
||||
6
debian/dvdisaster-doc.docs
vendored
6
debian/dvdisaster-doc.docs
vendored
@@ -1,6 +0,0 @@
|
||||
CREDITS.cs
|
||||
CREDITS.de
|
||||
CREDITS.en
|
||||
README.MODIFYING
|
||||
TODO
|
||||
TRANSLATION.HOWTO
|
||||
2
debian/dvdisaster-doc.install
vendored
2
debian/dvdisaster-doc.install
vendored
@@ -1 +1 @@
|
||||
/usr/share/doc/dvdisaster-doc
|
||||
usr/share/doc/dvdisaster-doc
|
||||
|
||||
84
debian/dvdisaster-doc.links
vendored
Normal file
84
debian/dvdisaster-doc.links
vendored
Normal file
@@ -0,0 +1,84 @@
|
||||
usr/share/doc/dvdisaster-doc/html/cs/download40.html usr/share/doc/dvdisaster-doc/html/cs/download40_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/download.html usr/share/doc/dvdisaster-doc/html/cs/download_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos12.html usr/share/doc/dvdisaster-doc/html/cs/howtos12_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/cs/howtos23_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=0&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=1&.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=2&.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/cs/howtos33_way=3&.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos42.html usr/share/doc/dvdisaster-doc/html/cs/howtos42_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos51.html usr/share/doc/dvdisaster-doc/html/cs/howtos51_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos52.html usr/share/doc/dvdisaster-doc/html/cs/howtos52_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos53.html usr/share/doc/dvdisaster-doc/html/cs/howtos53_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos91.html usr/share/doc/dvdisaster-doc/html/cs/howtos91_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/howtos92.html usr/share/doc/dvdisaster-doc/html/cs/howtos92_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/cs/images/compare-icon.png usr/share/doc/dvdisaster-doc/html/cs/images/verify-icon.png
|
||||
usr/share/doc/dvdisaster-doc/html/de/download40.html usr/share/doc/dvdisaster-doc/html/de/download40_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/download.html usr/share/doc/dvdisaster-doc/html/de/download_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos12.html usr/share/doc/dvdisaster-doc/html/de/howtos12_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos13.html usr/share/doc/dvdisaster-doc/html/de/howtos13_crc.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos21.html usr/share/doc/dvdisaster-doc/html/de/howtos31.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/de/howtos23_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/de/howtos23_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33.html usr/share/doc/dvdisaster-doc/html/de/howtos33_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=0&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=1&.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=2&.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/de/howtos33_way=3&.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos42.html usr/share/doc/dvdisaster-doc/html/de/howtos42_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos51.html usr/share/doc/dvdisaster-doc/html/de/howtos51_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos52.html usr/share/doc/dvdisaster-doc/html/de/howtos52_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos53.html usr/share/doc/dvdisaster-doc/html/de/howtos53_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos91.html usr/share/doc/dvdisaster-doc/html/de/howtos91_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/de/howtos92.html usr/share/doc/dvdisaster-doc/html/de/howtos92_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/download40.html usr/share/doc/dvdisaster-doc/html/en/download40_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/download.html usr/share/doc/dvdisaster-doc/html/en/download_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos12.html usr/share/doc/dvdisaster-doc/html/en/howtos12_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos21.html usr/share/doc/dvdisaster-doc/html/en/howtos31.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/en/howtos23_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/en/howtos23_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33.html usr/share/doc/dvdisaster-doc/html/en/howtos33_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=0&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=1&.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=2&.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/en/howtos33_way=3&.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos42.html usr/share/doc/dvdisaster-doc/html/en/howtos42_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos51.html usr/share/doc/dvdisaster-doc/html/en/howtos51_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos52.html usr/share/doc/dvdisaster-doc/html/en/howtos52_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos53.html usr/share/doc/dvdisaster-doc/html/en/howtos53_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos91.html usr/share/doc/dvdisaster-doc/html/en/howtos91_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/howtos92.html usr/share/doc/dvdisaster-doc/html/en/howtos92_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/en/images/make-ecc2.png usr/share/doc/dvdisaster-doc/html/de/images/make-ecc2.png
|
||||
usr/share/doc/dvdisaster-doc/html/en/thumbnails/make-ecc2.png usr/share/doc/dvdisaster-doc/html/de/thumbnails/make-ecc2.png
|
||||
usr/share/doc/dvdisaster-doc/html/ru/download40.html usr/share/doc/dvdisaster-doc/html/ru/download40_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/download.html usr/share/doc/dvdisaster-doc/html/ru/download_showall=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos12.html usr/share/doc/dvdisaster-doc/html/ru/howtos12_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=1.html usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=2.html usr/share/doc/dvdisaster-doc/html/ru/howtos23_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=0.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=0&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=1&.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=2&.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3&expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3.html usr/share/doc/dvdisaster-doc/html/ru/howtos33_way=3&.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos42.html usr/share/doc/dvdisaster-doc/html/ru/howtos42_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos51.html usr/share/doc/dvdisaster-doc/html/ru/howtos51_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos52.html usr/share/doc/dvdisaster-doc/html/ru/howtos52_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos53.html usr/share/doc/dvdisaster-doc/html/ru/howtos53_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos91.html usr/share/doc/dvdisaster-doc/html/ru/howtos91_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/howtos92.html usr/share/doc/dvdisaster-doc/html/ru/howtos92_expand=0.html
|
||||
usr/share/doc/dvdisaster-doc/html/ru/images/compare-icon.png usr/share/doc/dvdisaster-doc/html/ru/images/verify-icon.png
|
||||
usr/share/doc/dvdisaster-doc/html usr/share/doc/dvdisaster/html
|
||||
5
debian/dvdisaster.docs
vendored
5
debian/dvdisaster.docs
vendored
@@ -1,6 +1,5 @@
|
||||
CREDITS.cs
|
||||
CREDITS.de
|
||||
CREDITS.en
|
||||
CHANGELOG
|
||||
CREDITS.*
|
||||
README.MODIFYING
|
||||
TODO
|
||||
TRANSLATION.HOWTO
|
||||
|
||||
7
debian/dvdisaster.install
vendored
Normal file → Executable file
7
debian/dvdisaster.install
vendored
Normal file → Executable file
@@ -1,3 +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
|
||||
|
||||
4
debian/dvdisaster.menu
vendored
4
debian/dvdisaster.menu
vendored
@@ -1,4 +0,0 @@
|
||||
?package(dvdisaster):needs="X11" section="Applications/File Management"\
|
||||
title="Dvdisaster" longtitle="data loss/scratch/aging protection for CD/DVD media"\
|
||||
description="dvdisaster provides a margin of safety against data loss on CD and DVD media caused by scratches or aging media. It creates error correction data which is used to recover unreadable sectors if the disc becomes damaged at a later time."\
|
||||
command="/usr/bin/dvdisaster" icon="/usr/share/pixmaps/dvdisaster.xpm"
|
||||
29
debian/patches/01-libpng15.patch
vendored
Normal file
29
debian/patches/01-libpng15.patch
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
|
||||
Date: Sun, 8 Apr 2012 21:51:13 +0900
|
||||
Subject: Build with libpng15.
|
||||
|
||||
Description: Build with libpng15.
|
||||
Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
|
||||
Origin: vendor
|
||||
Last-Update: 2012-04-08
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
tools/pngio.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/tools/pngio.h b/tools/pngio.h
|
||||
index d9f884e..5d3a575 100644
|
||||
--- a/tools/pngio.h
|
||||
+++ b/tools/pngio.h
|
||||
@@ -22,6 +22,10 @@
|
||||
|
||||
#include <zlib.h>
|
||||
#include <png.h>
|
||||
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ #include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
typedef struct
|
||||
{ char *name;
|
||||
24
debian/patches/02-encryption.patch
vendored
24
debian/patches/02-encryption.patch
vendored
@@ -1,11 +1,21 @@
|
||||
Author: n/a
|
||||
Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
|
||||
From: Optical Media Tools Team <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).
|
||||
|
||||
Index: dvdisaster/scsi-layer.c
|
||||
===================================================================
|
||||
--- dvdisaster.orig/scsi-layer.c 2012-04-08 21:51:10.995588783 +0900
|
||||
+++ dvdisaster/scsi-layer.c 2012-04-08 21:51:29.259678075 +0900
|
||||
@@ -2693,11 +2693,12 @@
|
||||
Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
|
||||
Author: n/a
|
||||
Last-Update: 2012-04-08
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
scsi-layer.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scsi-layer.c b/scsi-layer.c
|
||||
index 99b2ce9..13784dd 100644
|
||||
--- a/scsi-layer.c
|
||||
+++ b/scsi-layer.c
|
||||
@@ -2693,11 +2693,12 @@ DeviceHandle* OpenAndQueryDevice(char *device)
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
24
debian/patches/03-dvdrom.patch
vendored
24
debian/patches/03-dvdrom.patch
vendored
@@ -1,11 +1,21 @@
|
||||
Author: Corey Wright <undefined@pobox.com>
|
||||
Description: Adds support for DVD-ROM medium-type.
|
||||
From: Corey Wright <undefined@pobox.com>
|
||||
Date: Tue, 6 Mar 2012 11:10:30 +0900
|
||||
Subject: Adds support for DVD-ROM medium-type.
|
||||
|
||||
Index: dvdisaster/scsi-layer.c
|
||||
===================================================================
|
||||
--- dvdisaster.orig/scsi-layer.c 2012-03-06 11:10:17.147044691 +0900
|
||||
+++ dvdisaster/scsi-layer.c 2012-03-06 11:10:30.927044292 +0900
|
||||
@@ -913,6 +913,11 @@
|
||||
Description: Adds support for DVD-ROM medium-type.
|
||||
Author: Corey Wright <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 13784dd..cd7795a 100644
|
||||
--- a/scsi-layer.c
|
||||
+++ b/scsi-layer.c
|
||||
@@ -913,6 +913,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only)
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
40
debian/patches/05-help-dialog.patch
vendored
40
debian/patches/05-help-dialog.patch
vendored
@@ -1,20 +1,34 @@
|
||||
Author: Daniel Baumann <daniel@debian.org>
|
||||
Description: Customizes the help-dialog according to README.MODIFYING.
|
||||
From: Daniel Baumann <daniel@debian.org>
|
||||
Date: Sun, 8 Apr 2012 21:53:29 +0900
|
||||
Subject: Customizes the help-dialog according to README.MODIFYING.
|
||||
|
||||
Index: dvdisaster/help-dialogs.c
|
||||
===================================================================
|
||||
--- dvdisaster.orig/help-dialogs.c 2012-04-08 21:41:14.000000000 +0900
|
||||
+++ dvdisaster/help-dialogs.c 2012-04-08 21:53:29.300264928 +0900
|
||||
@@ -402,7 +402,7 @@
|
||||
Description: Customizes the help-dialog according to README.MODIFYING.
|
||||
.
|
||||
* 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 793be52..ed86afe 100644
|
||||
--- a/help-dialogs.c
|
||||
+++ b/help-dialogs.c
|
||||
@@ -402,7 +402,7 @@ void ShowGPL()
|
||||
ShowTextfile(_("windowtitle|GNU General Public License"),
|
||||
_("<big>GNU General Public License</big>\n"
|
||||
"<i>The license terms of dvdisaster.</i>"),
|
||||
- "COPYING", NULL, NULL);
|
||||
+ "/usr/share/common/licenses/GPL-2", NULL, NULL);
|
||||
+ "/usr/share/common-licenses/GPL-2", NULL, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -566,7 +566,7 @@
|
||||
@@ -566,7 +566,7 @@ static void show_modifying(void)
|
||||
{ ShowTextfile(_("windowtitle|Modifying dvdisaster"),
|
||||
_("<big>Modifying dvdisaster</big>\n"
|
||||
"<i>Your changes are not ours.</i>"),
|
||||
@@ -23,12 +37,8 @@ Index: dvdisaster/help-dialogs.c
|
||||
}
|
||||
|
||||
static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
|
||||
@@ -742,14 +742,14 @@
|
||||
AboutTextWithLink(vbox, _("This software comes with <b>absolutely no warranty</b>.\n"
|
||||
"This is free software and you are welcome to redistribute it\n"
|
||||
"under the conditions of the [GNU General Public License].\n"),
|
||||
- "GPL");
|
||||
+ "/usr/share/common-licenses/GPL-2");
|
||||
@@ -745,11 +745,11 @@ void AboutDialog()
|
||||
"GPL");
|
||||
|
||||
#ifdef MODIFIED_SOURCE
|
||||
- AboutTextWithLink(vbox, _("\nThis program is <b>not the original</b>. It is based on the\n"
|
||||
|
||||
@@ -1,9 +1,23 @@
|
||||
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
|
||||
Description: Remove unneeded Encoding-key from desktop file
|
||||
From: =?utf-8?q?Rog=C3=A9rio_Theodoro_de_Brito?= <rbrito@ime.usp.br>
|
||||
Date: Sun, 18 Dec 2016 22:01:27 +1100
|
||||
Subject: Remove unneeded Encoding-key from desktop file
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Description: Remove unneeded Encoding-key from desktop file
|
||||
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
contrib/dvdisaster.desktop | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/contrib/dvdisaster.desktop b/contrib/dvdisaster.desktop
|
||||
index 63f2e4f..c7661ec 100644
|
||||
--- a/contrib/dvdisaster.desktop
|
||||
+++ b/contrib/dvdisaster.desktop
|
||||
@@ -10,4 +10,3 @@
|
||||
@@ -10,4 +10,3 @@ Icon=dvdisaster48.png
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Application;System;
|
||||
|
||||
@@ -1,11 +1,25 @@
|
||||
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
|
||||
Description: Fix spelling errors in binaries
|
||||
From: =?utf-8?q?Rog=C3=A9rio_Theodoro_de_Brito?= <rbrito@ime.usp.br>
|
||||
Date: Sun, 8 Apr 2012 21:55:13 +0900
|
||||
Subject: Fix spelling errors in binaries
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Index: dvdisaster/preferences.c
|
||||
===================================================================
|
||||
--- dvdisaster.orig/preferences.c 2012-04-08 21:55:06.732741250 +0900
|
||||
+++ dvdisaster/preferences.c 2012-04-08 21:55:13.004771913 +0900
|
||||
@@ -1627,7 +1627,7 @@
|
||||
Description: Fix spelling errors in binaries
|
||||
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
|
||||
Last-Update: 2012-04-08
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
preferences.c | 4 ++--
|
||||
rs01-fix.c | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/preferences.c b/preferences.c
|
||||
index 84abf2b..2f3355c 100644
|
||||
--- a/preferences.c
|
||||
+++ b/preferences.c
|
||||
@@ -1627,7 +1627,7 @@ void CreatePreferencesWindow(void)
|
||||
"The values include the borders: 0-100 will read 101 sectors.\n\n"
|
||||
|
||||
"<b>Note:</b> Limiting the reading range is not recommended for <i>adaptive reading</i> since it might "
|
||||
@@ -14,7 +28,7 @@ Index: dvdisaster/preferences.c
|
||||
"These settings are only effective for the current session and will not be saved."));
|
||||
|
||||
/** Image properties */
|
||||
@@ -1911,7 +1911,7 @@
|
||||
@@ -1911,7 +1911,7 @@ if(Closure->debugMode) /* hidden until version 0.80 */
|
||||
"<b>0x20</b> This is the <i>recommended</i> mode. "
|
||||
"The drive tries to apply "
|
||||
"the built-in error correction to the best possible extent "
|
||||
@@ -23,11 +37,11 @@ Index: dvdisaster/preferences.c
|
||||
"<b>0x21</b> In this mode the drive skips the last stage "
|
||||
"of its internal error correction and returns the "
|
||||
"uncorrected sector instead. This may result in sectors "
|
||||
Index: dvdisaster/rs01-fix.c
|
||||
===================================================================
|
||||
--- dvdisaster.orig/rs01-fix.c 2012-04-08 21:55:06.732741250 +0900
|
||||
+++ dvdisaster/rs01-fix.c 2012-04-08 21:55:13.004771913 +0900
|
||||
@@ -246,7 +246,7 @@
|
||||
diff --git a/rs01-fix.c b/rs01-fix.c
|
||||
index a867939..fe7707b 100644
|
||||
--- a/rs01-fix.c
|
||||
+++ b/rs01-fix.c
|
||||
@@ -246,7 +246,7 @@ void RS01Fix(Method *method)
|
||||
if(Closure->guiMode)
|
||||
{ int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL,
|
||||
_("The image file is %d bytes longer than noted\n"
|
||||
|
||||
42
debian/patches/08-fix-gnu-make-detection.patch
vendored
Normal file
42
debian/patches/08-fix-gnu-make-detection.patch
vendored
Normal file
@@ -0,0 +1,42 @@
|
||||
From: Carlos Maddela <e7appew@gmail.com>
|
||||
Date: Sun, 18 Dec 2016 23:05:03 +1100
|
||||
Subject: Fix GNU Make detection.
|
||||
|
||||
Description: Fix GNU Make detection.
|
||||
While the previous code works with earlier versions of bash, it doesn't
|
||||
seem to work with bash 4.4.5. The redirection to /dev/null somehow causes
|
||||
grep to return an error code of 2.
|
||||
.
|
||||
This change allows for more predictable behaviour: grep returns an
|
||||
error code of 0 or 1.
|
||||
Author: Carlos Maddela <e7appew@gmail.com>
|
||||
Origin: vendor
|
||||
Bug-Debian: https://bugs.debian.org/848811
|
||||
Forwarded: no
|
||||
Last-Update: 2016-12-18
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
scripts/bash-based-configure | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
|
||||
index f9d80c8..ffb5919 100644
|
||||
--- a/scripts/bash-based-configure
|
||||
+++ b/scripts/bash-based-configure
|
||||
@@ -309,13 +309,13 @@ function REQUIRE_GMAKE()
|
||||
|
||||
echo -n "Checking for gmake: "
|
||||
|
||||
- if (gmake -v | grep "GNU Make") > /dev/null 2>&1 ;
|
||||
+ if (gmake -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
|
||||
then echo "yes"
|
||||
echo "MAKE = `which gmake`" >>Makefile.config
|
||||
return 0
|
||||
fi;
|
||||
|
||||
- if (make -v | grep "GNU Make") > /dev/null 2>&1 ;
|
||||
+ if (make -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
|
||||
then echo "yes"
|
||||
echo "MAKE = `which make`" >>Makefile.config
|
||||
return 0
|
||||
29
debian/patches/09-fix-format-security-warnings.patch
vendored
Normal file
29
debian/patches/09-fix-format-security-warnings.patch
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
From: Carlos Maddela <e7appew@gmail.com>
|
||||
Date: Mon, 19 Dec 2016 00:58:24 +1100
|
||||
Subject: Fix format security warnings.
|
||||
|
||||
Description: Fix format security warnings.
|
||||
They are treated as errors in Standards Version 3.9.8.
|
||||
Author: Carlos Maddela <e7appew@gmail.com>
|
||||
Origin: vendor
|
||||
Forwarded: no
|
||||
Last-Update: 2016-12-19
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
tools/memory.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/memory.c b/tools/memory.c
|
||||
index f2c0c48..edf32ec 100644
|
||||
--- a/tools/memory.c
|
||||
+++ b/tools/memory.c
|
||||
@@ -165,7 +165,7 @@ static void print_ptr(memchunk *mc, int size)
|
||||
static void print_ptrs(char *msg)
|
||||
{ int bucket,i,n=0;
|
||||
|
||||
- fprintf(stdout, msg);
|
||||
+ fprintf(stdout, "%s", msg);
|
||||
|
||||
for(bucket=0; bucket<64; bucket++)
|
||||
for(i=0; i<phCnt[bucket]; i++)
|
||||
29
debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch
vendored
Normal file
29
debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
From: Carlos Maddela <e7appew@gmail.com>
|
||||
Date: Mon, 19 Dec 2016 03:40:41 +1100
|
||||
Subject: Use non-size-specific icon and add keywords to desktop file.
|
||||
|
||||
Description: Use non-size-specific icon and add keywords to desktop file.
|
||||
Author: Carlos Maddela <e7appew@gmail.com>
|
||||
Origin: vendor
|
||||
Forwarded: no
|
||||
Last-Update: 2016-12-19
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
contrib/dvdisaster.desktop | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/contrib/dvdisaster.desktop b/contrib/dvdisaster.desktop
|
||||
index c7661ec..1f9926b 100644
|
||||
--- a/contrib/dvdisaster.desktop
|
||||
+++ b/contrib/dvdisaster.desktop
|
||||
@@ -6,7 +6,8 @@ Comment=Additional error protection for CD/DVD media
|
||||
Comment[cs]=Přídavná ochrana pro média CD/DVD
|
||||
Comment[de]=Zusätzliche Fehlerkorrektur für CD/DVD
|
||||
Exec=dvdisaster
|
||||
-Icon=dvdisaster48.png
|
||||
+Icon=dvdisaster
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Application;System;
|
||||
+Keywords=CD;DVD;media;data loss;scratch;aging;error;protection;recovery;
|
||||
53
debian/patches/11-no-cruft.patch
vendored
Normal file
53
debian/patches/11-no-cruft.patch
vendored
Normal file
@@ -0,0 +1,53 @@
|
||||
From: Carlos Maddela <e7appew@gmail.com>
|
||||
Date: Mon, 19 Dec 2016 05:06:30 +1100
|
||||
Subject: Do not install cruft.
|
||||
|
||||
Description: Do not install cruft.
|
||||
Author: Carlos Maddela <e7appew@gmail.com>
|
||||
Origin: vendor
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2016-12-19
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
GNUmakefile.template | 20 +-------------------
|
||||
1 file changed, 1 insertion(+), 19 deletions(-)
|
||||
|
||||
diff --git a/GNUmakefile.template b/GNUmakefile.template
|
||||
index fe4c504..10e4524 100644
|
||||
--- a/GNUmakefile.template
|
||||
+++ b/GNUmakefile.template
|
||||
@@ -315,11 +315,6 @@ install: dvdisaster images
|
||||
install -d $(BUILDROOT)$(BINDIR)
|
||||
install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
|
||||
install -d $(BUILDROOT)$(DOCSUBDIR)
|
||||
- install -m 644 CHANGELOG $(BUILDROOT)$(DOCSUBDIR)
|
||||
- install -m 644 COPYING $(BUILDROOT)$(DOCSUBDIR)
|
||||
- install -m 644 CREDITS* $(BUILDROOT)$(DOCSUBDIR)
|
||||
- install -m 644 README.MODIFYING $(BUILDROOT)$(DOCSUBDIR)
|
||||
- install -m 644 TODO $(BUILDROOT)$(DOCSUBDIR)
|
||||
for i in $(DOC_LOCALES); do \
|
||||
install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
|
||||
(cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
|
||||
@@ -355,20 +350,7 @@ install: dvdisaster images
|
||||
install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
|
||||
done \
|
||||
fi
|
||||
- @echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
|
||||
- @echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
|
||||
- @echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
|
||||
- @echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
|
||||
- @echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
|
||||
- @echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
|
||||
- @for i in $(PO_LOCALES); do \
|
||||
- echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
|
||||
- done
|
||||
- @for i in $(MAN_LOCALES); do \
|
||||
- echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
|
||||
- done
|
||||
- @echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
|
||||
-
|
||||
+
|
||||
uninstall:
|
||||
@echo "Uninstalling package..."
|
||||
rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh
|
||||
475
debian/patches/12-fix-spelling-of-up-to.patch
vendored
Normal file
475
debian/patches/12-fix-spelling-of-up-to.patch
vendored
Normal file
@@ -0,0 +1,475 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
Forwarded: no
|
||||
Last-Update: 2016-12-19
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
debug.c | 2 +-
|
||||
documentation/dvdisaster.en.1 | 4 ++--
|
||||
documentation/en/qa10.html | 4 ++--
|
||||
documentation/en/qa10.php | 4 ++--
|
||||
documentation/en/qa20.html | 2 +-
|
||||
documentation/en/qa20.php | 2 +-
|
||||
dvdisaster.c | 2 +-
|
||||
dvdisaster.h | 2 +-
|
||||
locale/cs.po | 10 +++++-----
|
||||
locale/de.po | 10 +++++-----
|
||||
locale/it.po | 10 +++++-----
|
||||
locale/pt_BR.po | 10 +++++-----
|
||||
locale/ru.po | 12 ++++++------
|
||||
locale/sv.po | 8 ++++----
|
||||
preferences.c | 6 +++---
|
||||
15 files changed, 44 insertions(+), 44 deletions(-)
|
||||
|
||||
diff --git a/debug.c b/debug.c
|
||||
index 09b4ae0..2045ac6 100644
|
||||
--- a/debug.c
|
||||
+++ b/debug.c
|
||||
@@ -967,7 +967,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/dvdisaster.en.1 b/documentation/dvdisaster.en.1
|
||||
index 331090a..2623fd2 100644
|
||||
--- a/documentation/dvdisaster.en.1
|
||||
+++ b/documentation/dvdisaster.en.1
|
||||
@@ -254,7 +254,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
|
||||
@@ -321,7 +321,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/en/qa10.html b/documentation/en/qa10.html
|
||||
index 271c8f5..6b7516b 100644
|
||||
--- a/documentation/en/qa10.html
|
||||
+++ b/documentation/en/qa10.html
|
||||
@@ -91,10 +91,10 @@ The current version of dvdisaster contains screen texts in the following languag
|
||||
<tr><td> </td><td>Czech</td><td>--</td><td>complete</td></tr>
|
||||
<tr><td></td><td>English</td><td>--</td><td>complete</td></tr>
|
||||
<tr><td> </td><td>German</td><td>--</td><td>complete</td></tr>
|
||||
-<tr><td> </td><td>Italian</td><td>--</td><td>upto version 0.65</td></tr>
|
||||
+<tr><td> </td><td>Italian</td><td>--</td><td>up to version 0.65</td></tr>
|
||||
<tr><td></td><td>Portuguese</td><td>--</td><td>complete</td></tr>
|
||||
<tr><td> </td><td>Russian</td><td>--</td><td>complete</td></tr>
|
||||
-<tr><td> </td><td>Swedish</td><td>--</td><td>upto version 0.70</td></tr>
|
||||
+<tr><td> </td><td>Swedish</td><td>--</td><td>up to version 0.70</td></tr>
|
||||
</table><p>
|
||||
|
||||
Translators for other languages are welcome!<p>
|
||||
diff --git a/documentation/en/qa10.php b/documentation/en/qa10.php
|
||||
index e4b48bb..9d1801b 100644
|
||||
--- a/documentation/en/qa10.php
|
||||
+++ b/documentation/en/qa10.php
|
||||
@@ -30,10 +30,10 @@ The current version of dvdisaster contains screen texts in the following languag
|
||||
<tr><td> </td><td>Czech</td><td>--</td><td>complete</td></tr>
|
||||
<tr><td></td><td>English</td><td>--</td><td>complete</td></tr>
|
||||
<tr><td> </td><td>German</td><td>--</td><td>complete</td></tr>
|
||||
-<tr><td> </td><td>Italian</td><td>--</td><td>upto version 0.65</td></tr>
|
||||
+<tr><td> </td><td>Italian</td><td>--</td><td>up to version 0.65</td></tr>
|
||||
<tr><td></td><td>Portuguese</td><td>--</td><td>complete</td></tr>
|
||||
<tr><td> </td><td>Russian</td><td>--</td><td>complete</td></tr>
|
||||
-<tr><td> </td><td>Swedish</td><td>--</td><td>upto version 0.70</td></tr>
|
||||
+<tr><td> </td><td>Swedish</td><td>--</td><td>up to version 0.70</td></tr>
|
||||
</table><p>
|
||||
|
||||
Translators for other languages are welcome!<p>
|
||||
diff --git a/documentation/en/qa20.html b/documentation/en/qa20.html
|
||||
index 6660c41..fbe40a3 100644
|
||||
--- a/documentation/en/qa20.html
|
||||
+++ b/documentation/en/qa20.html
|
||||
@@ -218,7 +218,7 @@ dvdisaster.
|
||||
|
||||
The <a href="http://sourceforge.net/cvs/?group_id=157550">CVS versions</a>
|
||||
of dvdisaster mark their ecc files with a special bit. This causes dvdisaster
|
||||
-versions upto 0.65 to falsely display the above error message. Please use the
|
||||
+versions up to 0.65 to falsely display the above error message. Please use the
|
||||
CVS versions only together with dvdisaster 0.66 or newer versions.
|
||||
|
||||
<div class="talignr"><a href="qa20.html#top">↑</a></div>
|
||||
diff --git a/documentation/en/qa20.php b/documentation/en/qa20.php
|
||||
index fc268f9..23e9b71 100644
|
||||
--- a/documentation/en/qa20.php
|
||||
+++ b/documentation/en/qa20.php
|
||||
@@ -157,7 +157,7 @@ dvdisaster.
|
||||
|
||||
The <a href="http://sourceforge.net/cvs/?group_id=157550">CVS versions</a>
|
||||
of dvdisaster mark their ecc files with a special bit. This causes dvdisaster
|
||||
-versions upto 0.65 to falsely display the above error message. Please use the
|
||||
+versions up to 0.65 to falsely display the above error message. Please use the
|
||||
CVS versions only together with dvdisaster 0.66 or newer versions.
|
||||
|
||||
<div class="talignr"><a href="#top">↑</a></div>
|
||||
diff --git a/dvdisaster.c b/dvdisaster.c
|
||||
index afb8a04..60754cd 100644
|
||||
--- a/dvdisaster.c
|
||||
+++ b/dvdisaster.c
|
||||
@@ -887,7 +887,7 @@ int main(int argc, char *argv[])
|
||||
" --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/dvdisaster.h b/dvdisaster.h
|
||||
index 60dbcd0..87129cc 100644
|
||||
--- a/dvdisaster.h
|
||||
+++ b/dvdisaster.h
|
||||
@@ -368,7 +368,7 @@ typedef struct _EccInfo
|
||||
#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 7bea73a..c26007b 100644
|
||||
--- a/locale/cs.po
|
||||
+++ b/locale/cs.po
|
||||
@@ -479,7 +479,7 @@ msgid ""
|
||||
" --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"
|
||||
@@ -1603,7 +1603,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 CD/DVD drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
|
||||
msgstr ""
|
||||
@@ -1662,7 +1662,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 ""
|
||||
@@ -1768,7 +1768,7 @@ msgstr ""
|
||||
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 ""
|
||||
|
||||
#: preferences.c:2573
|
||||
@@ -5037,7 +5037,7 @@ msgstr ""
|
||||
#~ msgstr "Pokud můžete ověřit, že tato velikost obrazu je správná,\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 ""
|
||||
#~ "pošlete prosím celý výpis programu dvdisaster až k této řádce,\n"
|
||||
diff --git a/locale/de.po b/locale/de.po
|
||||
index 8444ec3..ed04fa2 100644
|
||||
--- a/locale/de.po
|
||||
+++ b/locale/de.po
|
||||
@@ -536,7 +536,7 @@ msgid ""
|
||||
" --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"
|
||||
@@ -1814,7 +1814,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 CD/DVD drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
|
||||
msgstr ""
|
||||
@@ -1886,7 +1886,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 ""
|
||||
@@ -2016,7 +2016,7 @@ msgstr "Dateien in Segmente von <= 2GB aufteilen"
|
||||
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>Dateien aufteilen</b>\n"
|
||||
"\n"
|
||||
@@ -5284,7 +5284,7 @@ msgstr "<i>Neu in dieser Version:</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/it.po b/locale/it.po
|
||||
index 9102232..feebde2 100644
|
||||
--- a/locale/it.po
|
||||
+++ b/locale/it.po
|
||||
@@ -475,7 +475,7 @@ msgid ""
|
||||
" --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"
|
||||
@@ -1596,7 +1596,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 CD/DVD drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
|
||||
msgstr ""
|
||||
@@ -1655,7 +1655,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 ""
|
||||
@@ -1761,7 +1761,7 @@ msgstr ""
|
||||
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 ""
|
||||
|
||||
#: preferences.c:2573
|
||||
@@ -5010,7 +5010,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 2069b41..803288a 100644
|
||||
--- a/locale/pt_BR.po
|
||||
+++ b/locale/pt_BR.po
|
||||
@@ -530,7 +530,7 @@ msgid ""
|
||||
" --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"
|
||||
@@ -1800,7 +1800,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 CD/DVD drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
|
||||
msgstr ""
|
||||
@@ -1872,7 +1872,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 ""
|
||||
@@ -2004,7 +2004,7 @@ msgstr "Separar arquivos em segmentos <= 2GB"
|
||||
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"
|
||||
@@ -5249,7 +5249,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"
|
||||
diff --git a/locale/ru.po b/locale/ru.po
|
||||
index 0e04113..b4d457d 100644
|
||||
--- a/locale/ru.po
|
||||
+++ b/locale/ru.po
|
||||
@@ -523,7 +523,7 @@ msgid ""
|
||||
" --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"
|
||||
@@ -1785,7 +1785,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 CD/DVD drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
|
||||
msgstr ""
|
||||
@@ -1857,7 +1857,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 ""
|
||||
@@ -1989,7 +1989,7 @@ msgstr "Разбивать файлы на сегменты <= 2Гб"
|
||||
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"
|
||||
@@ -5240,7 +5240,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"
|
||||
@@ -5336,7 +5336,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 3c062a4..397b877 100644
|
||||
--- a/locale/sv.po
|
||||
+++ b/locale/sv.po
|
||||
@@ -478,7 +478,7 @@ msgid ""
|
||||
" --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"
|
||||
@@ -1604,7 +1604,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 CD/DVD drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
|
||||
msgstr ""
|
||||
@@ -1663,7 +1663,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 ""
|
||||
@@ -1769,7 +1769,7 @@ msgstr ""
|
||||
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 ""
|
||||
|
||||
#: preferences.c:2573
|
||||
diff --git a/preferences.c b/preferences.c
|
||||
index 2f3355c..39f2c5f 100644
|
||||
--- a/preferences.c
|
||||
+++ b/preferences.c
|
||||
@@ -2181,7 +2181,7 @@ if(Closure->debugMode) /* hidden until version 0.80 */
|
||||
_("<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 "
|
||||
@@ -2296,7 +2296,7 @@ if(Closure->debugMode) /* hidden until version 0.80 */
|
||||
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 */
|
||||
@@ -2563,7 +2563,7 @@ if(Closure->debugMode) /* hidden until version 0.80 */
|
||||
AddHelpParagraph(lwoh,
|
||||
_("<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 "
|
||||
+ "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."));
|
||||
|
||||
56
debian/patches/13-fix-missing-language-field-in-po-files.patch
vendored
Normal file
56
debian/patches/13-fix-missing-language-field-in-po-files.patch
vendored
Normal file
@@ -0,0 +1,56 @@
|
||||
From: Carlos Maddela <e7appew@gmail.com>
|
||||
Date: Mon, 19 Dec 2016 07:04:02 +1100
|
||||
Subject: Fix missing language fields in PO files.
|
||||
|
||||
Description: Fix missing language fields in PO files.
|
||||
Author: Carlos Maddela <e7appew@gmail.com>
|
||||
Origin: vendor
|
||||
Forwarded: no
|
||||
Last-Update: 2016-12-19
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
locale/cs.po | 2 +-
|
||||
locale/pt_BR.po | 2 +-
|
||||
locale/ru.po | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/locale/cs.po b/locale/cs.po
|
||||
index c26007b..89a9d7f 100644
|
||||
--- a/locale/cs.po
|
||||
+++ b/locale/cs.po
|
||||
@@ -15,7 +15,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Language: \n"
|
||||
+"Language: cs_CZ\n"
|
||||
"X-Generator: KBabel 1.11.1\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
|
||||
|
||||
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
|
||||
index 803288a..4cc57ee 100644
|
||||
--- a/locale/pt_BR.po
|
||||
+++ b/locale/pt_BR.po
|
||||
@@ -14,7 +14,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Language: \n"
|
||||
+"Language: pt_BR\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
|
||||
#: closure.c:539
|
||||
diff --git a/locale/ru.po b/locale/ru.po
|
||||
index b4d457d..38ee2df 100644
|
||||
--- a/locale/ru.po
|
||||
+++ b/locale/ru.po
|
||||
@@ -16,7 +16,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Language: \n"
|
||||
+"Language: ru\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
|
||||
#: closure.c:539
|
||||
32
debian/patches/14-make-builds-reproducible.patch
vendored
Normal file
32
debian/patches/14-make-builds-reproducible.patch
vendored
Normal file
@@ -0,0 +1,32 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
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
|
||||
29
debian/patches/15-show-new-pkg-tracker.patch
vendored
Normal file
29
debian/patches/15-show-new-pkg-tracker.patch
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
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 ed86afe..fb1b457 100644
|
||||
--- a/help-dialogs.c
|
||||
+++ b/help-dialogs.c
|
||||
@@ -749,7 +749,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");
|
||||
78
debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch
vendored
Normal file
78
debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch
vendored
Normal file
@@ -0,0 +1,78 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2016-12-21
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
GNUmakefile.template | 34 ++++++++++++++++++----------------
|
||||
1 file changed, 18 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/GNUmakefile.template b/GNUmakefile.template
|
||||
index 10e4524..dd91bf3 100644
|
||||
--- a/GNUmakefile.template
|
||||
+++ b/GNUmakefile.template
|
||||
@@ -68,7 +68,7 @@ OFILES = $(CFG_OFILES)
|
||||
@echo "Compiling:" $*.c
|
||||
@$(CC) $(COPTS) -c $*.c
|
||||
|
||||
-all: time-stamp dvdisaster images
|
||||
+all: time-stamp dvdisaster
|
||||
|
||||
# Building the dvdisaster binary
|
||||
|
||||
@@ -310,24 +310,10 @@ show:
|
||||
.PHONY : www www-images
|
||||
.PHONY : srcdist windist
|
||||
|
||||
-install: dvdisaster images
|
||||
+install: dvdisaster
|
||||
@echo "Installing package..."
|
||||
install -d $(BUILDROOT)$(BINDIR)
|
||||
install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
|
||||
- install -d $(BUILDROOT)$(DOCSUBDIR)
|
||||
- for i in $(DOC_LOCALES); do \
|
||||
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
|
||||
- (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
|
||||
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/images; \
|
||||
- (cd documentation/$$i; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/images); \
|
||||
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails; \
|
||||
- (cd documentation/$$i; install -m 644 thumbnails/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails); \
|
||||
- done
|
||||
- install -d $(BUILDROOT)$(DOCSUBDIR)/images
|
||||
- cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
|
||||
-# cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
|
||||
- install -d $(BUILDROOT)$(DOCSUBDIR)/include
|
||||
- cd documentation; install -m 644 include/*.css $(BUILDROOT)$(DOCSUBDIR)/include
|
||||
install -d $(BUILDROOT)$(MANDIR)/man1
|
||||
install -d $(BUILDROOT)$(MANDIR)/cs/man1
|
||||
install -d $(BUILDROOT)$(MANDIR)/de/man1
|
||||
@@ -351,6 +337,22 @@ install: dvdisaster images
|
||||
done \
|
||||
fi
|
||||
|
||||
+install-doc: images
|
||||
+ install -d $(BUILDROOT)$(DOCSUBDIR)
|
||||
+ for i in $(DOC_LOCALES); do \
|
||||
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
|
||||
+ (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
|
||||
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/images; \
|
||||
+ (cd documentation/$$i; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/images); \
|
||||
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails; \
|
||||
+ (cd documentation/$$i; install -m 644 thumbnails/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails); \
|
||||
+ done
|
||||
+ install -d $(BUILDROOT)$(DOCSUBDIR)/images
|
||||
+ cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
|
||||
+# cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
|
||||
+ install -d $(BUILDROOT)$(DOCSUBDIR)/include
|
||||
+ cd documentation; install -m 644 include/*.css $(BUILDROOT)$(DOCSUBDIR)/include
|
||||
+
|
||||
uninstall:
|
||||
@echo "Uninstalling package..."
|
||||
rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh
|
||||
525
debian/patches/17-fix-all-but-deprecated-api-warnings.patch
vendored
Normal file
525
debian/patches/17-fix-all-but-deprecated-api-warnings.patch
vendored
Normal file
@@ -0,0 +1,525 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
Bug-Debian: https://bugs.debian.org/748416
|
||||
Forwarded: no
|
||||
Last-Update: 2016-12-22
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
closure.c | 10 ++++++----
|
||||
crcbuf.c | 2 --
|
||||
curve.c | 2 +-
|
||||
debug.c | 2 --
|
||||
file.c | 6 +++---
|
||||
heuristic-lec.c | 4 ++++
|
||||
large-io.c | 4 ++--
|
||||
md5.c | 2 +-
|
||||
memtrack.c | 3 +--
|
||||
menubar.c | 5 ++---
|
||||
preferences.c | 2 +-
|
||||
raw-editor.c | 9 +++------
|
||||
recover-raw.c | 2 +-
|
||||
rs01-common.c | 2 --
|
||||
rs01-fix.c | 4 ----
|
||||
scsi-layer.c | 4 ++++
|
||||
smart-lec.c | 10 +++++-----
|
||||
tools/codec.c | 2 ++
|
||||
tools/decimate.c | 1 +
|
||||
tools/memory.c | 3 +--
|
||||
tools/pngio.c | 4 ++--
|
||||
tools/pngpack.c | 1 +
|
||||
22 files changed, 41 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/closure.c b/closure.c
|
||||
index 6e344a9..ae98b79 100644
|
||||
--- a/closure.c
|
||||
+++ b/closure.c
|
||||
@@ -402,12 +402,12 @@ void ReadDotfile()
|
||||
while(TRUE)
|
||||
{ int n;
|
||||
char symbol[41];
|
||||
- char *value, *ignore;
|
||||
+ char *value;
|
||||
|
||||
/* Get first MAX_LINE_LEN bytes of line, discard the rest */
|
||||
|
||||
line[MAX_LINE_LEN-1] = 1;
|
||||
- ignore = 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')
|
||||
;
|
||||
@@ -436,12 +436,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, "browser")) { g_free(Closure->browser);
|
||||
Closure->browser = g_strdup(value); continue; }
|
||||
diff --git a/crcbuf.c b/crcbuf.c
|
||||
index 598355a..464953f 100644
|
||||
--- a/crcbuf.c
|
||||
+++ b/crcbuf.c
|
||||
@@ -83,7 +83,6 @@ CrcBuf *GetCRCFromRS02(void *layv, void *dhv, LargeFile *image)
|
||||
AlignedBuffer *ab = CreateAlignedBuffer(2048);
|
||||
CrcBuf *cb = g_malloc(sizeof(CrcBuf));
|
||||
gint64 block_idx[256];
|
||||
- guint32 *buf;
|
||||
gint64 image_sectors,crc_sector;
|
||||
gint64 s,i;
|
||||
int crc_idx, crc_valid = FALSE;
|
||||
@@ -93,7 +92,6 @@ CrcBuf *GetCRCFromRS02(void *layv, void *dhv, LargeFile *image)
|
||||
cb->crcbuf = g_malloc(image_sectors * sizeof(guint32));
|
||||
cb->size = image_sectors;
|
||||
cb->valid = CreateBitmap0(image_sectors);
|
||||
- buf = cb->crcbuf;
|
||||
|
||||
/* Initialize ecc block index pointers.
|
||||
The first CRC set (of lay->ndata checksums) relates to
|
||||
diff --git a/curve.c b/curve.c
|
||||
index ca8d8c4..d64c2e2 100644
|
||||
--- a/curve.c
|
||||
+++ b/curve.c
|
||||
@@ -122,7 +122,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/debug.c b/debug.c
|
||||
index 2045ac6..d93f24c 100644
|
||||
--- a/debug.c
|
||||
+++ b/debug.c
|
||||
@@ -1152,7 +1152,6 @@ void MergeImages(char *arg, int mode)
|
||||
char *left_path, *right_path;
|
||||
gint64 left_sectors, right_sectors,min_sectors,s;
|
||||
int percent,last_percent = 0;
|
||||
- gint64 left_missing, right_missing, mismatch;
|
||||
char *cpos = NULL;
|
||||
|
||||
/*** Evaluate arguments */
|
||||
@@ -1185,7 +1184,6 @@ void MergeImages(char *arg, int mode)
|
||||
|
||||
/*** Compare them */
|
||||
|
||||
- left_missing = right_missing = mismatch = 0;
|
||||
if(left_sectors < right_sectors)
|
||||
min_sectors = left_sectors;
|
||||
else min_sectors = right_sectors;
|
||||
diff --git a/file.c b/file.c
|
||||
index bdc4033..e153bd9 100644
|
||||
--- a/file.c
|
||||
+++ b/file.c
|
||||
@@ -246,9 +246,9 @@ void UnlinkImage(GtkWidget *label)
|
||||
{ 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/heuristic-lec.c b/heuristic-lec.c
|
||||
index 9508c50..2b10d9c 100644
|
||||
--- a/heuristic-lec.c
|
||||
+++ b/heuristic-lec.c
|
||||
@@ -1865,6 +1865,8 @@ int AckHeuristic(RawBuffer *rb)
|
||||
printf("AH L-EC: iteration %d\n", iteration);
|
||||
printf(" Q-f/c/e + d: %2d/%2d/%2d + %2d\n", q_failures, q_corrected, q_err, q_decimated);
|
||||
printf(" P-f/c/e + d: %2d/%2d/%2d + %2d\n", p_failures, p_corrected, p_err, p_decimated);
|
||||
+#else
|
||||
+ (void) p_decimated;
|
||||
#endif
|
||||
|
||||
if(p_failures + p_err + q_failures + q_err == 0) break;
|
||||
@@ -2120,6 +2122,8 @@ int BruteForceSearchPlausibleSector(RawBuffer *rb)
|
||||
Verbose("SPS L-EC: iteration %d\n", iteration);
|
||||
Verbose(" Q-f/c/e + d: %2d/%2d/%2d + %2d\n", q_failures, q_corrected, q_err, q_decimated);
|
||||
Verbose(" P-f/c/e + d: %2d/%2d/%2d + %2d\n", p_failures, p_corrected, p_err, p_decimated);
|
||||
+#else
|
||||
+ (void) p_decimated;
|
||||
#endif
|
||||
|
||||
if(p_failures + p_err + q_failures + q_err == 0) break;
|
||||
diff --git a/large-io.c b/large-io.c
|
||||
index 04e145f..e2f05e0 100644
|
||||
--- a/large-io.c
|
||||
+++ b/large-io.c
|
||||
@@ -425,7 +425,7 @@ ssize_t LargeRead(LargeFile *lf, void *buf, size_t count)
|
||||
|
||||
chunk = count > MAX_FILE_SIZE ? MAX_FILE_SIZE : count;
|
||||
|
||||
- read_in = read(lf->fileSegment[lf->segment], buf+n, chunk);
|
||||
+ read_in = read(lf->fileSegment[lf->segment], (char *)buf+n, chunk);
|
||||
n += read_in;
|
||||
count -= read_in;
|
||||
if(read_in != chunk) return n;
|
||||
@@ -591,7 +591,7 @@ ssize_t LargeWrite(LargeFile *lf, void *buf, size_t count)
|
||||
|
||||
chunk = count > MAX_FILE_SIZE ? MAX_FILE_SIZE : count;
|
||||
|
||||
- written = xwrite(lf->fileSegment[lf->segment], buf+n, chunk);
|
||||
+ written = xwrite(lf->fileSegment[lf->segment], (char *)buf+n, chunk);
|
||||
n += written;
|
||||
count -= written;
|
||||
if(written != chunk) return n;
|
||||
diff --git a/md5.c b/md5.c
|
||||
index 20c6240..d4e7ca6 100644
|
||||
--- a/md5.c
|
||||
+++ b/md5.c
|
||||
@@ -159,7 +159,7 @@ MD5Final(unsigned char digest[16], struct MD5Context *ctx)
|
||||
MD5Transform(ctx->buf, (guint32 *) ctx->in);
|
||||
byteReverse((unsigned char *) ctx->buf, 4);
|
||||
memmove(digest, ctx->buf, 16);
|
||||
- memset(ctx, 0, sizeof (ctx)); /* In case it's sensitive */
|
||||
+ memset(ctx, 0, sizeof (*ctx)); /* In case it's sensitive */
|
||||
}
|
||||
|
||||
/* The four core functions - F1 is optimized somewhat */
|
||||
diff --git a/memtrack.c b/memtrack.c
|
||||
index 68690f3..5f7ac50 100644
|
||||
--- a/memtrack.c
|
||||
+++ b/memtrack.c
|
||||
@@ -147,9 +147,8 @@ int forget(void *ptr)
|
||||
static void print_ptr(memchunk *mc, int size)
|
||||
{ char strbuf[16];
|
||||
char *ptr = (char*)mc->ptr;
|
||||
- int j,maxlen;
|
||||
+ int j;
|
||||
|
||||
- if(mc->size < size) maxlen = mc->size; else maxlen = size;
|
||||
for(j=0; j<15; j++)
|
||||
{ if(ptr[j]<32) break;
|
||||
strbuf[j] = ptr[j];
|
||||
diff --git a/menubar.c b/menubar.c
|
||||
index f31ae92..99ae4fc 100644
|
||||
--- a/menubar.c
|
||||
+++ b/menubar.c
|
||||
@@ -396,7 +396,7 @@ static void file_select_cb(GtkWidget *widget, gpointer data)
|
||||
*/
|
||||
|
||||
void set_path(GtkWidget *entry, char *path)
|
||||
-{ char *ignore;
|
||||
+{
|
||||
|
||||
if(path[0] == '/' || path[0] == '\\' || path[1] == ':' || strlen(path) < 1)
|
||||
{ gtk_entry_set_text(GTK_ENTRY(entry), path);
|
||||
@@ -405,11 +405,10 @@ void set_path(GtkWidget *entry, char *path)
|
||||
else
|
||||
{ char buf[PATH_MAX + strlen(path) + 2];
|
||||
|
||||
+ if(!getcwd(buf, PATH_MAX)) return;
|
||||
#ifdef SYS_MINGW
|
||||
- ignore = getcwd(buf, PATH_MAX);
|
||||
strcat(buf,"\\");
|
||||
#else
|
||||
- ignore = getcwd(buf, PATH_MAX);
|
||||
strcat(buf,"/");
|
||||
#endif
|
||||
strcat(buf,path);
|
||||
diff --git a/preferences.c b/preferences.c
|
||||
index 39f2c5f..db009af 100644
|
||||
--- a/preferences.c
|
||||
+++ b/preferences.c
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "dvdisaster.h"
|
||||
|
||||
-extern int CurrentMediumSize(int); /* from scsi-layer.h */
|
||||
+extern gint64 CurrentMediumSize(int); /* from scsi-layer.h */
|
||||
|
||||
/***
|
||||
*** debugging workaround
|
||||
diff --git a/raw-editor.c b/raw-editor.c
|
||||
index fd07f48..5818e57 100644
|
||||
--- a/raw-editor.c
|
||||
+++ b/raw-editor.c
|
||||
@@ -456,13 +456,12 @@ static void buffer_io_cb(GtkWidget *widget, gpointer data)
|
||||
case ACTION_FILESEL_LOAD_OK:
|
||||
{ LargeFile *file;
|
||||
char *path;
|
||||
- int n;
|
||||
|
||||
path = (char*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(rec->loadBufSel));
|
||||
gtk_widget_hide(rec->loadBufSel);
|
||||
|
||||
file = LargeOpen(path, O_RDONLY, IMG_PERMS);
|
||||
- n = LargeRead(file, rec->rb->recovered, rec->rb->sampleSize);
|
||||
+ LargeRead(file, rec->rb->recovered, rec->rb->sampleSize);
|
||||
LargeClose(file);
|
||||
|
||||
calculate_failures(rec);
|
||||
@@ -477,13 +476,12 @@ static void buffer_io_cb(GtkWidget *widget, gpointer data)
|
||||
case ACTION_FILESEL_SAVE_OK:
|
||||
{ LargeFile *file;
|
||||
char *path;
|
||||
- int n;
|
||||
|
||||
path = (char*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(rec->saveBufSel));
|
||||
gtk_widget_hide(rec->saveBufSel);
|
||||
|
||||
file = LargeOpen(path, O_RDWR | O_CREAT, IMG_PERMS);
|
||||
- n = LargeWrite(file, rec->rb->recovered, rec->rb->sampleSize);
|
||||
+ LargeWrite(file, rec->rb->recovered, rec->rb->sampleSize);
|
||||
LargeClose(file);
|
||||
|
||||
SetLabelText(GTK_LABEL(rec->rightLabel), _("Buffer saved to %s."), path);
|
||||
@@ -653,7 +651,7 @@ static gboolean expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer dat
|
||||
/* Button press event handler */
|
||||
|
||||
static gboolean button_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
|
||||
-{ static int last_action;
|
||||
+{
|
||||
raw_editor_context *rec = Closure->rawEditorContext;
|
||||
RawBuffer *rb = rec->rb;
|
||||
int mouse_x = event->x;
|
||||
@@ -816,7 +814,6 @@ static gboolean button_cb(GtkWidget *widget, GdkEventButton *event, gpointer dat
|
||||
|
||||
// undo_remember(rec);
|
||||
|
||||
- last_action = rec->onClickAction;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
diff --git a/recover-raw.c b/recover-raw.c
|
||||
index 892a7c0..4789922 100644
|
||||
--- a/recover-raw.c
|
||||
+++ b/recover-raw.c
|
||||
@@ -183,7 +183,7 @@ void ResetRawBuffer(RawBuffer *rb)
|
||||
for(i=0; i<N_Q_VECTORS; i++)
|
||||
rb->qParityN[i][0] = rb->qParityN[i][1] = 0;
|
||||
|
||||
- rb->bestFrame = rb->bestFrame = 0;
|
||||
+ rb->bestFrame = 0;
|
||||
rb->bestP1 = rb->bestP2 = N_P_VECTORS;
|
||||
rb->bestQ1 = rb->bestQ2 = N_Q_VECTORS;
|
||||
}
|
||||
diff --git a/rs01-common.c b/rs01-common.c
|
||||
index b8294c2..c6c2927 100644
|
||||
--- a/rs01-common.c
|
||||
+++ b/rs01-common.c
|
||||
@@ -96,7 +96,6 @@ void RS01ScanImage(Method *method, ImageInfo *ii, EccInfo *ei, int mode)
|
||||
gint64 prev_missing = 0;
|
||||
gint64 prev_crc_errors = 0;
|
||||
int last_percent,current_missing;
|
||||
- int fp_sector = FINGERPRINT_SECTOR;
|
||||
char *msg;
|
||||
|
||||
/* Extract widget list from method */
|
||||
@@ -110,7 +109,6 @@ void RS01ScanImage(Method *method, ImageInfo *ii, EccInfo *ei, int mode)
|
||||
{ LargeSeek(ei->file, 0);
|
||||
LargeRead(ei->file, &eh, sizeof(EccHeader));
|
||||
eh_sectors = uchar_to_gint64(eh.sectors);
|
||||
- fp_sector = eh.fpSector;
|
||||
}
|
||||
|
||||
/* Position behind the ecc file header,
|
||||
diff --git a/rs01-fix.c b/rs01-fix.c
|
||||
index fe7707b..c6e6a5f 100644
|
||||
--- a/rs01-fix.c
|
||||
+++ b/rs01-fix.c
|
||||
@@ -115,12 +115,10 @@ void RS01Fix(Method *method)
|
||||
EccHeader *eh = NULL;
|
||||
unsigned char parity[256];
|
||||
int erasure_count,erasure_list[256],erasure_map[256];
|
||||
- int unexpected_failure;
|
||||
gint64 block_idx[256];
|
||||
gint64 s,si;
|
||||
int i,j,k,n;
|
||||
gint64 corrected, uncorrected;
|
||||
- gint64 last_corrected, last_uncorrected;
|
||||
gint64 parity_block = 0;
|
||||
int worst_ecc,damaged_ecc,damaged_sec,percent,last_percent = -1;
|
||||
int cache_size,cache_sector,cache_offset = 0;
|
||||
@@ -345,7 +343,6 @@ void RS01Fix(Method *method)
|
||||
/*** Verify ecc information for the medium image. */
|
||||
|
||||
corrected = uncorrected = 0;
|
||||
- last_corrected = last_uncorrected = 0;
|
||||
worst_ecc = damaged_ecc = damaged_sec = local_plot_max = 0;
|
||||
|
||||
for(si=0; si<s; si++)
|
||||
@@ -380,7 +377,6 @@ void RS01Fix(Method *method)
|
||||
/* Determine erasures based on the "dead sector" marker */
|
||||
|
||||
erasure_count = 0;
|
||||
- unexpected_failure = 0;
|
||||
|
||||
for(i=0; i<ndata; i++)
|
||||
{ guint32 crc = Crc32(fc->imgBlock[i]+cache_offset, 2048);
|
||||
diff --git a/scsi-layer.c b/scsi-layer.c
|
||||
index cd7795a..0ba0976 100644
|
||||
--- a/scsi-layer.c
|
||||
+++ b/scsi-layer.c
|
||||
@@ -30,7 +30,9 @@
|
||||
|
||||
static int query_type(DeviceHandle*, int);
|
||||
static unsigned int query_size(DeviceHandle*);
|
||||
+#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);
|
||||
@@ -1656,6 +1658,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);
|
||||
@@ -1716,6 +1719,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 621ef86..3739a44 100644
|
||||
--- a/smart-lec.c
|
||||
+++ b/smart-lec.c
|
||||
@@ -26,9 +26,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
|
||||
|
||||
/***
|
||||
@@ -431,7 +431,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)
|
||||
@@ -1353,7 +1353,7 @@ static void swap_p_for_new_improvement(sh_context *shc)
|
||||
count++;
|
||||
|
||||
if(count < 2)
|
||||
- { verbose(" pruned");
|
||||
+ { verbose("%s", " pruned");
|
||||
goto decrement;
|
||||
}
|
||||
|
||||
@@ -1416,7 +1416,7 @@ decrement:
|
||||
if(index >= n_q) break;
|
||||
selection[index]=0;
|
||||
|
||||
- verbose("\n");
|
||||
+ verbose("%s", "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/tools/codec.c b/tools/codec.c
|
||||
index 33b85e0..ed7f4cb 100644
|
||||
--- a/tools/codec.c
|
||||
+++ b/tools/codec.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
|
||||
#include <bzlib.h>
|
||||
|
||||
@@ -520,6 +521,7 @@ void LoadPPK(char *name, Image ***list_out, int *n_out)
|
||||
|
||||
file_format = load_int(bzfile); /* always zero */
|
||||
file_format = load_int(bzfile);
|
||||
+ (void) file_format;
|
||||
|
||||
/* read the image list */
|
||||
|
||||
diff --git a/tools/decimate.c b/tools/decimate.c
|
||||
index b754ca4..13cbc6a 100644
|
||||
--- a/tools/decimate.c
|
||||
+++ b/tools/decimate.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
|
||||
#include "pngio.h"
|
||||
#include "memory.h"
|
||||
diff --git a/tools/memory.c b/tools/memory.c
|
||||
index edf32ec..2fb34ec 100644
|
||||
--- a/tools/memory.c
|
||||
+++ b/tools/memory.c
|
||||
@@ -144,9 +144,8 @@ int forget(void *ptr)
|
||||
static void print_ptr(memchunk *mc, int size)
|
||||
{ char strbuf[16];
|
||||
char *ptr = (char*)mc->ptr;
|
||||
- int j,maxlen;
|
||||
+ int j;
|
||||
|
||||
- if(mc->size < size) maxlen = mc->size; else maxlen = size;
|
||||
for(j=0; j<15; j++)
|
||||
{ if(ptr[j]<32) break;
|
||||
strbuf[j] = ptr[j];
|
||||
diff --git a/tools/pngio.c b/tools/pngio.c
|
||||
index 6c0f014..68db499 100644
|
||||
--- a/tools/pngio.c
|
||||
+++ b/tools/pngio.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "pngio.h"
|
||||
@@ -81,8 +82,7 @@ Image *LoadPNG(char *name)
|
||||
|
||||
/* verify that we've got a png file */
|
||||
|
||||
- fread(buf, 1, 8, pi->file);
|
||||
- if(png_sig_cmp(buf, 0, 8))
|
||||
+ if(fread(buf, 1, 8, pi->file) < 8 || png_sig_cmp(buf, 0, 8))
|
||||
{ fclose(pi->file);
|
||||
fprintf(stdout, "%s is not a .png file!\n", name);
|
||||
fflush(stdout);
|
||||
diff --git a/tools/pngpack.c b/tools/pngpack.c
|
||||
index c0d1c76..f882a08 100644
|
||||
--- a/tools/pngpack.c
|
||||
+++ b/tools/pngpack.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/stat.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
|
||||
#include "md5.h"
|
||||
#include "pngio.h"
|
||||
31
debian/patches/18-update-copyright-in-about-dialog.patch
vendored
Normal file
31
debian/patches/18-update-copyright-in-about-dialog.patch
vendored
Normal file
@@ -0,0 +1,31 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2016-12-22
|
||||
---
|
||||
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 fb1b457..3658bfc 100644
|
||||
--- a/help-dialogs.c
|
||||
+++ b/help-dialogs.c
|
||||
@@ -722,8 +722,9 @@ void AboutDialog()
|
||||
g_free(text);
|
||||
|
||||
#ifdef MODIFIED_SOURCE
|
||||
- AboutTextWithLink(vbox,
|
||||
- _("Modified version Copyright 2012 (please fill in - [directions])\n"
|
||||
+ AboutTextWithLink(vbox,
|
||||
+ _("[Modified version]\n"
|
||||
+ "Copyright 2005-2016 Debian Optical Media Tools Team\n"
|
||||
"Copyright 2004-2012 Carsten Gnoerlich"),
|
||||
"MODIFYING");
|
||||
#else
|
||||
44
debian/patches/19-show-text-files-with-abs-path.patch
vendored
Normal file
44
debian/patches/19-show-text-files-with-abs-path.patch
vendored
Normal file
@@ -0,0 +1,44 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
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 3658bfc..9151d52 100644
|
||||
--- a/help-dialogs.c
|
||||
+++ b/help-dialogs.c
|
||||
@@ -422,6 +422,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)
|
||||
47
debian/patches/20-display-changelog-credits-and-todo.patch
vendored
Normal file
47
debian/patches/20-display-changelog-credits-and-todo.patch
vendored
Normal file
@@ -0,0 +1,47 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
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 99ae4fc..33e6ba4 100644
|
||||
--- a/menubar.c
|
||||
+++ b/menubar.c
|
||||
@@ -116,21 +116,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:
|
||||
106
debian/patches/21-fix-privacy-breach-in-doco.patch
vendored
Normal file
106
debian/patches/21-fix-privacy-breach-in-doco.patch
vendored
Normal file
@@ -0,0 +1,106 @@
|
||||
From: Carlos Maddela <e7appew@gmail.com>
|
||||
Date: Fri, 23 Dec 2016 05:51:56 +1100
|
||||
Subject: Don't allow doco to automatically fetch resources from the internet.
|
||||
|
||||
Description: Don't allow doco to automatically fetch resources from
|
||||
the internet.
|
||||
.
|
||||
Remove link to the newsfeed, to fix Lintian privacy-breach-generic
|
||||
warning. The news feed no longer works anyway.
|
||||
Author: Carlos Maddela <e7appew@gmail.com>
|
||||
Origin: vendor
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2016-12-23
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
documentation/cs/index.html | 3 +--
|
||||
documentation/de/index.html | 3 +--
|
||||
documentation/en/index.html | 3 +--
|
||||
documentation/ru/index.html | 3 +--
|
||||
4 files changed, 4 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/documentation/cs/index.html b/documentation/cs/index.html
|
||||
index 7fa1778..920d849 100644
|
||||
--- a/documentation/cs/index.html
|
||||
+++ b/documentation/cs/index.html
|
||||
@@ -4,7 +4,6 @@
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||
<title>Přehled</title>
|
||||
<link rel="stylesheet" type="text/css" href="../include/dvdisaster.css">
|
||||
-<link rel="alternate" type="application/atom+xml" href="http://dvdisaster.net/cs/feed/atom.xml" title="dvdisaster - novinky">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -88,7 +87,7 @@
|
||||
<td style="background-color:#e0e0ff; width:20%;" valign="top">
|
||||
<table width="100%" cellpadding="10"><tr><td>
|
||||
<span class="fs"><b>Novinky</b></span>
|
||||
- <a href="http://dvdisaster.net/cs/feed/atom.xml"><img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder"></a>
|
||||
+ <img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder">
|
||||
<table width="100%" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td class="hsep"></td>
|
||||
diff --git a/documentation/de/index.html b/documentation/de/index.html
|
||||
index 994dbcb..85f4076 100644
|
||||
--- a/documentation/de/index.html
|
||||
+++ b/documentation/de/index.html
|
||||
@@ -4,7 +4,6 @@
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||
<title>Überblick</title>
|
||||
<link rel="stylesheet" type="text/css" href="../include/dvdisaster.css">
|
||||
-<link rel="alternate" type="application/atom+xml" href="http://dvdisaster.net/de/feed/atom.xml" title="Neues von dvdisaster">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -118,7 +117,7 @@ Solche Funktionen sind mit den Zielen und dem inneren Aufbau von dvdisaster nich
|
||||
<td style="background-color:#e0e0ff; width:20%;" valign="top">
|
||||
<table width="100%" cellpadding="10"><tr><td>
|
||||
<span class="fs"><b>Neuigkeiten</b></span>
|
||||
- <a href="http://dvdisaster.net/de/feed/atom.xml"><img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder"></a>
|
||||
+ <img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder">
|
||||
<table width="100%" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td class="hsep"></td>
|
||||
diff --git a/documentation/en/index.html b/documentation/en/index.html
|
||||
index 32fe230..ff2a30f 100644
|
||||
--- a/documentation/en/index.html
|
||||
+++ b/documentation/en/index.html
|
||||
@@ -4,7 +4,6 @@
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||
<title>Overview</title>
|
||||
<link rel="stylesheet" type="text/css" href="../include/dvdisaster.css">
|
||||
-<link rel="alternate" type="application/atom+xml" href="http://dvdisaster.net/en/feed/atom.xml" title="dvdisaster news">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -117,7 +116,7 @@ Such functions are outside the scope of dvdisaster's internal design and goals.<
|
||||
<td style="background-color:#e0e0ff; width:20%;" valign="top">
|
||||
<table width="100%" cellpadding="10"><tr><td>
|
||||
<span class="fs"><b>News</b></span>
|
||||
- <a href="http://dvdisaster.net/en/feed/atom.xml"><img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder"></a>
|
||||
+ <img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder">
|
||||
<table width="100%" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td class="hsep"></td>
|
||||
diff --git a/documentation/ru/index.html b/documentation/ru/index.html
|
||||
index 1126100..d74caa1 100644
|
||||
--- a/documentation/ru/index.html
|
||||
+++ b/documentation/ru/index.html
|
||||
@@ -4,7 +4,6 @@
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||
<title>Обзор</title>
|
||||
<link rel="stylesheet" type="text/css" href="../include/dvdisaster.css">
|
||||
-<link rel="alternate" type="application/atom+xml" href="http://dvdisaster.net/ru/feed/atom.xml" title="dvdisaster news">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -115,7 +114,7 @@ dvdisaster хранит данные на CD/DVD (<a href="qa10.html#media">по
|
||||
<td style="background-color:#e0e0ff; width:20%;" valign="top">
|
||||
<table width="100%" cellpadding="10"><tr><td>
|
||||
<span class="fs"><b>Новости</b></span>
|
||||
- <a href="http://dvdisaster.net/ru/feed/atom.xml"><img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder"></a>
|
||||
+ <img src="../images/atom16.png" alt="Subscribe to dvdisaster news feed" class="noborder">
|
||||
<table width="100%" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td class="hsep"></td>
|
||||
32
debian/patches/22-fix-hurd-i386-ftbfs.patch
vendored
Normal file
32
debian/patches/22-fix-hurd-i386-ftbfs.patch
vendored
Normal file
@@ -0,0 +1,32 @@
|
||||
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>
|
||||
Origin: vendor
|
||||
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 33e6ba4..0a40e1a 100644
|
||||
--- a/menubar.c
|
||||
+++ b/menubar.c
|
||||
@@ -23,6 +23,10 @@
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
+#ifndef PATH_MAX
|
||||
+ #define PATH_MAX 4096
|
||||
+#endif
|
||||
+
|
||||
/***
|
||||
*** Forward declarations
|
||||
***/
|
||||
32
debian/patches/23-add-bdrom-support.patch
vendored
Normal file
32
debian/patches/23-add-bdrom-support.patch
vendored
Normal file
@@ -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: vendor, 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 0ba0976..8b005ec 100644
|
||||
--- a/scsi-layer.c
|
||||
+++ b/scsi-layer.c
|
||||
@@ -1035,7 +1035,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))
|
||||
40
debian/patches/libpng15
vendored
40
debian/patches/libpng15
vendored
@@ -1,40 +0,0 @@
|
||||
Description: <short summary of the patch>
|
||||
TODO: Put a short summary on the line above and replace this paragraph
|
||||
with a longer explanation of this change. Complete the meta-information
|
||||
with other relevant fields (see below for details). To make it easier, the
|
||||
information below has been extracted from the changelog. Adjust it or drop
|
||||
it.
|
||||
.
|
||||
dvdisaster (0.72.3-1+libpng151) unstable; urgency=low
|
||||
.
|
||||
* Build with libpng15.
|
||||
Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
|
||||
|
||||
---
|
||||
The information above should follow the Patch Tagging Guidelines, please
|
||||
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
|
||||
are templates for supplementary fields that you might want to add:
|
||||
|
||||
Origin: <vendor|upstream|other>, <url of original patch>
|
||||
Bug: <url in upstream bugtracker>
|
||||
Bug-Debian: http://bugs.debian.org/<bugnumber>
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
|
||||
Forwarded: <no|not-needed|url proving that it has been forwarded>
|
||||
Reviewed-By: <name and email of someone who approved the patch>
|
||||
Last-Update: <YYYY-MM-DD>
|
||||
|
||||
Index: dvdisaster/tools/pngio.h
|
||||
===================================================================
|
||||
--- dvdisaster.orig/tools/pngio.h 2012-04-08 21:51:11.671592091 +0900
|
||||
+++ dvdisaster/tools/pngio.h 2012-04-08 21:51:13.799602501 +0900
|
||||
@@ -22,6 +22,10 @@
|
||||
|
||||
#include <zlib.h>
|
||||
#include <png.h>
|
||||
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ #include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
typedef struct
|
||||
{ char *name;
|
||||
18
debian/patches/series
vendored
18
debian/patches/series
vendored
@@ -1,6 +1,22 @@
|
||||
libpng15
|
||||
01-libpng15.patch
|
||||
02-encryption.patch
|
||||
03-dvdrom.patch
|
||||
05-help-dialog.patch
|
||||
06-remove-encoding-from-desktop-file.patch
|
||||
07-fix-spelling-errors-in-binaries.patch
|
||||
08-fix-gnu-make-detection.patch
|
||||
09-fix-format-security-warnings.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
|
||||
21-fix-privacy-breach-in-doco.patch
|
||||
22-fix-hurd-i386-ftbfs.patch
|
||||
23-add-bdrom-support.patch
|
||||
|
||||
151
debian/pixmaps/dvdisaster.xpm
vendored
151
debian/pixmaps/dvdisaster.xpm
vendored
@@ -1,151 +0,0 @@
|
||||
/* XPM */
|
||||
static char * dvdisaster_xpm[] = {
|
||||
"32 32 116 2",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"+ c #0F0F0F",
|
||||
"@ c #424242",
|
||||
"# c #656565",
|
||||
"$ c #737373",
|
||||
"% c #545454",
|
||||
"& c #111111",
|
||||
"* c #080808",
|
||||
"= c #626262",
|
||||
"- c #C1C1C1",
|
||||
"; c #FBFBFB",
|
||||
"> c #FFFFFF",
|
||||
", c #F7F7F7",
|
||||
"' c #8B8B8B",
|
||||
") c #060817",
|
||||
"! c #020308",
|
||||
"~ c #010101",
|
||||
"{ c #606060",
|
||||
"] c #E4E4E4",
|
||||
"^ c #CBCBCB",
|
||||
"/ c #131316",
|
||||
"( c #2C379A",
|
||||
"_ c #1A215C",
|
||||
": c #000001",
|
||||
"< c #121212",
|
||||
"[ c #B4B4B4",
|
||||
"} c #B9B9B9",
|
||||
"| c #090B1C",
|
||||
"1 c #4354EB",
|
||||
"2 c #323EAD",
|
||||
"3 c #050612",
|
||||
"4 c #1D1D1D",
|
||||
"5 c #D8D8D8",
|
||||
"6 c #C5C5C5",
|
||||
"7 c #6F6F6F",
|
||||
"8 c #575757",
|
||||
"9 c #2A3492",
|
||||
"0 c #4658F5",
|
||||
"a c #3B4BD0",
|
||||
"b c #080A1C",
|
||||
"c c #9E9E9E",
|
||||
"d c #263084",
|
||||
"e c #BABABA",
|
||||
"f c #12173F",
|
||||
"g c #131314",
|
||||
"h c #3B4ACE",
|
||||
"i c #EEEEEE",
|
||||
"j c #04050F",
|
||||
"k c #E6E6E6",
|
||||
"l c #070817",
|
||||
"m c #04050D",
|
||||
"n c #3F4FDB",
|
||||
"o c #11163C",
|
||||
"p c #1B225E",
|
||||
"q c #5C5C5C",
|
||||
"r c #28338D",
|
||||
"s c #3542B9",
|
||||
"t c #090A19",
|
||||
"u c #4254E9",
|
||||
"v c #4557F1",
|
||||
"w c #04050E",
|
||||
"x c #D3D3D3",
|
||||
"y c #171718",
|
||||
"z c #313EAC",
|
||||
"A c #989898",
|
||||
"B c #0F0F13",
|
||||
"C c #1C2361",
|
||||
"D c #ECECEC",
|
||||
"E c #A8A8A8",
|
||||
"F c #858585",
|
||||
"G c #7B7B7B",
|
||||
"H c #595959",
|
||||
"I c #141946",
|
||||
"J c #3948C9",
|
||||
"K c #20286E",
|
||||
"L c #DFDFDF",
|
||||
"M c #0A0B13",
|
||||
"N c #161C4E",
|
||||
"O c #212A74",
|
||||
"P c #242D7E",
|
||||
"Q c #3E4ED9",
|
||||
"R c #B5B5B5",
|
||||
"S c #101014",
|
||||
"T c #3543BB",
|
||||
"U c #F9F9F9",
|
||||
"V c #242424",
|
||||
"W c #303CA7",
|
||||
"X c #A3A3A3",
|
||||
"Y c #141A47",
|
||||
"Z c #3644BD",
|
||||
"` c #1E266B",
|
||||
" . c #494949",
|
||||
".. c #303CA8",
|
||||
"+. c #2B3798",
|
||||
"@. c #1B1B1D",
|
||||
"#. c #8A8A8A",
|
||||
"$. c #131313",
|
||||
"%. c #4050DF",
|
||||
"&. c #4556F1",
|
||||
"*. c #070814",
|
||||
"=. c #D6D6D6",
|
||||
"-. c #3F4FDC",
|
||||
";. c #181818",
|
||||
">. c #4051E1",
|
||||
",. c #9F9F9F",
|
||||
"'. c #161C4D",
|
||||
"). c #1F1F1F",
|
||||
"!. c #323FAF",
|
||||
"~. c #090A14",
|
||||
"{. c #3846C3",
|
||||
"]. c #030309",
|
||||
"^. c #28328A",
|
||||
"/. c #4456EF",
|
||||
"(. c #060715",
|
||||
"_. c #181F56",
|
||||
" ",
|
||||
" . + @ # $ $ % & . . ",
|
||||
" . * = - ; > > > > > , ' * ) ! . ",
|
||||
" ~ { ] > > > > > > > > > > ^ / ( _ : ",
|
||||
" < [ > > > > > > > > > > > > > } | 1 2 3 ",
|
||||
" 4 5 > > > > > > > 6 7 7 6 > > > > 8 9 0 a b ",
|
||||
" < 5 > > > > > > > c | d d | c > > > e f 0 0 a 3 ",
|
||||
" ~ [ > > > > > > > ; g h 0 0 h g ; > > i j 0 0 0 2 : ",
|
||||
" . { > > > > > > > > k l 0 0 0 0 l k > > > . 0 0 0 0 _ . ",
|
||||
" * ] > > > > > > > > ; g h 0 0 h g ; > > i m 0 0 0 0 n ! ",
|
||||
" = > > > > > > > > > > c | d d | c > > > e o 0 0 0 0 0 p ",
|
||||
" . - > > > > > > > > > > > 6 7 7 6 > > > > q r 0 0 0 0 0 s . ",
|
||||
" + ; > > > > > > > > > > > > > > > > > > - t u 0 0 0 0 0 v w ",
|
||||
" @ > > > > > > > > > > > > > > > > > > x y z 0 0 0 0 0 0 0 f ",
|
||||
" # > > > > > > > > > > > > > > > > ; A B ( 0 0 0 0 0 0 0 0 C ",
|
||||
" $ > > > > > > > > > > > D E F G H y I J 0 0 0 0 0 0 0 0 0 K ",
|
||||
" $ > > > > > > > > > L q M N O P ( Q 0 0 0 0 0 0 0 0 0 0 0 K ",
|
||||
" # > > > > > > > > R S P 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C ",
|
||||
" @ > > > > > > > 6 M T 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f ",
|
||||
" + ; > > > > > U V W 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 v w ",
|
||||
" . - > > > > > X Y 0 0 0 0 Z ` ` Z 0 0 0 0 0 0 0 0 0 0 0 s . ",
|
||||
" = > > > > > ...0 0 0 +.@.#.#.@.+.0 0 0 0 0 0 0 0 0 0 p ",
|
||||
" * ] > > > > $.%.0 0 &.*.=.> > =.*.&.0 0 0 0 0 0 0 0 n ! ",
|
||||
" . { > > > > . 0 0 0 -.;.> > > > ;.-.0 0 0 0 0 0 0 0 _ . ",
|
||||
" ~ [ > > > $.>.0 0 &.*.=.> > =.*.&.0 0 0 0 0 0 0 2 : ",
|
||||
" < 5 > > .z 0 0 0 +.@.#.#.@.+.0 0 0 0 0 0 0 a 3 ",
|
||||
" 4 5 > ,.'.0 0 0 0 Z ` ` Z 0 0 0 0 0 0 0 a b ",
|
||||
" < [ , ).!.0 0 0 0 0 0 0 0 0 0 0 0 0 2 3 ",
|
||||
" ~ { X ~.{.0 0 0 0 0 0 0 0 0 0 n _ : ",
|
||||
" . * ;.].^./.0 0 0 0 0 v s p ! . ",
|
||||
" . . (._.K K C f w . ",
|
||||
" "};
|
||||
52
debian/rules
vendored
52
debian/rules
vendored
@@ -1,34 +1,48 @@
|
||||
#!/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
|
||||
|
||||
MUTABLE_FILES := build.h $(wildcard locale/*.po)
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
#override_dh_autoclean:
|
||||
# dh_autoclean
|
||||
# find documentation -name "*.png" | xargs rm -f
|
||||
|
||||
|
||||
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/html
|
||||
--docsubdir=dvdisaster-doc/html \
|
||||
--with-embedded-src-path=no
|
||||
|
||||
override_dh_auto_install:
|
||||
dh_auto_install -- BUILDROOT=$(CURDIR)/debian/tmp
|
||||
override_dh_clean:
|
||||
dh_clean -X.orig
|
||||
for f in $(MUTABLE_FILES); do \
|
||||
test ! -f $$f.orig || mv -f $$f.orig $$f; \
|
||||
done
|
||||
|
||||
# Installing desktop file
|
||||
install -D -m 0644 contrib/dvdisaster.desktop debian/dvdisaster/usr/share/applications/dvdisaster.desktop
|
||||
sed -i -e 's/dvdisaster48/dvdisaster/' debian/dvdisaster/usr/share/applications/dvdisaster.desktop
|
||||
override_dh_auto_build-arch:
|
||||
make all
|
||||
|
||||
# Installing icon
|
||||
install -D -m 0644 contrib/dvdisaster32.png debian/dvdisaster/usr/share/icons/dvdisaster.png
|
||||
override_dh_auto_build-indep:
|
||||
make images
|
||||
|
||||
# Installing pixmaps
|
||||
install -D -m 0644 debian/pixmaps/dvdisaster.xpm debian/dvdisaster/usr/share/pixmaps/dvdisaster.xpm
|
||||
override_dh_auto_install-arch:
|
||||
dh_auto_install -a -- BUILDROOT=$(CURDIR)/debian/tmp
|
||||
|
||||
# Removing double files
|
||||
rm -f debian/tmp/usr/bin/dvdisaster-uninstall.sh
|
||||
rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/CHANGELOG
|
||||
rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/COPYING
|
||||
override_dh_auto_install-indep:
|
||||
make install-doc BUILDROOT=$(CURDIR)/debian/tmp
|
||||
|
||||
# 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
|
||||
|
||||
1
debian/source/options
vendored
Normal file
1
debian/source/options
vendored
Normal file
@@ -0,0 +1 @@
|
||||
no-unapply-patches
|
||||
73
debian/upstream/signing-key.asc
vendored
Normal file
73
debian/upstream/signing-key.asc
vendored
Normal file
@@ -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-----
|
||||
6
debian/watch
vendored
6
debian/watch
vendored
@@ -1,2 +1,6 @@
|
||||
version=3
|
||||
http://dvdisaster.net/downloads/dvdisaster-(.*)\.tar\.bz2
|
||||
opts="pgpsigurlmangle=s/$/.gpg/, \
|
||||
compression=xz, \
|
||||
repack" \
|
||||
http://dvdisaster.net/en/index.html \
|
||||
(?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate
|
||||
|
||||
0
documentation/cs/thumbnails/.gitignore
vendored
Normal file
0
documentation/cs/thumbnails/.gitignore
vendored
Normal file
Reference in New Issue
Block a user