Compare commits

...

28 Commits

Author SHA1 Message Date
Rogério Brito
848b6782bd Update the changelog 2010-08-24 12:11:39 -03:00
Rogério Brito
b8f0e626e4 Update standards version with no changes needed 2010-07-26 17:50:26 -03:00
Rogério Brito
96b581bdd0 Fix for another typo in the manpage 2010-07-26 17:33:45 -03:00
Rogério Brito
cea78c3862 Add patch to fix spelling errors in the binaries 2010-07-26 17:24:49 -03:00
Rogério Brito
80e291c7e4 Add description for the patch 2010-07-26 17:24:19 -03:00
Rogério Brito
57e4fab14b Update patch to deal with hyphens used as minus signs 2010-07-26 17:14:02 -03:00
Rogério Brito
219494102d Remove UTF-8 encoding from desktop file 2010-07-26 15:47:20 -03:00
Rogério Brito
f51c51aad9 Add debian/watch file to more closely follow upstream 2010-07-26 15:33:32 -03:00
Rogério Brito
7771474ad7 Remove duplicate section field for dvdisaster 2010-07-26 15:28:28 -03:00
Rogério Brito
65764829ad Remove unneeded patch
It is in the repository, if we happen to need it.
2010-07-26 15:22:56 -03:00
Rogério Brito
9fe0db45c7 Fix incorrect place of misc:depends. 2010-07-26 15:07:11 -03:00
Rogério Brito
70a6efdc89 Rewrap the build-depends line, for diff-friendliness. 2010-07-26 15:05:43 -03:00
Rogério Brito
fac6933b94 Add missing misc-depends on dvdisaster 2010-07-26 15:05:00 -03:00
Rogério Brito
00e19688b4 Don't patch the documentation directly.
Don't patch the documentation directly, to avoid one extra patch
in divergence from upstream.

Use the BUILDROOT variable instead of setting BINDIR etc during
installation.
2009-12-09 23:42:23 -02:00
Rogério Brito
237207698a Wrap one extra line. 2009-12-09 21:38:42 -02:00
Rogério Brito
af26379c0c Wrap some long lines for legibility. 2009-12-09 21:08:38 -02:00
Rogério Brito
3ee8b47d0c Initial migration to format "3.0 (quilt)". 2009-12-07 16:25:30 -02:00
Rogério Brito
da276c7fc4 Refresh patches to avoid potential problems with the buildds. 2009-12-07 16:22:30 -02:00
TANIGUCHI Takaki
d8edfc2ac4 debian/control: typo, Vcs-Git 2009-11-23 10:38:25 +09:00
TANIGUCHI Takaki
0683a48953 debian/control: add Vcs-* 2009-11-23 10:29:20 +09:00
TANIGUCHI Takaki
a6dd6eaf97 debian/README.source create 2009-11-22 19:52:49 +09:00
TANIGUCHI Takaki
9e778cc617 debian/contrl: update Homepage; debian/README.source: create 2009-11-22 19:27:29 +09:00
TANIGUCHI Takaki
26207495ec add .gitignore files 2009-11-22 18:01:36 +09:00
TANIGUCHI Takaki
487811728e Revert "documentatoin/images/.gitignore: dummy file"
This reverts commit 1fbaa497e2.
2009-11-22 17:32:45 +09:00
TANIGUCHI Takaki
1fbaa497e2 documentatoin/images/.gitignore: dummy file 2009-11-22 17:21:12 +09:00
TANIGUCHI Takaki
8f429ba0a8 debicn/control: new maintainer 2009-11-22 16:56:08 +09:00
TANIGUCHI Takaki
a02e5d8a10 Merge commit 'upstream/0.72.1' 2009-11-22 16:53:43 +09:00
Daniel Baumann
8ea2ebcd2a Imported Debian patch 0.72-2 2009-11-21 16:29:04 +09:00
30 changed files with 976 additions and 0 deletions

282
debian/changelog vendored Normal file
View File

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

1
debian/compat vendored Normal file
View File

@@ -0,0 +1 @@
7

38
debian/control vendored Normal file
View File

@@ -0,0 +1,38 @@
Source: dvdisaster
Section: otherosfs
Priority: optional
Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org>
Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
Rogério Brito <rbrito@ime.usp.br>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7),
gettext,
libbz2-dev,
libgtk2.0-dev,
libpng12-dev,
pkg-config
Standards-Version: 3.9.1
Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvdisaster.git
Vcs-Git: git://git.debian.org/pkg-opt-media/dvdisaster.git
Homepage: http://dvdisaster.net/
Package: dvdisaster
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xdg-utils
Recommends: dvdisaster-doc
Description: data loss/scratch/aging protection for CD/DVD media
dvdisaster provides a margin of safety against data loss on CD and DVD media
caused by scratches or aging media. It creates error correction data which is
used to recover unreadable sectors if the disc becomes damaged at a later time.
Package: dvdisaster-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Suggests: dvdisaster
Description: data loss/scratch/aging protection for CD/DVD media (documentation)
dvdisaster provides a margin of safety against data loss on CD and DVD media
caused by scratches or aging media. It creates error correction data which is
used to recover unreadable sectors if the disc becomes damaged at a later time.
.
This package contains the documentation.

42
debian/copyright vendored Normal file
View File

@@ -0,0 +1,42 @@
Author: Carsten Gnoerlich <cgnoerlich@fsfe.org>
Download: http://www.dvdisaster.com/
Files: *
Copyright: Copyright (C) 2004-2009 Carsten Gnoerlich <cgnoerlich@fsfe.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>
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.

6
debian/dvdisaster-doc.docs vendored Normal file
View File

@@ -0,0 +1,6 @@
CREDITS.cs
CREDITS.de
CREDITS.en
README.MODIFYING
TODO
TRANSLATION.HOWTO

1
debian/dvdisaster-doc.install vendored Normal file
View File

@@ -0,0 +1 @@
/usr/share/doc/dvdisaster-doc

6
debian/dvdisaster.docs vendored Normal file
View File

@@ -0,0 +1,6 @@
CREDITS.cs
CREDITS.de
CREDITS.en
README.MODIFYING
TODO
TRANSLATION.HOWTO

1
debian/dvdisaster.examples vendored Normal file
View File

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

3
debian/dvdisaster.install vendored Normal file
View File

@@ -0,0 +1,3 @@
/usr/bin
/usr/share/locale
/usr/share/man

4
debian/dvdisaster.menu vendored Normal file
View File

@@ -0,0 +1,4 @@
?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"

41
debian/examples/gmkrs02 vendored Normal file
View File

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

19
debian/patches/02-encryption.patch vendored Normal file
View File

@@ -0,0 +1,19 @@
Author: n/a
Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2658,11 +2658,12 @@
return NULL;
}
}
-
+/*
if(dh->mainType == DVD && query_copyright(dh))
{ CloseDevice(dh);
Stop(_("This software does not support encrypted media.\n"));
}
+*/
/* Create the bitmap of simulated defects */

17
debian/patches/03-dvdrom.patch vendored Normal file
View File

@@ -0,0 +1,17 @@
Author: Corey Wright <undefined@pobox.com>
Description: Adds support for DVD-ROM medium-type.
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -890,6 +890,11 @@
break;
}
+ if(layer_type & 0x01)
+ { dh->typeDescr = g_strdup("DVD-ROM");
+ break;
+ }
+
if(layer_type & 0x06) /* strange thing: (re-)writeable but neither plus nor dash */
{ dh->typeDescr = g_strdup("DVD-ROM (fake)");
dh->subType = DVD;

152
debian/patches/04-manpage.patch vendored Normal file
View File

@@ -0,0 +1,152 @@
Authors: Daniel Baumann <daniel@debian.org>
Rogério Theodoro de Brito <rbrito@ime.usp.br>
Description: Fixes typo in manpages.
The patch also deals with hyphens used as minus signs.
--- a/documentation/dvdisaster.cs.1
+++ b/documentation/dvdisaster.cs.1
@@ -7,7 +7,7 @@
.\"
.TH DVDISASTER 1 "2006-01-04" "0.65" "ochrana pro média CD/DVD"
-.SH NÁZEV
+.SH JM<4A>NO
DVDISASTER \- ochrana proti ztrátě dat poškrábáním/stárnutím média CD/DVD
.SH SYNTAXE
@@ -49,8 +49,8 @@
Obecné příklady použití:
.TP
.B \-r, \-\-read
-Načte obraz média na pevný disk. Použijte -rn-m k načtení určitého rozsahu sektorů,
-t.j. -r100-200.
+Načte obraz média na pevný disk. Použijte \-rn-m k načtení určitého rozsahu sektorů,
+t.j. \-r100-200.
.TP
.B \-c, \-\-create
Vytvoří informaci .ecc pro obraz média.
@@ -98,7 +98,7 @@
automaticky přidá souborové přípony .img a .ecc.
.TP
.B \-\-cache-size n
-velikost varovnávací paměti v MB v průběhu akce -c (výchozí: 32 MB).
+velikost varovnávací paměti v MB v průběhu akce \-c (výchozí: 32 MB).
.TP
.B \-\-dao
předpokládá disk DAO; neořezávat konec obrazu.
--- a/documentation/dvdisaster.en.1
+++ b/documentation/dvdisaster.en.1
@@ -102,8 +102,8 @@
Action selection (at least one action must be specified):
.TP
.B \-r, \-\-read
-Read the medium image to hard disc. Use -rn-m to read a certain sector range,
-e.g. -r100-200.
+Read the medium image to hard disc. Use \-rn-m to read a certain sector range,
+e.g. \-r100-200.
.TP
.B \-c, \-\-create
Create .ecc information for the medium image.
@@ -163,7 +163,7 @@
automatically add .iso and .ecc file suffixes.
.TP
.B \-\-cache-size n
-image cache size in MB during -c mode (default: 32MB).
+image cache size in MB during \-c mode (default: 32MB).
.TP
.B \-\-dao
assume DAO disc; do not trim image end.
@@ -178,12 +178,12 @@
continue reading after potentially fatal error condition.
.TP
.B \-\-internal-rereads n
-internal read attempts for defective CD media sectors (default: -1)
+internal read attempts for defective CD media sectors (default: \-1)
.RS
The drive firmware usually retries unreadable sectors a few times before
giving up and returning a read error. It is more efficient to set this to 0 or 1
-and manage read attempts through the --read-attempts parameter. Most drives ignore
-this setting anyways. Use -1 to leave the drive at its default setting.
+and manage read attempts through the \-\-read-attempts parameter. Most drives ignore
+this setting anyways. Use \-1 to leave the drive at its default setting.
.RE
.TP
.B \-\-query-size n
@@ -196,7 +196,7 @@
selects raw reading mode for CD media (default: 20)
.RS
The recommended mode is 20, which makes the drive apply its built-in error
-correction to the best possible extent before transfering a defective sector.
+correction to the best possible extent before transferring a defective sector.
However some drives can only read defective sectors using mode 21, skipping
the last stage of the internal error correction and returning
the uncorrected sector instead.
--- a/documentation/dvdisaster.de.1
+++ b/documentation/dvdisaster.de.1
@@ -110,8 +110,8 @@
Aktions-Auswahl (mindestens eine Aktion muss gew\[:a]hlt werden):
.TP
.B \-r, \-\-read
-Datentr\[:a]ger-Abbild auf Festplatte einlesen. -rn-m liest einen Bereich von
-Sektoren, z.B. -r100-200.
+Datentr\[:a]ger-Abbild auf Festplatte einlesen. \-rn-m liest einen Bereich von
+Sektoren, z.B. \-r100-200.
.TP
.B \-c, \-\-create
Erzeugt Fehlerkorrektur-Daten f\[:u]r das Abbild.
@@ -186,12 +186,12 @@
Lesen nach m\[:o]glicherweise schwerwiegenden Fehlern fortsetzen.
.TP
.B \-\-internal-rereads n
-Leseversuche innerhalb des Laufwerks f\[:u]r besch\[:a]digte CD-Sektoren (Standard: -1)
+Leseversuche innerhalb des Laufwerks f\[:u]r besch\[:a]digte CD-Sektoren (Standard: \-1)
.RS
Laufwerke unternehmen normalerweise mehrere Versuche um einen besch\[:a]digten Sektor
zu lesen. Es ist typischerweise g\[:u]nstiger diesen Wert auf 0 oder 1 zu setzen
-und die Anzahl der Leseversuche \[:u]ber den Parameter --read-attempts zu steuern.
-Viele Laufwerke ignorieren diese Einstellung ohnehin. Benutzen Sie den Wert -1 um
+und die Anzahl der Leseversuche \[:u]ber den Parameter \-\-read-attempts zu steuern.
+Viele Laufwerke ignorieren diese Einstellung ohnehin. Benutzen Sie den Wert \-1 um
die Standardeinstellungen des Laufwerks zu verwenden.
.RE
.TP
@@ -203,7 +203,7 @@
.RE
.TP
.B \-\-raw-mode n
-"Raw"-Lese-Verfahren f\[:u]r besch\[:a]digte CD-Sektoren (default: 20)
+"Raw"\-Lese-Verfahren f\[:u]r besch\[:a]digte CD-Sektoren (default: 20)
.RS
Das empfohlene Verfahren ist 20, bei dem das Laufwerk die eingebaute Fehlerkorrektur
so weit wie m\[:o]glich anwendet, bevor es einen besch\[:a]digten Sektor
@@ -220,7 +220,7 @@
liest den gesamten Datentr\[:a]ger bis zu n-mal.
.TP
.B \-\-read-raw
-liest in der "raw"-Betriebsart sofern m\[:o]glich.
+liest in der "raw"\-Betriebsart sofern m\[:o]glich.
.TP
.B \-\-speed-warning n
warnt bei Geschwindigkeits\[:a]nderung um mehr als n Prozent.
--- a/documentation/dvdisaster.it.1
+++ b/documentation/dvdisaster.it.1
@@ -43,8 +43,8 @@
Tipici esempi di utilizzo:
.TP
.B \-r, \-\-read
-Estrae l'immagine del supporto sull'hard disc. Usare -rn-m per leggere un
-determinato intervallo di settori, ad es. -r100-200.
+Estrae l'immagine del supporto sull'hard disc. Usare \-rn-m per leggere un
+determinato intervallo di settori, ad es. \-r100-200.
.TP
.B \-c, \-\-create
Crea l'informazione .ecc per l'immagine del supporto.
@@ -92,7 +92,7 @@
aggiungi automaticamente i suffissi .img e .ecc.
.TP
.B \-\-cache-size n
-Dimensione della cache in MB con la modalit\[`a] -c (Standard: 32MB).
+Dimensione della cache in MB con la modalit\[`a] \-c (Standard: 32MB).
.TP
.B \-\-dao
Utilizza la modalit\[`a] DAO; Il disco non sar\[`a] finalizzato.

56
debian/patches/05-help-dialog.patch vendored Normal file
View File

@@ -0,0 +1,56 @@
Author: Daniel Baumann <daniel@debian.org>
Description: Customizes the help-dialog according to README.MODIFYING.
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -402,7 +402,7 @@
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);
}
/*
@@ -549,7 +549,7 @@
{ ShowTextfile(_("windowtitle|Modifying dvdisaster"),
_("<big>Modifying dvdisaster</big>\n"
"<i>Your changes are not ours.</i>"),
- "README.MODIFYING", NULL, NULL);
+ "/usr/share/doc/dvdisaster/README.MODIFYING", NULL, NULL);
}
static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -706,9 +706,9 @@
#ifdef MODIFIED_SOURCE
AboutTextWithLink(vbox,
- _("Modified version Copyright 2009 (please fill in - [directions])\n"
- "Copyright 2004-2009 Carsten Gnoerlich"),
- "MODIFYING");
+ _("Modified version for [Debian GNU/Linux]\n"
+ "Original Copyright 2004-2009 Carsten Gnoerlich"),
+ "http://www.debian.org/");
#else
AboutText(vbox, _("Copyright 2004-2009 Carsten Gnoerlich"));
#endif
@@ -725,14 +725,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");
#ifdef MODIFIED_SOURCE
- AboutTextWithLink(vbox, _("\nThis program is <b>not the original</b>. It is based on the\n"
- "source code of dvdisaster, but contains third-party changes.\n\n"
+ AboutTextWithLink(vbox, _("\nThis version is <b>not the original</b>. It has been patched\n"
+ "for Debian to support DVD-ROMs (with and without encryption).\n\n"
"Please do not bother the original authors of dvdisaster\n"
- "([www.dvdisaster.org]) about issues with this version.\n"),
- "http://www.dvdisaster.org");
+ "but submit bugreports against the [debian package] instead.\n"),
+ "http://packages.qa.debian.org/dvdisaster");
#else
lang = g_getenv("LANG");

View File

@@ -0,0 +1,10 @@
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
Description: Remove unneeded Encoding-key from desktop file
--- a/contrib/dvdisaster.desktop
+++ b/contrib/dvdisaster.desktop
@@ -10,4 +10,3 @@
Terminal=false
Type=Application
Categories=Application;System;
-Encoding=UTF-8

View File

@@ -0,0 +1,45 @@
Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
Description: Fix spelling errors in binaries
--- a/preferences.c
+++ b/preferences.c
@@ -1627,7 +1627,7 @@
"The values include the borders: 0-100 will read 101 sectors.\n\n"
"<b>Note:</b> Limiting the reading range is not recommended for <i>adaptive reading</i> since it might "
- "prevent sectors from being read which are required for a succesful error correction.\n\n"
+ "prevent sectors from being read which are required for a successful error correction.\n\n"
"These settings are only effective for the current session and will not be saved."));
/** Image properties */
@@ -1911,7 +1911,7 @@
"<b>0x20</b> This is the <i>recommended</i> mode. "
"The drive tries to apply "
"the built-in error correction to the best possible extent "
- "before transfering a defective sector.\n\n"
+ "before transferring a defective sector.\n\n"
"<b>0x21</b> In this mode the drive skips the last stage "
"of its internal error correction and returns the "
"uncorrected sector instead. This may result in sectors "
--- a/rs01-create.c
+++ b/rs01-create.c
@@ -216,7 +216,7 @@
/*** Test the image file and create the CRC sums */
- /* Explicitly unlinking the ecc file removes superflous segments
+ /* Explicitly unlinking the ecc file removes superfluous segments
in FAT mode if the ecc file already existed. */
LargeUnlink(Closure->eccName);
--- a/rs01-fix.c
+++ b/rs01-fix.c
@@ -246,7 +246,7 @@
if(Closure->guiMode)
{ int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL,
_("The image file is %d bytes longer than noted\n"
- "in the ecc file. Shall the superflous bytes\n"
+ "in the ecc file. Shall the superfluous bytes\n"
"be removed from the image file?\n"),
difference);

6
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,6 @@
02-encryption.patch
03-dvdrom.patch
04-manpage.patch
05-help-dialog.patch
06-remove-encoding-from-desktop-file.patch
07-fix-spelling-errors-in-binaries.patch

151
debian/pixmaps/dvdisaster.xpm vendored Normal file
View File

@@ -0,0 +1,151 @@
/* 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 . ",
" "};

92
debian/rules vendored Executable file
View File

@@ -0,0 +1,92 @@
#!/usr/bin/make -f
clean:
dh_testdir
dh_testroot
rm -f build-stamp
[ ! -f configure.log ] || $(MAKE) distclean
find documentation -name "*.png" | xargs rm -f
dh_clean
configure: configure-stamp
configure-stamp:
dh_testdir
./configure \
--prefix=/usr \
--bindir=\$${prefix}/bin \
--docdir=\$${prefix}share/doc \
--docsubdir=dvdisaster-doc/html \
--localedir=\$${prefix}/share/locale \
--mandir=\$${prefix}/share/man
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch build-stamp
install: build
dh_testdir
dh_testroot
dh_prep
$(MAKE) \
BUILDROOT=$(CURDIR)/debian/tmp \
install
# 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
# Installing icon
install -D -m 0644 contrib/dvdisaster32.png debian/dvdisaster/usr/share/icons/dvdisaster.png
# Installing pixmaps
install -D -m 0644 debian/pixmaps/dvdisaster.xpm debian/dvdisaster/usr/share/pixmaps/dvdisaster.xpm
# 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
binary: binary-arch binary-indep
binary-arch: install
dh_testdir -a
dh_testroot -a
dh_installchangelogs -a CHANGELOG
dh_installdocs -a
dh_installexamples
dh_install -a --sourcedir=debian/tmp
dh_installmenu -a
dh_strip -a
dh_compress -a
dh_fixperms -a
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
binary-indep: install
dh_testdir -i
dh_testroot -i
dh_installchangelogs -i CHANGELOG
dh_installdocs -i
dh_install -i --sourcedir=debian/tmp
dh_compress -i
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
.PHONY: clean build install binary binary-arch binary-indep

1
debian/source/format vendored Normal file
View File

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

2
debian/watch vendored Normal file
View File

@@ -0,0 +1,2 @@
version=3
http://dvdisaster.net/downloads/dvdisaster-(.*)\.tar\.bz2

0
documentation/cs/images/.gitignore vendored Normal file
View File

0
documentation/de/images/.gitignore vendored Normal file
View File

View File

0
documentation/en/images/.gitignore vendored Normal file
View File

View File

0
documentation/images/.gitignore vendored Normal file
View File

0
documentation/ru/images/.gitignore vendored Normal file
View File

View File