xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase patches.

Browse Source
This commit is contained in:
Carlos Maddela
2017-12-21 05:49:31 +11:00
parent 581d7697db
commit 619ee820f3
23 changed files with 158 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@@ -1,6 +1,7 @@
dvdisaster (0.79.6-1) UNRELEASED; urgency=medium
* New upstream development version [0.79.6].
* Rebase patches.
-- Carlos Maddela <e7appew@gmail.com> Thu, 21 Dec 2017 05:34:22 +1100

4
debian/patches/02-encryption.patch vendored
View File

@@ -12,10 +12,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scsi-layer.c b/scsi-layer.c
index d68533b..6717b12 100644
index cad13d4..866b7ac 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2711,12 +2711,13 @@ Image* OpenImageFromDevice(char *device)
@@ -2695,12 +2695,13 @@ Image* OpenImageFromDevice(char *device)
return NULL;
}
}

2
debian/patches/03-dvdrom.patch vendored
View File

@@ -12,7 +12,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 5 insertions(+)
diff --git a/scsi-layer.c b/scsi-layer.c
index 6717b12..64a3dba 100644
index 866b7ac..b3a9d0e 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -908,6 +908,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only)

2
debian/patches/05-help-dialog.patch vendored
View File

@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index 4d6f9bb..eae04f2 100644
index c486613..758ac19 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -403,7 +403,7 @@ void ShowGPL()

2
debian/patches/08-fix-gnu-make-detection.patch vendored
View File

@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
index f68ecab..d62f5d7 100644
index 6baffde..f1a8bd1 100644
--- a/scripts/bash-based-configure
+++ b/scripts/bash-based-configure
@@ -313,13 +313,13 @@ function REQUIRE_GMAKE()

27
debian/patches/11-no-cruft.patch vendored
View File

@@ -5,15 +5,15 @@ Subject: Do not install cruft.
Description: Do not install cruft.
Author: Carlos Maddela <e7appew@gmail.com>
Forwarded: not-needed
Last-Update: 2017-01-05
Last-Update: 2017-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 26 --------------------------
1 file changed, 26 deletions(-)
GNUmakefile.template | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index a3074c7..6fda92b 100644
index 77a57bf..6fda92b 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -228,12 +228,6 @@ install: dvdisaster manual
@@ -29,28 +29,21 @@ index a3074c7..6fda92b 100644
(cd documentation/user-manual; install -m 644 manual.pdf $(BUILDROOT)$(DOCSUBDIR))
install -d $(BUILDROOT)$(MANDIR)/man1
install -d $(BUILDROOT)$(MANDIR)/de/man1
@@ -251,26 +245,6 @@ install: dvdisaster manual
@@ -251,19 +245,6 @@ install: dvdisaster manual
install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
done \
fi
- @echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(BINDIR)/dvdisaster\" \"$(BINDIR)/dvdisaster-uninstall.sh\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CHANGELOG\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/COPYING\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CREDITS.de\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/CREDITS.en\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/manual.pdf\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/README.MODIFYING\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f \"$(DOCSUBDIR)/TODO\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rmdir \"$(DOCSUBDIR)\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @for i in $(PO_LOCALES); do \
- echo "rm -f \"$(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- done
- @echo "rm -f \"$(MANDIR)/man1/dvdisaster.1\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
- @for i in $(MAN_LOCALES); do \
- echo "rm -f \"$(MANDIR)/$$i/man1/dvdisaster.1\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
- done
- @echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh

114
debian/patches/12-fix-spelling-of-up-to.patch vendored
View File

@@ -5,7 +5,7 @@ Subject: Fix spelling: upto -> up to
Description: Fix spelling: upto -> up to
Author: Carlos Maddela <e7appew@gmail.com>
Forwarded: no
Last-Update: 2017-01-05
Last-Update: 2017-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
@@ -26,7 +26,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
14 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/debug.c b/debug.c
index df70416..b4ffc21 100644
index b4a96d1..bd725d6 100644
--- a/debug.c
+++ b/debug.c
@@ -1023,7 +1023,7 @@ void RawSector(char *arg)
@@ -52,7 +52,7 @@ index ebb1ee5..a8c0d90 100644
figure. The next ecc blocks are calculated and stored accordingly.
In total, the ecc section contains $k*ls$ bytes of parity information,
diff --git a/documentation/codec-specs/rs02.tex b/documentation/codec-specs/rs02.tex
index 3cf5fb1..c026772 100644
index 69195a0..fb88384 100644
--- a/documentation/codec-specs/rs02.tex
+++ b/documentation/codec-specs/rs02.tex
@@ -133,7 +133,7 @@ Its format is described in appendix \ref{eh}. For RS02, only the data fields
@@ -65,10 +65,10 @@ index 3cf5fb1..c026772 100644
to the nearest multiple of 2048.
CRC32 checksums are calculated over a whole CD sector comprising 2048 bytes.
diff --git a/documentation/dvdisaster.en.1 b/documentation/dvdisaster.en.1
index 028c6e0..95faa5a 100644
index 3472012..d71abec 100644
--- a/documentation/dvdisaster.en.1
+++ b/documentation/dvdisaster.en.1
@@ -274,7 +274,7 @@ Selects between the sg (SG_IO) driver (default setting) and the
@@ -279,7 +279,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.
@@ -77,7 +77,7 @@ index 028c6e0..95faa5a 100644
if the now pre-selected sg driver changes something to the worse for you
please switch back to the older driver using \-\-driver=cdrom.
.TP
@@ -376,7 +376,7 @@ the uncorrected sector instead.
@@ -384,7 +384,7 @@ the uncorrected sector instead.
.RE
.TP
.B \-\-read-attempts n-m
@@ -87,10 +87,10 @@ index 028c6e0..95faa5a 100644
.B \-\-read-medium n
read the whole medium up to n times.
diff --git a/documentation/user-manual/qa.tex b/documentation/user-manual/qa.tex
index 5d4b35a..91befa1 100644
index a3465a8..d79ca4d 100644
--- a/documentation/user-manual/qa.tex
+++ b/documentation/user-manual/qa.tex
@@ -457,6 +457,6 @@ drive for reading images in these cases.}
@@ -465,6 +465,6 @@ drive for reading images in these cases.}
\qa{``Ecc file has been created with version 0.40.7.''}
{Some developer versions of dvdisaster mark their ecc files with a special bit.
@@ -99,10 +99,10 @@ index 5d4b35a..91befa1 100644
message. Please use the developer versions only together with dvdisaster
0.66 or newer versions. }
diff --git a/dvdisaster.c b/dvdisaster.c
index a24e599..d549676 100644
index 6742d99..6840fd5 100644
--- a/dvdisaster.c
+++ b/dvdisaster.c
@@ -917,7 +917,7 @@ int main(int argc, char *argv[])
@@ -930,7 +930,7 @@ int main(int argc, char *argv[])
PrintCLI(_(" --old-ds-marker - mark missing sectors compatible with dvdisaster <= 0.70\n"));
PrintCLI(_(" --prefetch-sectors n - prefetch n sectors for RS03 encoding (uses ~nMiB)\n"));
PrintCLI(_(" --raw-mode n - mode for raw reading CD media (20 or 21)\n"));
@@ -110,12 +110,12 @@ index a24e599..d549676 100644
+ PrintCLI(_(" --read-attempts n-m - attempts n up to m reads of a defective sector\n"));
PrintCLI(_(" --read-medium n - read the whole medium up to n times\n"));
PrintCLI(_(" --read-raw - performs read in raw mode if possible\n"));
PrintCLI(_(" --resource-file p - get resource file from given path\n"));
PrintCLI(_(" --regtest - tweaks output for compatibility with regtests\n"));
diff --git a/dvdisaster.h b/dvdisaster.h
index 2507ab9..db2031e 100644
index 7fb980b..a466450 100644
--- a/dvdisaster.h
+++ b/dvdisaster.h
@@ -101,7 +101,7 @@
@@ -112,7 +112,7 @@
#define MAX_CODEC_THREADS 1024 /* not including IO and GUI */
#define MAX_OLD_CACHE_SIZE 8096 /* old cache for RS01/RS02 */
@@ -124,7 +124,7 @@ index 2507ab9..db2031e 100644
/* Choices for I/O strategy */
@@ -364,7 +364,7 @@ typedef struct _LargeFile
@@ -376,7 +376,7 @@ typedef struct _LargeFile
#define FINGERPRINT_SECTOR 16 /* Sector currently used to calculate the fingerprint. */
/* This is the ISO filesystem root sector which contains */
/* the volume label and creation time stamps. */
@@ -134,19 +134,19 @@ index 2507ab9..db2031e 100644
#define MFLAG_DEVEL (1<<0) /* for methodFlags[3] */
diff --git a/locale/cs.po b/locale/cs.po
index bdec530..ed1fc65 100644
index 3274de9..4f766a3 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -658,7 +658,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
@@ -662,7 +662,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
msgstr " --raw-mode n - režim přímého čtení pro CD disky (20 nebo 21)\n"
#: dvdisaster.c:920
#: dvdisaster.c:933
-msgid " --read-attempts n-m - attempts n upto m reads of a defective sector\n"
+msgid " --read-attempts n-m - attempts n up to m reads of a defective sector\n"
msgstr " --read-attempts n-m - zkusit n až m opakovaných čtení poškozeného sektoru\n"
#: dvdisaster.c:921
@@ -2000,7 +2000,7 @@ msgstr "Přečtení sektoru nezkoušet více než %d krát"
#: dvdisaster.c:934
@@ -2014,7 +2014,7 @@ msgstr "Přečtení sektoru nezkoušet více než %d krát"
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
@@ -155,7 +155,7 @@ index bdec530..ed1fc65 100644
"\n"
"The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
msgstr ""
@@ -2072,7 +2072,7 @@ msgstr " krát"
@@ -2086,7 +2086,7 @@ msgstr " krát"
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
@@ -165,19 +165,19 @@ index bdec530..ed1fc65 100644
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index af978eb..bbbfdcc 100644
index b252c19..5b47778 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -700,7 +700,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
@@ -704,7 +704,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
msgstr " --raw-mode n - \"raw-modus\" zum Lesen von CD (20 or 21)\n"
#: dvdisaster.c:920
#: dvdisaster.c:933
-msgid " --read-attempts n-m - attempts n upto m reads of a defective sector\n"
+msgid " --read-attempts n-m - attempts n up to m reads of a defective sector\n"
msgstr " --read-attempts n-m - versucht beschädigten Sektor n bis m-mal zu lesen\n"
#: dvdisaster.c:921
@@ -2057,7 +2057,7 @@ msgstr "Höchstens %d Leseversuche pro Sektor"
#: dvdisaster.c:934
@@ -2073,7 +2073,7 @@ msgstr "Höchstens %d Leseversuche pro Sektor"
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
@@ -186,7 +186,7 @@ index af978eb..bbbfdcc 100644
"\n"
"The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
msgstr ""
@@ -2129,7 +2129,7 @@ msgstr " mal lesen"
@@ -2145,7 +2145,7 @@ msgstr " mal lesen"
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
@@ -196,19 +196,19 @@ index af978eb..bbbfdcc 100644
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
diff --git a/locale/it.po b/locale/it.po
index 9f3a97b..a074339 100644
index efd3d27..f6e9dfd 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -625,7 +625,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
@@ -629,7 +629,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
msgstr ""
#: dvdisaster.c:920
#: dvdisaster.c:933
-msgid " --read-attempts n-m - attempts n upto m reads of a defective sector\n"
+msgid " --read-attempts n-m - attempts n up to m reads of a defective sector\n"
msgstr ""
#: dvdisaster.c:921
@@ -1824,7 +1824,7 @@ msgstr ""
#: dvdisaster.c:934
@@ -1838,7 +1838,7 @@ msgstr ""
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
@@ -217,7 +217,7 @@ index 9f3a97b..a074339 100644
"\n"
"The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
@@ -1897,7 +1897,7 @@ msgstr ""
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
@@ -226,7 +226,7 @@ index 9f3a97b..a074339 100644
"\n"
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
@@ -6054,7 +6054,7 @@ msgstr ""
@@ -6086,7 +6086,7 @@ msgstr ""
#~ msgstr "Se potete verificate se la dimensione dell'immagine è corretta,\n"
#~ msgid ""
@@ -236,19 +236,19 @@ index 9f3a97b..a074339 100644
#~ msgstr ""
#~ "Prego inviare l'intero output di dvdisaster fino a questa linea\n"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b557c84..573531b 100644
index 21ea77b..86eda03 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -641,7 +641,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
@@ -645,7 +645,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
msgstr " --raw-mode n - modo para leitura de mídia CD em modo raw (20 ou 21)\n"
#: dvdisaster.c:920
#: dvdisaster.c:933
-msgid " --read-attempts n-m - attempts n upto m reads of a defective sector\n"
+msgid " --read-attempts n-m - attempts n up to m reads of a defective sector\n"
msgstr " --read-attempts n-m - tenta de n a m leituras em um setor defeituoso\n"
#: dvdisaster.c:921
@@ -1935,7 +1935,7 @@ msgstr "Máx. de %d tentativas de leitura por setor"
#: dvdisaster.c:934
@@ -1949,7 +1949,7 @@ msgstr "Máx. de %d tentativas de leitura por setor"
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
@@ -257,7 +257,7 @@ index b557c84..573531b 100644
"\n"
"The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
msgstr ""
@@ -2007,7 +2007,7 @@ msgstr " vezes"
@@ -2021,7 +2021,7 @@ msgstr " vezes"
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
@@ -266,7 +266,7 @@ index b557c84..573531b 100644
"\n"
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
@@ -6450,7 +6450,7 @@ msgstr "<i>Novidades dessa versão:</i>"
@@ -6482,7 +6482,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"
@@ -275,7 +275,7 @@ index b557c84..573531b 100644
#~ " --read-medium n - read the whole medium up to n times\n"
#~ " --read-raw - performs read in raw mode if possible\n"
#~ " --speed-warning n - print warning if speed changes by more than n percent\n"
@@ -6469,7 +6469,7 @@ msgstr "<i>Novidades dessa versão:</i>"
@@ -6501,7 +6501,7 @@ msgstr "<i>Novidades dessa versão:</i>"
#~ msgid ""
#~ "<b>File splitting</b>\n"
#~ "\n"
@@ -285,19 +285,19 @@ index b557c84..573531b 100644
#~ "<b>Separação de arquivos</b>\n"
#~ "\n"
diff --git a/locale/ru.po b/locale/ru.po
index 34b1796..a9fc25c 100644
index 767f906..7984c59 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -640,7 +640,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
@@ -644,7 +644,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
msgstr " --raw-mode n - режим для низкоуровневого чтения CD-носителей (20 или 21)\n"
#: dvdisaster.c:920
#: dvdisaster.c:933
-msgid " --read-attempts n-m - attempts n upto m reads of a defective sector\n"
+msgid " --read-attempts n-m - attempts n up to m reads of a defective sector\n"
msgstr " --read-attempts n-m - делается от n до m попыток чтения поврежденного сектора\n"
#: dvdisaster.c:921
@@ -1938,7 +1938,7 @@ msgstr "Макс. %d попыток чтения на сектор"
#: dvdisaster.c:934
@@ -1952,7 +1952,7 @@ msgstr "Макс. %d попыток чтения на сектор"
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
@@ -306,7 +306,7 @@ index 34b1796..a9fc25c 100644
"\n"
"The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
msgstr ""
@@ -2010,7 +2010,7 @@ msgstr " раз"
@@ -2024,7 +2024,7 @@ msgstr " раз"
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
@@ -315,7 +315,7 @@ index 34b1796..a9fc25c 100644
"\n"
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
@@ -6511,7 +6511,7 @@ msgstr "<i>Новое в этой версии:</i>"
@@ -6543,7 +6543,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"
@@ -324,7 +324,7 @@ index 34b1796..a9fc25c 100644
#~ " --read-medium n - read the whole medium up to n times\n"
#~ " --read-raw - performs read in raw mode if possible\n"
#~ " --speed-warning n - print warning if speed changes by more than n percent\n"
@@ -6528,7 +6528,7 @@ msgstr "<i>Новое в этой версии:</i>"
@@ -6560,7 +6560,7 @@ msgstr "<i>Новое в этой версии:</i>"
#~ msgid ""
#~ "<b>File splitting</b>\n"
#~ "\n"
@@ -333,7 +333,7 @@ index 34b1796..a9fc25c 100644
#~ msgstr ""
#~ "<b>Разбиение файлов</b>\n"
#~ "\n"
@@ -6574,7 +6574,7 @@ msgstr "<i>Новое в этой версии:</i>"
@@ -6606,7 +6606,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"
@@ -343,19 +343,19 @@ index 34b1796..a9fc25c 100644
#~ " --read-raw - performs read in raw mode if possible\n"
#~ " --speed-warning n - print warning if speed changes by more than n percent\n"
diff --git a/locale/sv.po b/locale/sv.po
index f69035e..9f70808 100644
index 548e2e5..c74a942 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -626,7 +626,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
@@ -630,7 +630,7 @@ msgid " --raw-mode n - mode for raw reading CD media (20 or 21)\n"
msgstr ""
#: dvdisaster.c:920
#: dvdisaster.c:933
-msgid " --read-attempts n-m - attempts n upto m reads of a defective sector\n"
+msgid " --read-attempts n-m - attempts n up to m reads of a defective sector\n"
msgstr ""
#: dvdisaster.c:921
@@ -1830,7 +1830,7 @@ msgstr ""
#: dvdisaster.c:934
@@ -1844,7 +1844,7 @@ msgstr ""
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
@@ -364,7 +364,7 @@ index f69035e..9f70808 100644
"\n"
"The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
msgstr ""
@@ -1889,7 +1889,7 @@ msgstr ""
@@ -1903,7 +1903,7 @@ msgstr ""
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
@@ -374,7 +374,7 @@ index f69035e..9f70808 100644
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
diff --git a/preferences.c b/preferences.c
index 4f1fe5c..f5ef889 100644
index 70afa02..4899317 100644
--- a/preferences.c
+++ b/preferences.c
@@ -2221,7 +2221,7 @@ void CreatePreferencesWindow(void)

4
debian/patches/13-fix-missing-language-field-in-po-files.patch vendored
View File

@@ -14,7 +14,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 573531b..04b33b5 100644
index 86eda03..f3437f3 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -11,7 +11,7 @@ msgstr ""
@@ -27,7 +27,7 @@ index 573531b..04b33b5 100644
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/locale/ru.po b/locale/ru.po
index a9fc25c..6cd3789 100644
index 7984c59..1bc7324 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -13,7 +13,7 @@ msgstr ""

22
debian/patches/14-make-builds-reproducible.patch vendored
View File

@@ -21,7 +21,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/build.c b/build.c
index 1666795..05a3b24 100644
index 0e99b22..65b17cd 100644
--- a/build.c
+++ b/build.c
@@ -25,4 +25,4 @@
@@ -31,10 +31,10 @@ index 1666795..05a3b24 100644
-int buildCount = BUILD;
+const char *const buildCount = BUILD;
diff --git a/closure.c b/closure.c
index 7568cba..51e91a2 100644
index 58ba86f..d633d53 100644
--- a/closure.c
+++ b/closure.c
@@ -433,7 +433,7 @@ void InitClosure()
@@ -442,7 +442,7 @@ void InitClosure()
#define BITNESS_STRING ""
#endif
@@ -44,10 +44,10 @@ index 7568cba..51e91a2 100644
/* Replace the dot with a locale-resistant separator */
diff --git a/dvdisaster.h b/dvdisaster.h
index db2031e..bcfd4f5 100644
index a466450..9acd094 100644
--- a/dvdisaster.h
+++ b/dvdisaster.h
@@ -450,7 +450,7 @@ void FreeBitmap(Bitmap*);
@@ -463,7 +463,7 @@ void FreeBitmap(Bitmap*);
*** build.h
***/
@@ -57,10 +57,10 @@ index db2031e..bcfd4f5 100644
/***
*** cacheprobe.h
diff --git a/locale/cs.po b/locale/cs.po
index ed1fc65..24b1e7c 100644
index 4f766a3..453ec07 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -6476,11 +6476,11 @@ msgstr "<i>Novinky v této verzi:</i>"
@@ -6511,11 +6511,11 @@ msgstr "<i>Novinky v této verzi:</i>"
#~ msgid ""
#~ "\n"
@@ -75,10 +75,10 @@ index ed1fc65..24b1e7c 100644
#~ msgid "--prefetch-sectors must be in range 32...8096"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 04b33b5..012ce9e 100644
index f3437f3..f7f6af0 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -6200,11 +6200,11 @@ msgstr "<i>Novidades dessa versão:</i>"
@@ -6232,11 +6232,11 @@ msgstr "<i>Novidades dessa versão:</i>"
#~ msgid ""
#~ "\n"
@@ -93,10 +93,10 @@ index 04b33b5..012ce9e 100644
#~ msgid "--cache-size maximum is 8192MiB."
#~ msgstr "--cache-size máximo é 8192MiB."
diff --git a/locale/ru.po b/locale/ru.po
index 6cd3789..912d6fb 100644
index 1bc7324..9625a1f 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -6215,11 +6215,11 @@ msgstr "<i>Новое в этой версии:</i>"
@@ -6247,11 +6247,11 @@ msgstr "<i>Новое в этой версии:</i>"
#~ msgid ""
#~ "\n"

2
debian/patches/15-show-new-pkg-tracker.patch vendored
View File

@@ -14,7 +14,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index eae04f2..c89c552 100644
index 758ac19..47551f7 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -750,7 +750,7 @@ void AboutDialog()

110
debian/patches/17-fix-all-but-deprecated-api-warnings.patch vendored
View File

@@ -6,23 +6,20 @@ Description: Fix all warnings except for those related to deprecated API.
Author: Carlos Maddela <e7appew@gmail.com>
Bug-Debian: https://bugs.debian.org/748416
Forwarded: no
Last-Update: 2017-01-05
Last-Update: 2017-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
closure.c | 8 +++++---
curve.c | 2 +-
closure.c | 2 +-
menubar.c | 2 +-
rs01-create.c | 10 +++++-----
rs01-verify.c | 2 +-
rs03-create.c | 24 ++++++++++++------------
rs03-fix.c | 8 ++++----
scsi-layer.c | 4 ++++
smart-lec.c | 10 +++++-----
9 files changed, 38 insertions(+), 32 deletions(-)
6 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/closure.c b/closure.c
index 51e91a2..40bb225 100644
index d633d53..fa52f09 100644
--- a/closure.c
+++ b/closure.c
@@ -196,7 +196,7 @@ void ReadDotfile()
@@ -34,38 +31,8 @@ index 51e91a2..40bb225 100644
if(!line[MAX_LINE_LEN-1]) /* line longer than buffer */
while(!feof(dotfile) && fgetc(dotfile) != '\n')
;
@@ -225,12 +225,14 @@ void ReadDotfile()
if(!strcmp(symbol, "last-image")) { g_free(Closure->imageName);
if(!strcmp(value, "none"))
Closure->imageName = g_strdup("");
- else Closure->imageName = g_strdup(value); continue;
+ else Closure->imageName = g_strdup(value);
+ continue;
}
if(!strcmp(symbol, "last-ecc")) { g_free(Closure->eccName);
if(!strcmp(value, "none"))
Closure->eccName = g_strdup("");
- else Closure->eccName = g_strdup(value); continue;
+ else Closure->eccName = g_strdup(value);
+ continue;
}
if(!strcmp(symbol, "adaptive-read")) { Closure->adaptiveRead = atoi(value); continue; }
if(!strcmp(symbol, "auto-suffix")) { Closure->autoSuffix = atoi(value); continue; }
diff --git a/curve.c b/curve.c
index 668bc40..61b81a9 100644
--- a/curve.c
+++ b/curve.c
@@ -123,7 +123,7 @@ int CurveLogY(Curve *curve, gdouble y) /* not really a log */
hfact = (gdouble)(curve->bottomLY - curve->topLY);
if(y==1) return curve->bottomLY - ((log(2)/log(curve->logMaxY)) * hfact)/2;
- return curve->bottomLY - (log(y)/log(curve->logMaxY)) * hfact;
+ return curve->bottomLY - (log(y)/log(curve->logMaxY)) * hfact;
}
/***
diff --git a/menubar.c b/menubar.c
index 8258cfd..12f1933 100644
index 94d462b..ee24ebe 100644
--- a/menubar.c
+++ b/menubar.c
@@ -414,7 +414,7 @@ void set_path(GtkWidget *entry, char *path)
@@ -77,43 +44,8 @@ index 8258cfd..12f1933 100644
strcat(buf,"/");
strcat(buf,path);
diff --git a/rs01-create.c b/rs01-create.c
index 5cad591..88c352a 100644
--- a/rs01-create.c
+++ b/rs01-create.c
@@ -107,12 +107,12 @@ static void unlink_image(GtkWidget *label)
_("\nImage file %s deleted.\n"), Closure->imageName);
}
else
- { if(!Closure->guiMode)
- PrintLog("\n");
+ { if(!Closure->guiMode)
+ PrintLog("\n");
- ModalWarning(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, NULL,
- _("Image file %s not deleted: %s\n"),
- Closure->imageName, strerror(errno));
+ ModalWarning(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, NULL,
+ _("Image file %s not deleted: %s\n"),
+ Closure->imageName, strerror(errno));
}
}
diff --git a/rs01-verify.c b/rs01-verify.c
index 3315659..431a6d0 100644
--- a/rs01-verify.c
+++ b/rs01-verify.c
@@ -830,7 +830,7 @@ process_ecc:
{ if(!Closure->guiMode)
PrintProgress(_("- ecc md5sum : %3d%%"),percent);
else SetLabelText(GTK_LABEL(wl->cmpEccMd5Sum), "%3d%%", percent);
- last_percent = percent;
+ last_percent = percent;
}
if(Closure->stopActions)
diff --git a/rs03-create.c b/rs03-create.c
index 40066d2..b2c6033 100644
index 71460ef..9c7265d 100644
--- a/rs03-create.c
+++ b/rs03-create.c
@@ -31,9 +31,9 @@
@@ -128,7 +60,7 @@ index 40066d2..b2c6033 100644
#endif
#ifdef HAVE_MMAP
@@ -688,7 +688,7 @@ static void flush_crc(ecc_closure *ec, LargeFile *file_out)
@@ -714,7 +714,7 @@ static void flush_crc(ecc_closure *ec, LargeFile *file_out)
/* Write out the CRC layer */
@@ -137,7 +69,7 @@ index 40066d2..b2c6033 100644
crc_sect = 2048*(ec->encoderChunk+lay->firstCrcPos);
if(!LargeSeek(file_out, crc_sect))
{ ec->abortImmediately = TRUE;
@@ -709,7 +709,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
@@ -735,7 +735,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
/* Write out the created parity. */
@@ -146,7 +78,7 @@ index 40066d2..b2c6033 100644
for(k=0; k<lay->nroots; k++)
{ gint64 idx=0;
@@ -726,7 +726,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
@@ -752,7 +752,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
}
}
}
@@ -155,7 +87,7 @@ index 40066d2..b2c6033 100644
}
static gpointer io_thread(ecc_closure *ec)
@@ -741,7 +741,7 @@ static gpointer io_thread(ecc_closure *ec)
@@ -767,7 +767,7 @@ static gpointer io_thread(ecc_closure *ec)
int parity_available = 0;
int i;
@@ -164,7 +96,7 @@ index 40066d2..b2c6033 100644
/*** Allocate local parity buffer aligned at 128bit boundary */
@@ -809,7 +809,7 @@ static gpointer io_thread(ecc_closure *ec)
@@ -835,7 +835,7 @@ static gpointer io_thread(ecc_closure *ec)
{ read_next_chunk(ec, chunk);
// flush_crc(ec, file_out); // FIXME
needs_preload = 0;
@@ -173,7 +105,7 @@ index 40066d2..b2c6033 100644
continue;
}
@@ -856,7 +856,7 @@ static gpointer io_thread(ecc_closure *ec)
@@ -882,7 +882,7 @@ static gpointer io_thread(ecc_closure *ec)
g_mutex_lock(ec->lock);
cpu_bound = ec->buffersToEncode;
while(ec->buffersToEncode)
@@ -182,7 +114,7 @@ index 40066d2..b2c6033 100644
g_cond_wait(ec->ioCond, ec->lock);
}
g_mutex_unlock(ec->lock);
@@ -898,7 +898,7 @@ static gpointer io_thread(ecc_closure *ec)
@@ -924,7 +924,7 @@ static gpointer io_thread(ecc_closure *ec)
ec->slicesFree = TRUE; /* we have saved the slices; go ahead */
g_cond_broadcast(ec->ioCond);
while(ec->buffersToEncode)
@@ -191,7 +123,7 @@ index 40066d2..b2c6033 100644
g_cond_wait(ec->ioCond, ec->lock);
}
g_mutex_unlock(ec->lock);
@@ -911,7 +911,7 @@ static gpointer io_thread(ecc_closure *ec)
@@ -937,7 +937,7 @@ static gpointer io_thread(ecc_closure *ec)
flush_crc(ec, file_out);
flush_parity(ec, file_out);
@@ -200,7 +132,7 @@ index 40066d2..b2c6033 100644
return NULL;
}
@@ -1098,7 +1098,7 @@ static gpointer encoder_thread(ecc_closure *ec)
@@ -1123,7 +1123,7 @@ static gpointer encoder_thread(ecc_closure *ec)
ec->buffersToEncode-=enc_size;
if(!ec->buffersToEncode)
{ g_cond_broadcast(ec->ioCond);
@@ -209,7 +141,7 @@ index 40066d2..b2c6033 100644
fflush(stdout);
}
g_mutex_unlock(ec->lock);
@@ -1198,7 +1198,7 @@ static void create_reed_solomon(ecc_closure *ec)
@@ -1223,7 +1223,7 @@ static void create_reed_solomon(ecc_closure *ec)
verbose("SCHED: joined with worker %d\n", i);
fflush(stdout);
}
@@ -219,7 +151,7 @@ index 40066d2..b2c6033 100644
/***
diff --git a/rs03-fix.c b/rs03-fix.c
index 0a7a1d3..e162e5e 100644
index 7afb6d6..19b9322 100644
--- a/rs03-fix.c
+++ b/rs03-fix.c
@@ -829,10 +829,10 @@ void RS03Fix(Image *image)
@@ -235,10 +167,10 @@ index 0a7a1d3..e162e5e 100644
+ Stop(_("Failed seeking to sector %lld in ecc file [%s]: %s"),
+ sec, "FW", strerror(errno));
n = LargeWrite(image->eccFile, cache_offset+fc->imgBlock[i], 2048);
if(n != 2048)
n = LargeWrite(image->eccFile, cache_offset+fc->imgBlock[i], 2048);
if(n != 2048)
diff --git a/scsi-layer.c b/scsi-layer.c
index 64a3dba..3be21ff 100644
index b3a9d0e..f8d2112 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -31,7 +31,9 @@
@@ -268,7 +200,7 @@ index 64a3dba..3be21ff 100644
/*
* See whether a sector lies within the user area.
diff --git a/smart-lec.c b/smart-lec.c
index 8da74ff..0355879 100644
index 02b9c49..944b70d 100644
--- a/smart-lec.c
+++ b/smart-lec.c
@@ -27,9 +27,9 @@

10
debian/patches/18-update-copyright-in-about-dialog.patch vendored
View File

@@ -5,7 +5,7 @@ Subject: Update copyright notice in about dialog.
Description: Update copyright notice in about dialog.
Author: Carlos Maddela <e7appew@gmail.com>
Forwarded: not-needed
Last-Update: 2017-01-05
Last-Update: 2017-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
@@ -13,7 +13,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index c89c552..0f4e3b2 100644
index 47551f7..3f94920 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -723,8 +723,9 @@ void AboutDialog()
@@ -21,10 +21,10 @@ index c89c552..0f4e3b2 100644
#ifdef MODIFIED_SOURCE
- AboutTextWithLink(vbox,
- _("Modified version Copyright 2015 (please fill in - [directions])\n"
- _("Modified version Copyright 2017 (please fill in - [directions])\n"
+ AboutTextWithLink(vbox,
+ _("[Modified version]\n"
+ "Copyright 2005-2016 Debian Optical Media Tools Team\n"
"Copyright 2004-2015 Carsten Gnoerlich"),
+ "Copyright 2005-2017 Debian Optical Media Tools Team\n"
"Copyright 2004-2017 Carsten Gnoerlich"),
"MODIFYING");
#else

2
debian/patches/19-show-text-files-with-abs-path.patch vendored
View File

@@ -13,7 +13,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 18 insertions(+)
diff --git a/help-dialogs.c b/help-dialogs.c
index 0f4e3b2..6214429 100644
index 3f94920..d893d33 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -423,6 +423,24 @@ char *find_file(char *file, size_t *size, char *lang)

2
debian/patches/20-display-changelog-credits-and-todo.patch vendored
View File

@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/menubar.c b/menubar.c
index 12f1933..15ce4ad 100644
index ee24ebe..4a9f470 100644
--- a/menubar.c
+++ b/menubar.c
@@ -126,21 +126,21 @@ static void menu_cb(GtkWidget *widget, gpointer data)

2
debian/patches/22-fix-hurd-i386-ftbfs.patch vendored
View File

@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 4 insertions(+)
diff --git a/menubar.c b/menubar.c
index 15ce4ad..df4203c 100644
index 4a9f470..8330edb 100644
--- a/menubar.c
+++ b/menubar.c
@@ -24,6 +24,10 @@

2
debian/patches/23-add-bdrom-support.patch vendored
View File

@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scsi-layer.c b/scsi-layer.c
index 3be21ff..b70a4a4 100644
index f8d2112..50f6c4c 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -1029,7 +1029,7 @@ static int query_bd(DeviceHandle *dh, int probe_only)

2
debian/patches/24-show-gpl3-license.patch vendored
View File

@@ -13,7 +13,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index 6214429..5065e76 100644
index d893d33..75a615e 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -403,7 +403,7 @@ void ShowGPL()

6
debian/patches/26-fix-display-of-manual.pdf.patch vendored
View File

@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/show-manual.c b/show-manual.c
index d53c9a5..ecb0922 100644
index c25342b..4abbe97 100644
--- a/show-manual.c
+++ b/show-manual.c
@@ -287,8 +287,8 @@ void ShowPDF(char *target)
@@ -31,10 +31,10 @@ index d53c9a5..ecb0922 100644
else
if(*target != '/') bi->path = g_strdup_printf("%s/%s",Closure->docDir, target);
diff --git a/welcome-window.c b/welcome-window.c
index 1046bc8..3261b7c 100644
index d30ebd9..63ac3df 100644
--- a/welcome-window.c
+++ b/welcome-window.c
@@ -138,8 +138,8 @@ void CreateWelcomePage(GtkNotebook *notebook)
@@ -139,8 +139,8 @@ void CreateWelcomePage(GtkNotebook *notebook)
AboutText(box, _("\ndvdisaster creates error correction data to protect\n"
"optical media (CD,DVD,BD) against data loss.\n"));

14
debian/patches/27-allow-opening-in-browser-again.patch vendored
View File

@@ -17,10 +17,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
create mode 100644 show-html.c
diff --git a/closure.c b/closure.c
index 40bb225..f408f7a 100644
index fa52f09..24c1e8c 100644
--- a/closure.c
+++ b/closure.c
@@ -467,6 +467,7 @@ void InitClosure()
@@ -474,6 +474,7 @@ void InitClosure()
Closure->deviceNames = g_ptr_array_new();
Closure->deviceNodes = g_ptr_array_new();
Closure->viewer = g_strdup("xdg-open");
@@ -28,7 +28,7 @@ index 40bb225..f408f7a 100644
Closure->methodList = g_ptr_array_new();
Closure->methodName = g_strdup("RS01");
Closure->dDumpDir = g_strdup(Closure->homeDir);
@@ -598,6 +599,7 @@ void FreeClosure()
@@ -589,6 +590,7 @@ void FreeClosure()
cond_free(Closure->binDir);
cond_free(Closure->docDir);
cond_free(Closure->viewer);
@@ -37,10 +37,10 @@ index 40bb225..f408f7a 100644
cond_free(Closure->simulateCD);
cond_free(Closure->dDumpDir);
diff --git a/dvdisaster.h b/dvdisaster.h
index bcfd4f5..ae874ae 100644
index 9acd094..f536040 100644
--- a/dvdisaster.h
+++ b/dvdisaster.h
@@ -213,6 +213,7 @@ typedef struct _GlobalClosure
@@ -229,6 +229,7 @@ typedef struct _GlobalClosure
char *binDir; /* place where the binary resides */
char *docDir; /* place where our documentation resides */
char *viewer; /* Name of preferred PDF viewer */
@@ -48,7 +48,7 @@ index bcfd4f5..ae874ae 100644
GMutex progressLock; /* A mutex protected the stuff below */
char bs[256]; /* A string of 255 backspace characters */
@@ -1298,6 +1299,12 @@ int ProbeAltiVec(void);
@@ -1348,6 +1349,12 @@ int ProbeAltiVec(void);
void ShowPDF(char*);
@@ -62,7 +62,7 @@ index bcfd4f5..ae874ae 100644
*** smart-lec.c
***/
diff --git a/help-dialogs.c b/help-dialogs.c
index 5065e76..3874463 100644
index 75a615e..dc5b440 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -599,7 +599,8 @@ static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)

2
debian/patches/28-pdftex-reproducibility.patch vendored
View File

@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 2 insertions(+)
diff --git a/documentation/user-manual/manual.tex b/documentation/user-manual/manual.tex
index 60fb51e..bf4364d 100644
index 3024f3a..d943232 100644
--- a/documentation/user-manual/manual.tex
+++ b/documentation/user-manual/manual.tex
@@ -65,6 +65,8 @@

40
debian/patches/29-fix-more-typos.patch vendored
View File

@@ -9,7 +9,7 @@ Description: Fix more typos in error messages and docs.
'sucessful' → 'successful'
'improvment' → 'improvement'
Author: Carlos Maddela <e7appew@gmail.com>
Last-Update: 2017-08-06
Last-Update: 2017-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
@@ -40,10 +40,10 @@ index 51ff827..80fe9d3 100644
\bigskip
diff --git a/locale/cs.po b/locale/cs.po
index 24b1e7c..497a4a9 100644
index 453ec07..d89ff4a 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1903,7 +1903,7 @@ msgid "Media ejection"
@@ -1917,7 +1917,7 @@ msgid "Media ejection"
msgstr "Vysunutí disku"
#: preferences.c:2064 preferences.c:2065
@@ -53,10 +53,10 @@ index 24b1e7c..497a4a9 100644
#: preferences.c:2091
diff --git a/locale/de.po b/locale/de.po
index bbbfdcc..bb5baa6 100644
index 5b47778..8112b13 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1959,7 +1959,7 @@ msgid "Media ejection"
@@ -1975,7 +1975,7 @@ msgid "Media ejection"
msgstr "Datenträger auswerfen"
#: preferences.c:2064 preferences.c:2065
@@ -66,10 +66,10 @@ index bbbfdcc..bb5baa6 100644
#: preferences.c:2091
diff --git a/locale/it.po b/locale/it.po
index a074339..000d5c3 100644
index f6e9dfd..b98f8d3 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -1749,7 +1749,7 @@ msgid "Media ejection"
@@ -1763,7 +1763,7 @@ msgid "Media ejection"
msgstr ""
#: preferences.c:2064 preferences.c:2065
@@ -79,10 +79,10 @@ index a074339..000d5c3 100644
#: preferences.c:2091
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 012ce9e..4624071 100644
index f7f6af0..81ee14d 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1839,7 +1839,7 @@ msgid "Media ejection"
@@ -1853,7 +1853,7 @@ msgid "Media ejection"
msgstr "Ejeção da mídia"
#: preferences.c:2064 preferences.c:2065
@@ -92,10 +92,10 @@ index 012ce9e..4624071 100644
#: preferences.c:2091
diff --git a/locale/ru.po b/locale/ru.po
index 912d6fb..66fc036 100644
index 9625a1f..6e980b9 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1841,7 +1841,7 @@ msgid "Media ejection"
@@ -1855,7 +1855,7 @@ msgid "Media ejection"
msgstr "Извлечь носитель"
#: preferences.c:2064 preferences.c:2065
@@ -105,10 +105,10 @@ index 912d6fb..66fc036 100644
#: preferences.c:2091
diff --git a/locale/sv.po b/locale/sv.po
index 9f70808..5cd4927 100644
index c74a942..3011969 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1755,7 +1755,7 @@ msgid "Media ejection"
@@ -1769,7 +1769,7 @@ msgid "Media ejection"
msgstr ""
#: preferences.c:2064 preferences.c:2065
@@ -118,7 +118,7 @@ index 9f70808..5cd4927 100644
#: preferences.c:2091
diff --git a/preferences.c b/preferences.c
index f5ef889..5a24200 100644
index 4899317..4309809 100644
--- a/preferences.c
+++ b/preferences.c
@@ -2061,8 +2061,8 @@ void CreatePreferencesWindow(void)
@@ -133,11 +133,11 @@ index f5ef889..5a24200 100644
for(i=0; i<2; i++)
diff --git a/regtest/rs01.bash b/regtest/rs01.bash
index 46bfac4..45f7611 100755
index 3c03f61..cc11f6e 100755
--- a/regtest/rs01.bash
+++ b/regtest/rs01.bash
@@ -1327,7 +1327,7 @@ if try "reading medium in 3 passes; 3rd pass recovers some" read_multipass_parti
run_regtest read_multipass_partial_success "--read-medium=3 --spinup-delay=0 -r" $TMPISO $ISODIR/no.ecc
@@ -1323,7 +1323,7 @@ if try "reading medium w/ ecc in 3 passes; 3rd pass recovers some" read_multipas
run_regtest read_multipass_ecc_partial_success "--read-medium=3 --spinup-delay=0 -r" $TMPISO $TMPECC
fi
-# Do a second sucessful read attempt at an incomplete image;
@@ -146,10 +146,10 @@ index 46bfac4..45f7611 100755
# since CRC caching is a bit complicated in this case.
diff --git a/scsi-layer.c b/scsi-layer.c
index b70a4a4..515cc93 100644
index 50f6c4c..22e825d 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2474,7 +2474,7 @@ int ReadSectors(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors)
@@ -2458,7 +2458,7 @@ int ReadSectors(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors)
if(Closure->readRaw && dh->rawBuffer)
recommended_attempts = dh->rawBuffer->recommendedAttempts;
@@ -159,7 +159,7 @@ index b70a4a4..515cc93 100644
if(Closure->stopActions) /* user break */
diff --git a/smart-lec.c b/smart-lec.c
index 0355879..e33ad8f 100644
index 944b70d..534dd65 100644
--- a/smart-lec.c
+++ b/smart-lec.c
@@ -1609,7 +1609,7 @@ static int smart_lec_iteration(sh_context *shc, char *message)

2
debian/patches/30-hurd-kfreebsd-ftbfs.patch vendored
View File

@@ -13,7 +13,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/rs03-create.c b/rs03-create.c
index b2c6033..b14e326 100644
index 9c7265d..678644c 100644
--- a/rs03-create.c
+++ b/rs03-create.c
@@ -39,16 +39,19 @@

16
debian/patches/31-improve-hurd-and-kfreebsd-support.patch vendored
View File

@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/cacheprobe.c b/cacheprobe.c
index 60c55f9..f30f5d3 100644
index 545c690..9f754dd 100644
--- a/cacheprobe.c
+++ b/cacheprobe.c
@@ -22,7 +22,8 @@
@@ -75,7 +75,7 @@ index 60c55f9..f30f5d3 100644
diff --git a/closure.c b/closure.c
index f408f7a..f4b1893 100644
index 24c1e8c..26ee13b 100644
--- a/closure.c
+++ b/closure.c
@@ -50,7 +50,8 @@ static void get_base_dirs()
@@ -88,7 +88,7 @@ index f408f7a..f4b1893 100644
if(DirStat(BINDIR))
Closure->binDir = g_strdup(BINDIR);
@@ -425,7 +426,8 @@ void InitClosure()
@@ -432,7 +433,8 @@ void InitClosure()
/* Generate a more comprehensive version string */
@@ -99,7 +99,7 @@ index f408f7a..f4b1893 100644
#define BITNESS_STRING " 64bit"
#else
diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
index d62f5d7..9abcf96 100644
index f1a8bd1..487a50b 100644
--- a/scripts/bash-based-configure
+++ b/scripts/bash-based-configure
@@ -136,6 +136,15 @@ case "$cfg_uname" in
@@ -135,7 +135,7 @@ index d62f5d7..9abcf96 100644
CFG_SYS_OPTIONS="-DSYS_UNKNOWN"
CFG_SYS_NAME="-DSYS_NAME=\\\"Unknown\\\""
diff --git a/scsi-freebsd.c b/scsi-freebsd.c
index 78d0be4..793f206 100644
index 0e3397a..bbfb913 100644
--- a/scsi-freebsd.c
+++ b/scsi-freebsd.c
@@ -25,7 +25,7 @@
@@ -154,7 +154,7 @@ index 78d0be4..793f206 100644
-#endif /* SYS_FREEBSD */
+#endif /* defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) */
diff --git a/scsi-layer.c b/scsi-layer.c
index 515cc93..609cb73 100644
index 22e825d..eaecc5c 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2005,12 +2005,13 @@ static gint64 query_size(Image *image)
@@ -184,7 +184,7 @@ index 515cc93..609cb73 100644
/***
diff --git a/scsi-layer.h b/scsi-layer.h
index cc7d9fc..0706a22 100644
index cb5c559..6169508 100644
--- a/scsi-layer.h
+++ b/scsi-layer.h
@@ -28,7 +28,7 @@
@@ -234,7 +234,7 @@ index cc7d9fc..0706a22 100644
union ccb *ccb;
#endif
diff --git a/scsi-unknown.c b/scsi-unknown.c
index e9183f6..ef54552 100644
index f5f1072..7b2ccdb 100644
--- a/scsi-unknown.c
+++ b/scsi-unknown.c
@@ -25,7 +25,7 @@