Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dvdisaster for openSUSE:Factory
checked in at 2022-01-23 15:25:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dvdisaster (Old)
and /work/SRC/openSUSE:Factory/.dvdisaster.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvdisaster"
Sun Jan 23 15:25:34 2022 rev:4 rq:948221 version:0.79.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/dvdisaster/dvdisaster.changes 2020-07-03
00:07:20.887060486 +0200
+++ /work/SRC/openSUSE:Factory/.dvdisaster.new.1938/dvdisaster.changes
2022-01-23 15:25:43.565197542 +0100
@@ -1,0 +2,16 @@
+Sun Jan 23 13:09:38 UTC 2022 - Dave Plater <davejpla...@gmail.com>
+
+- Add more debian patches:
+ 12-fix-spelling-of-up-to.patch Added
+ 15-show-new-pkg-tracker.patch Added
+ 16-remove-auto-build-of-doco-from-install-rule.patch Added
+ 19-show-text-files-with-abs-path.patch Added
+ 20-display-changelog-credits-and-todo.patch Added
+ 26-fix-display-of-manual.pdf.patch Added
+ 31-improve-hurd-and-kfreebsd-support.patch Added
+ 33-honour-LDFLAGS.patch Added
+ 35-archived-homepage.patch Added
+ 36-fix-parallelism.patch Added
+- Fix boo#1195036 with dvdisaster-g_strdup_printf.patch
+
+-------------------------------------------------------------------
New:
----
12-fix-spelling-of-up-to.patch
15-show-new-pkg-tracker.patch
16-remove-auto-build-of-doco-from-install-rule.patch
19-show-text-files-with-abs-path.patch
20-display-changelog-credits-and-todo.patch
26-fix-display-of-manual.pdf.patch
31-improve-hurd-and-kfreebsd-support.patch
33-honour-LDFLAGS.patch
35-archived-homepage.patch
36-fix-parallelism.patch
dvdisaster-g_strdup_printf.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dvdisaster.spec ++++++
--- /var/tmp/diff_new_pack.lHj1E2/_old 2022-01-23 15:25:44.133193591 +0100
+++ /var/tmp/diff_new_pack.lHj1E2/_new 2022-01-23 15:25:44.137193563 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dvdisaster
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,28 +32,41 @@
# PATCH-FIX-UPSTREAM davejpla...@gmail.com Fix scripts/bash-based-configure to
work in Tumbleweed.
Patch0: dvdisaster-findmake.patch
# Patches from Debian
-Patch1: 29-fix-more-typos.patch
-Patch6: 23-add-bdrom-support.patch
-Patch7: 34-gcc8-format-security.patch
-Patch8: 02-encryption.patch
-Patch9: 17-fix-all-but-deprecated-api-warnings.patch
-Patch10:
10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch
-Patch12: 25-fix-man-pages.patch
-Patch17: 14-make-builds-reproducible.patch
-Patch18: 11-no-cruft.patch
-Patch19: 18-update-copyright-in-about-dialog.patch
-Patch20: 30-hurd-kfreebsd-ftbfs.patch
-Patch23: 22-fix-hurd-i386-ftbfs.patch
-Patch24: 03-dvdrom.patch
-Patch26: 37-suggest-dvdisaster-doc.patch
-Patch27: 13-fix-missing-language-field-in-po-files.patch
-Patch28: 32-display-compilation-commands.patch
-Patch29: 28-pdftex-reproducibility.patch
-Patch30: 05-help-dialog.patch
-Patch31: 27-allow-opening-in-browser-again.patch
-Patch32: 24-show-gpl3-license.patch
+Patch1: 02-encryption.patch
+Patch2: 03-dvdrom.patch
+Patch3: 05-help-dialog.patch
+#Patch4: 08-fix-gnu-make-detection.patch
+Patch5:
10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch
+Patch6: 11-no-cruft.patch
+Patch7: 12-fix-spelling-of-up-to.patch
+Patch8: 13-fix-missing-language-field-in-po-files.patch
+Patch9: 14-make-builds-reproducible.patch
+Patch10: 15-show-new-pkg-tracker.patch
+Patch11: 16-remove-auto-build-of-doco-from-install-rule.patch
+Patch12: 17-fix-all-but-deprecated-api-warnings.patch
+Patch13: 18-update-copyright-in-about-dialog.patch
+Patch14: 19-show-text-files-with-abs-path.patch
+Patch15: 20-display-changelog-credits-and-todo.patch
+Patch16: 22-fix-hurd-i386-ftbfs.patch
+Patch17: 23-add-bdrom-support.patch
+Patch18: 24-show-gpl3-license.patch
+Patch19: 25-fix-man-pages.patch
+Patch20: 26-fix-display-of-manual.pdf.patch
+Patch21: 27-allow-opening-in-browser-again.patch
+Patch22: 28-pdftex-reproducibility.patch
+Patch23: 29-fix-more-typos.patch
+Patch24: 30-hurd-kfreebsd-ftbfs.patch
+Patch25: 31-improve-hurd-and-kfreebsd-support.patch
+Patch26: 32-display-compilation-commands.patch
+Patch27: 33-honour-LDFLAGS.patch
+Patch28: 34-gcc8-format-security.patch
+Patch29: 35-archived-homepage.patch
+Patch30: 36-fix-parallelism.patch
+Patch31: 37-suggest-dvdisaster-doc.patch
+#Patch32: dvdisaster-0.79.5-dvdrom.patch
#PATCH-FIX-OPENSUSE davejpla...@gmail.com dvdisaster-no-tex.patch - tries to
build pdfs that already exist
Patch33: dvdisaster-no-tex.patch
+Patch34: dvdisaster-g_strdup_printf.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: pkgconfig
@@ -107,6 +120,7 @@
--localedir=%{_datadir}/locale \
--buildroot=%{buildroot}
make --trace
+
# Parallel make breaks translations sometimes.
#%%{?_smp_mflags}
%install
@@ -120,9 +134,8 @@
%license COPYING
%{_mandir}/de/man1/%{name}.1%{ext_man}
%{_mandir}/man1/%{name}.1%{ext_man}
-%exclude %{_docdir}/%{name}/manual.pdf
%files docs
-%doc %{_docdir}/%{name}/manual.pdf
+%doc documentation/user-manual/manual.pdf
%changelog
++++++ 12-fix-spelling-of-up-to.patch ++++++
From: Carlos Maddela <e7ap...@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 <e7ap...@gmail.com>
Forwarded: no
Last-Update: 2017-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
debug.c | 2 +-
documentation/codec-specs/rs01.tex | 2 +-
documentation/codec-specs/rs02.tex | 2 +-
documentation/dvdisaster.en.1 | 4 ++--
documentation/user-manual/qa.tex | 2 +-
dvdisaster.c | 2 +-
dvdisaster.h | 4 ++--
locale/cs.po | 6 +++---
locale/de.po | 6 +++---
locale/it.po | 8 ++++----
locale/pt_BR.po | 10 +++++-----
locale/ru.po | 12 ++++++------
locale/sv.po | 6 +++---
preferences.c | 4 ++--
14 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/debug.c b/debug.c
index b4a96d1..bd725d6 100644
--- a/debug.c
+++ b/debug.c
@@ -1023,7 +1023,7 @@ void RawSector(char *arg)
*
* ./dvdisaster --debug --send-cdb 12,00,00,00,24,00:24
*
- * The first six bytes make up the cdb; cdbs with upto 12 bytes are possible.
+ * The first six bytes make up the cdb; cdbs with up to 12 bytes are possible.
* The :24 arg is the allocation length.
* Note that the allocation length must match those specified in the cdb;
* differing values may crash the system.
diff --git a/documentation/codec-specs/rs01.tex
b/documentation/codec-specs/rs01.tex
index ebb1ee5..a8c0d90 100644
--- a/documentation/codec-specs/rs01.tex
+++ b/documentation/codec-specs/rs01.tex
@@ -172,7 +172,7 @@ The $d_{i,j}$ denote the $i-th$ byte in the $j-th$ layer.
In order to create the first ecc block, bytes $d_{1,1}$ to $d_{1,n}$ are
taken from the
$n$ layers. Then the RS(255,k) code is calculated (see appendix \ref{rs} for
its parameters)
and the
-resulting $k$ parity bytes $e_{1,1}$ upto $e_{k,1}$ are stored
+resulting $k$ parity bytes $e_{1,1}$ up to $e_{k,1}$ are stored
in the ecc file. The resulting ecc block is marked grey in the
figure. The next ecc blocks are calculated and stored accordingly.
In total, the ecc section contains $k*ls$ bytes of parity information,
diff --git a/documentation/codec-specs/rs02.tex
b/documentation/codec-specs/rs02.tex
index 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
marked with ``all'' or ``RS02'' are relevant; all other fields should be set
to zero.
Data layer $n$ does also contain the CRC32 checksums of each data sector
-upto the ecc header. If the .iso image contains $s$ sectors,
+up to the ecc header. If the .iso image contains $s$ sectors,
then the CRC field contains $4s$ bytes, rounded up
to the nearest multiple of 2048.
CRC32 checksums are calculated over a whole CD sector comprising 2048 bytes.
diff --git a/documentation/dvdisaster.en.1 b/documentation/dvdisaster.en.1
index 3472012..d71abec 100644
--- a/documentation/dvdisaster.en.1
+++ b/documentation/dvdisaster.en.1
@@ -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.
-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
@@ -384,7 +384,7 @@ the uncorrected sector instead.
.RE
.TP
.B \-\-read-attempts n-m
-attempts n upto m reads of a defective sector.
+attempts n up to m reads of a defective sector.
.TP
.B \-\-read-medium n
read the whole medium up to n times.
diff --git a/documentation/user-manual/qa.tex b/documentation/user-manual/qa.tex
index a3465a8..d79ca4d 100644
--- a/documentation/user-manual/qa.tex
+++ b/documentation/user-manual/qa.tex
@@ -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.
- This causes dvdisaster versions upto 0.65 to falsely display the above
error
+ This causes dvdisaster versions up to 0.65 to falsely display the
above error
message. Please use the developer versions only together with
dvdisaster
0.66 or newer versions. }
diff --git a/dvdisaster.c b/dvdisaster.c
index 6742d99..6840fd5 100644
--- a/dvdisaster.c
+++ b/dvdisaster.c
@@ -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"));
- PrintCLI(_(" --read-attempts n-m - attempts n upto m reads of a
defective sector\n"));
+ PrintCLI(_(" --read-attempts n-m - attempts n up to m reads of a
defective sector\n"));
PrintCLI(_(" --read-medium n - read the whole medium up to n
times\n"));
PrintCLI(_(" --read-raw - performs read in raw mode if
possible\n"));
PrintCLI(_(" --regtest - tweaks output for compatibility
with regtests\n"));
diff --git a/dvdisaster.h b/dvdisaster.h
index 7fb980b..a466450 100644
--- a/dvdisaster.h
+++ b/dvdisaster.h
@@ -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 */
-#define MAX_PREFETCH_CACHE_SIZE (512*1024) /* upto 0.5TB RS03 */
+#define MAX_PREFETCH_CACHE_SIZE (512*1024) /* up to 0.5TB RS03 */
/* Choices for I/O strategy */
@@ -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. */
- /* 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 3274de9..4f766a3 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -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: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: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"
-"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts upto this
number.\n"
+"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts up to this
number.\n"
"\n"
"The decision to do more attempts depends on the quality of data gathered so
far, which in turn is influenced by the capabilities of your optical drive and
the operating system. So depending on your configuration, you may or may not
see dvdisaster using the maximum value."
msgstr ""
@@ -2086,7 +2086,7 @@ msgstr " kr??t"
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
-"If unreadable sectors remain after reading the medium from start to end, the
medium is read again upto he given number of times.\n"
+"If unreadable sectors remain after reading the medium from start to end, the
medium is read again up to he given number of times.\n"
"\n"
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index b252c19..5b47778 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -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: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:934
@@ -2073,7 +2073,7 @@ msgstr "H??chstens %d Leseversuche pro Sektor"
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
-"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts upto this
number.\n"
+"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts up to this
number.\n"
"\n"
"The decision to do more attempts depends on the quality of data gathered so
far, which in turn is influenced by the capabilities of your optical drive and
the operating system. So depending on your configuration, you may or may not
see dvdisaster using the maximum value."
msgstr ""
@@ -2145,7 +2145,7 @@ msgstr " mal lesen"
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
-"If unreadable sectors remain after reading the medium from start to end, the
medium is read again upto he given number of times.\n"
+"If unreadable sectors remain after reading the medium from start to end, the
medium is read again up to he given number of times.\n"
"\n"
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
diff --git a/locale/it.po b/locale/it.po
index efd3d27..f6e9dfd 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -629,7 +629,7 @@ msgid " --raw-mode n - mode for raw reading CD
media (20 or 21)\n"
msgstr ""
#: 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:934
@@ -1838,7 +1838,7 @@ msgstr ""
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
-"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts upto this
number.\n"
+"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts up to this
number.\n"
"\n"
"The decision to do more attempts depends on the quality of data gathered so
far, which in turn is influenced by the capabilities of your optical drive and
the operating system. So depending on your configuration, you may or may not
see dvdisaster using the maximum value."
msgstr ""
@@ -1897,7 +1897,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 ""
@@ -6086,7 +6086,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 21ea77b..86eda03 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -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: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: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"
-"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts upto this
number.\n"
+"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts up to this
number.\n"
"\n"
"The decision to do more attempts depends on the quality of data gathered so
far, which in turn is influenced by the capabilities of your optical drive and
the operating system. So depending on your configuration, you may or may not
see dvdisaster using the maximum value."
msgstr ""
@@ -2021,7 +2021,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 ""
@@ -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"
-#~ " --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"
@@ -6501,7 +6501,7 @@ msgstr "<i>Novidades dessa vers??o:</i>"
#~ msgid ""
#~ "<b>File splitting</b>\n"
#~ "\n"
-#~ "Allows working with file systems which are limited to 2GB per file, e.g.
FAT from Windows. Created files are spread over upto 100 segments called
\"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
+#~ "Allows working with file systems which are limited to 2GB per file, e.g.
FAT from Windows. Created files are spread over up to 100 segments called
\"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
#~ msgstr ""
#~ "<b>Separa????o de arquivos</b>\n"
#~ "\n"
diff --git a/locale/ru.po b/locale/ru.po
index 767f906..7984c59 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -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: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:934
@@ -1952,7 +1952,7 @@ msgstr "????????. %d ?????????????? ???????????? ????
????????????"
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
-"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts upto this
number.\n"
+"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts up to this
number.\n"
"\n"
"The decision to do more attempts depends on the quality of data gathered so
far, which in turn is influenced by the capabilities of your optical drive and
the operating system. So depending on your configuration, you may or may not
see dvdisaster using the maximum value."
msgstr ""
@@ -2024,7 +2024,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 ""
@@ -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"
-#~ " --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"
@@ -6560,7 +6560,7 @@ msgstr "<i>?????????? ?? ???????? ????????????:</i>"
#~ msgid ""
#~ "<b>File splitting</b>\n"
#~ "\n"
-#~ "Allows working with file systems which are limited to 2GB per file, e.g.
FAT from Windows. Created files are spread over upto 100 segments called
\"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
+#~ "Allows working with file systems which are limited to 2GB per file, e.g.
FAT from Windows. Created files are spread over up to 100 segments called
\"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
#~ msgstr ""
#~ "<b>?????????????????? ????????????</b>\n"
#~ "\n"
@@ -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"
-#~ " --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 548e2e5..c74a942 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -630,7 +630,7 @@ msgid " --raw-mode n - mode for raw reading CD
media (20 or 21)\n"
msgstr ""
#: 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:934
@@ -1844,7 +1844,7 @@ msgstr ""
msgid ""
"<b>Maximum number of reading attempts</b>\n"
"\n"
-"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts upto this
number.\n"
+"When the minimum number of reading attempts is reached without success,
dvdisaster might choose to perform additional reading attempts up to this
number.\n"
"\n"
"The decision to do more attempts depends on the quality of data gathered so
far, which in turn is influenced by the capabilities of your optical drive and
the operating system. So depending on your configuration, you may or may not
see dvdisaster using the maximum value."
msgstr ""
@@ -1903,7 +1903,7 @@ msgstr ""
msgid ""
"<b>Media read attempts</b> for the linear reading strategy\n"
"\n"
-"If unreadable sectors remain after reading the medium from start to end, the
medium is read again upto he given number of times.\n"
+"If unreadable sectors remain after reading the medium from start to end, the
medium is read again up to he given number of times.\n"
"\n"
"Only the missing sectors will be tried in the additional reading passes."
msgstr ""
diff --git a/preferences.c b/preferences.c
index 70afa02..4899317 100644
--- a/preferences.c
+++ b/preferences.c
@@ -2221,7 +2221,7 @@ void CreatePreferencesWindow(void)
_("<b>Maximum number of reading attempts</b>\n\n"
"When the minimum number of reading attempts is
reached "
"without success, dvdisaster might choose to perform
additional "
- "reading attempts upto this number.\n\n"
+ "reading attempts up to this number.\n\n"
"The decision to do more attempts depends on the
quality of "
"data gathered so far, which in turn is influenced by
the "
@@ -2336,7 +2336,7 @@ void CreatePreferencesWindow(void)
AddHelpParagraph(lwoh,
_("<b>Media read attempts</b> for the linear reading
strategy\n\n"
"If unreadable sectors remain after reading the medium
from start to end, "
- "the medium is read again upto he given number of
times.\n\n"
+ "the medium is read again up to he given number of
times.\n\n"
"Only the missing sectors will be tried in the
additional reading passes."));
/** Defective sector caching */
++++++ 15-show-new-pkg-tracker.patch ++++++
From: Carlos Maddela <e7ap...@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 <e7ap...@gmail.com>
Forwarded: not-needed
Last-Update: 2016-12-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
help-dialogs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/help-dialogs.c b/help-dialogs.c
index 758ac19..47551f7 100644
--- a/help-dialogs.c
+++ b/help-dialogs.c
@@ -750,7 +750,7 @@ void AboutDialog()
"for Debian to support DVD-ROMs (with and without
encryption).\n\n"
"Please do not bother the original authors of
dvdisaster\n"
"but submit bugreports against the [debian
package] instead.\n"),
- "http://packages.qa.debian.org/dvdisaster";);
+ "https://tracker.debian.org/pkg/dvdisaster";);
#else
lang = g_getenv("LANG");
++++++ 16-remove-auto-build-of-doco-from-install-rule.patch ++++++
From: Carlos Maddela <e7ap...@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 <e7ap...@gmail.com>
Forwarded: not-needed
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index 6fda92b..d9bef11 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -223,12 +223,11 @@ show:
.PHONY : install uninstall clean distclean arch
.PHONY : srcdist
-install: dvdisaster manual
+install: dvdisaster
@echo "Installing package..."
install -d $(BUILDROOT)$(BINDIR)
install dvdisaster $(BUILDROOT)$(BINDIR)
install -d $(BUILDROOT)$(DOCSUBDIR)
- (cd documentation/user-manual; install -m 644 manual.pdf
$(BUILDROOT)$(DOCSUBDIR))
install -d $(BUILDROOT)$(MANDIR)/man1
install -d $(BUILDROOT)$(MANDIR)/de/man1
cd documentation; \
++++++ 19-show-text-files-with-abs-path.patch ++++++
From: Carlos Maddela <e7ap...@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 <e7ap...@gmail.com>
Forwarded: no
Last-Update: 2016-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
help-dialogs.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/help-dialogs.c b/help-dialogs.c
index 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)
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)
++++++ 20-display-changelog-credits-and-todo.patch ++++++
From: Carlos Maddela <e7ap...@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 <e7ap...@gmail.com>
Forwarded: not-needed
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
menubar.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/menubar.c b/menubar.c
index ee24ebe..4a9f470 100644
--- a/menubar.c
+++ b/menubar.c
@@ -126,21 +126,21 @@ static void menu_cb(GtkWidget *widget, gpointer data)
ShowTextfile(_("windowtitle|Change log"),
_("<big>Change log</big>\n"
"<i>Major differences from earlier program
versions.</i>"),
- "CHANGELOG", NULL, NULL);
+ "/usr/share/doc/dvdisaster/CHANGELOG", NULL, NULL);
break;
case MENU_HELP_CREDITS:
ShowTextfile(_("windowtitle|Credits"),
_("<big>Credits</big>\n"
"<i>Thanks go out to...</i>"),
- "CREDITS", NULL, NULL);
+ "/usr/share/doc/dvdisaster/CREDITS", NULL, NULL);
break;
case MENU_HELP_TODO:
ShowTextfile(_("windowtitle|To do list"),
_("<big>To do list</big>\n"
"<i>A sneak preview of coming features ... perhaps
;-)</i>"),
- "TODO", NULL, NULL);
+ "/usr/share/doc/dvdisaster/TODO", NULL, NULL);
break;
default:
++++++ 26-fix-display-of-manual.pdf.patch ++++++
From: Carlos Maddela <e7ap...@gmail.com>
Date: Thu, 5 Jan 2017 18:59:30 +1100
Subject: Fix display of manual.pdf.
Description: Fix display of manual.pdf.
The PDF file is automatically compressed by Debhelper, so we need to
account for this.
Author: Carlos Maddela <e7ap...@gmail.com>
Forwarded: not-needed
Last-Update: 2017-01-05
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
show-manual.c | 4 ++--
welcome-window.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/show-manual.c b/show-manual.c
index c25342b..4abbe97 100644
--- a/show-manual.c
+++ b/show-manual.c
@@ -287,8 +287,8 @@ void ShowPDF(char *target)
/* If no target is given, show the manual. */
- if(!target)
- { bi->path = g_strdup_printf("%s/manual.pdf",Closure->docDir);
+ if(!target)
+ { bi->path = g_strdup_printf("%s/manual.pdf.gz",Closure->docDir);
}
else
if(*target != '/') bi->path = g_strdup_printf("%s/%s",Closure->docDir,
target);
diff --git a/welcome-window.c b/welcome-window.c
index d30ebd9..63ac3df 100644
--- a/welcome-window.c
+++ b/welcome-window.c
@@ -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"));
- AboutTextWithLink(box, _("Please see the [manual] for typical uses of
dvdisaster.\n\n"),
- "manual.pdf");
+ AboutTextWithLink(box, _("Please see the [manual] for typical uses of
dvdisaster.\n\n"),
+ "manual.pdf.gz");
AboutText(box, _("<i>New in this Version:</i>"));
++++++ 31-improve-hurd-and-kfreebsd-support.patch ++++++
From: Carlos Maddela <e7ap...@gmail.com>
Date: Sun, 6 Aug 2017 10:37:18 +1000
Subject: Add better support for HURD and kFreeBSD systems.
Description: Add better support for HURD and kFreeBSD systems.
Hurd still compiles without SCSI layer, however.
Author: Carlos Maddela <e7ap...@gmail.com>
Last-Update: 2017-08-06
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
cacheprobe.c | 16 +++++++++-------
closure.c | 6 ++++--
scripts/bash-based-configure | 18 ++++++++++++++++++
scsi-freebsd.c | 4 ++--
scsi-layer.c | 10 ++++++----
scsi-layer.h | 17 +++++++++--------
scsi-unknown.c | 4 ++--
show-html.c | 15 ++++++++++-----
8 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/cacheprobe.c b/cacheprobe.c
index 545c690..9f754dd 100644
--- a/cacheprobe.c
+++ b/cacheprobe.c
@@ -22,7 +22,8 @@
#include "dvdisaster.h"
-#ifdef SYS_LINUX
+#if defined(SYS_LINUX)
+
int ProbeCacheLineSize()
{ int cl_size = 0;
@@ -36,9 +37,9 @@ int ProbeCacheLineSize()
return cl_size;
}
-#endif
-#ifdef SYS_FREEBSD
+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+
#include <sys/param.h>
int ProbeCacheLineSize()
@@ -52,9 +53,9 @@ int ProbeCacheLineSize()
return cl_size;
}
-#endif
-#ifdef SYS_NETBSD
+#elif defined(SYS_NETBSD)
+
#include <sys/param.h>
int ProbeCacheLineSize()
@@ -68,13 +69,14 @@ int ProbeCacheLineSize()
return cl_size;
}
-#endif
-#ifdef SYS_UNKNOWN
+#else /* SYS_UNKNOWN and others. */
+
int ProbeCacheLineSize()
{
return 64;
}
+
#endif
diff --git a/closure.c b/closure.c
index 24c1e8c..26ee13b 100644
--- a/closure.c
+++ b/closure.c
@@ -50,7 +50,8 @@ static void get_base_dirs()
/*** Otherwise try the installation directory.
On Unices this is a hardcoded directory. */
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) ||
defined(SYS_UNKNOWN)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD) || defined(SYS_UNKNOWN)
if(DirStat(BINDIR))
Closure->binDir = g_strdup(BINDIR);
@@ -432,7 +433,8 @@ void InitClosure()
/* Generate a more comprehensive version string */
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
#ifdef HAVE_64BIT
#define BITNESS_STRING " 64bit"
#else
diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
index f1a8bd1..487a50b 100644
--- a/scripts/bash-based-configure
+++ b/scripts/bash-based-configure
@@ -136,6 +136,15 @@ case "$cfg_uname" in
}
;;
+ GNU/kFreeBSD*) cfg_system=kfreebsd
+ CFG_SYS_OPTIONS="-DSYS_KFREEBSD"
+ CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/kFreeBSD\\\""
+ CFG_EXE_SUFFIX=""
+ function add_linker_flags()
+ { lflags_return="-L$1 -Wl,-rpath,$1 $2"
+ }
+ ;;
+
NetBSD*) cfg_system=netbsd
CFG_SYS_OPTIONS="-DSYS_NETBSD"
CFG_SYS_NAME="-DSYS_NAME=\\\"NetBSD\\\""
@@ -146,6 +155,15 @@ case "$cfg_uname" in
}
;;
+ GNU*) cfg_system=hurd
+ CFG_SYS_OPTIONS="-DSYS_HURD"
+ CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/Hurd\\\""
+ CFG_EXE_SUFFIX=""
+ function add_linker_flags()
+ { lflags_return="-L$1 -Wl,-rpath,$1 $2"
+ }
+ ;;
+
*) cfg_system=unknown-system
CFG_SYS_OPTIONS="-DSYS_UNKNOWN"
CFG_SYS_NAME="-DSYS_NAME=\\\"Unknown\\\""
diff --git a/scsi-freebsd.c b/scsi-freebsd.c
index 0e3397a..bbfb913 100644
--- a/scsi-freebsd.c
+++ b/scsi-freebsd.c
@@ -25,7 +25,7 @@
#include "scsi-layer.h"
#include "udf.h"
-#ifdef SYS_FREEBSD
+#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
/* SCSI wrappers for FreeBSD are still work in progress. */
@@ -241,4 +241,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int
cdb_size, unsigned char
return -1;
}
-#endif /* SYS_FREEBSD */
+#endif /* defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) */
diff --git a/scsi-layer.c b/scsi-layer.c
index 22e825d..eaecc5c 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2005,12 +2005,13 @@ static gint64 query_size(Image *image)
*/
gint64 CurrentMediumSize(int get_blank_size)
-{ Image *image;
+{
+#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
+ return 0;
+#else
+ Image *image;
gint64 size;
-#ifdef SYS_UNKNOWN
- return 0;
-#endif
image = OpenImageFromDevice(Closure->device);
if(!image) return 0;
@@ -2051,6 +2052,7 @@ gint64 CurrentMediumSize(int get_blank_size)
CloseImage(image);
return size;
+#endif
}
/***
diff --git a/scsi-layer.h b/scsi-layer.h
index cb5c559..6169508 100644
--- a/scsi-layer.h
+++ b/scsi-layer.h
@@ -28,7 +28,7 @@
#include <linux/cdrom.h>
#endif
-#ifdef SYS_FREEBSD
+#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
#include <camlib.h>
#endif
@@ -49,19 +49,21 @@
* Linux already has one
*/
-#ifdef SYS_LINUX
+#if defined(SYS_LINUX)
+
#define MAX_CDB_SIZE CDROM_PACKET_SIZE
/* Now globally defined for all OSes here */
//typedef struct request_sense Sense;
-#endif
-#ifdef SYS_FREEBSD
+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+
#define MAX_CDB_SIZE SCSI_MAX_CDBLEN
-#endif
-#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD)
+#else /* SYS_UNKNOWN and others. */
+
#define MAX_CDB_SIZE 16 /* longest possible SCSI command */
+
#endif
/*
@@ -101,8 +103,7 @@ typedef struct _DeviceHandle
*/
#if defined(SYS_LINUX) || defined(SYS_NETBSD)
int fd; /* device file descriptor */
-#endif
-#ifdef SYS_FREEBSD
+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
struct cam_device *camdev; /* camlib device handle */
union ccb *ccb;
#endif
diff --git a/scsi-unknown.c b/scsi-unknown.c
index f5f1072..7b2ccdb 100644
--- a/scsi-unknown.c
+++ b/scsi-unknown.c
@@ -25,7 +25,7 @@
#include "scsi-layer.h"
#include "udf.h"
-#ifdef SYS_UNKNOWN
+#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
/* Dummy routines so that we can compile on unknown architectures
for which we don't have SCSI support yet. */
@@ -51,4 +51,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int
cdb_size, unsigned char
return -1;
}
-#endif /* SYS_UNKNOWN */
+#endif /* defined(SYS_UNKNOWN) || defined(SYS_HURD) */
diff --git a/show-html.c b/show-html.c
index 608e8ec..20715f4 100644
--- a/show-html.c
+++ b/show-html.c
@@ -21,7 +21,8 @@
#include "dvdisaster.h"
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
#include <sys/wait.h>
#endif
@@ -34,7 +35,8 @@
*** Ask user to specify his browser
***/
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
#define SEARCH_BUTTON 1
@@ -173,7 +175,8 @@ static void msg_destroy_cb(GtkWidget *widget, gpointer data)
bi->msg = NULL;
}
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
/*
* The following list of browsers and html wrappers
@@ -273,7 +276,8 @@ static gboolean browser_timeout_func(gpointer data)
* Invoke the browser
*/
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
static void try_browser(browser_info *bi)
{ pid_t pid;
@@ -393,7 +397,8 @@ void ShowHTML(char *target)
g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
#endif
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
/* Try the first browser */
browser_index = 0;
++++++ 33-honour-LDFLAGS.patch ++++++
From: Carlos Maddela <e7ap...@gmail.com>
Date: Thu, 21 Dec 2017 02:44:53 +1100
Subject: Honour LDFLAGS set by dpkg-buildflags in building all binaries.
Description: Honour LDFLAGS set by dpkg-buildflags in building all binaries.
Unpackaged simple-md5sum utility must do so as well, to keep blhc happy.
Author: Carlos Maddela <e7ap...@gmail.com>
Forwarded: no
Last-Update: 2017-12-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index ac1f597..4509c48 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -138,7 +138,7 @@ untranslated:
$(MAKE) --no-print-directory -C locale check-untranslated
simple-md5sum: md5.c
- $(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c
$(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
+ $(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(LDFLAGS)
$(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
version.tex:
@echo "\\newcommand{\\projectversion}{$(VERSION)}"
>$(SRCDIR)/documentation/config/version.tex
++++++ 35-archived-homepage.patch ++++++
From: Carlos Maddela <e7ap...@gmail.com>
Date: Thu, 31 Jan 2019 05:31:03 +1100
Subject: Change homepage to one archived at web.archive.org.
Description: Change homepage to one archived at web.archive.org.
http://dvdisaster.net has been unavailable for a while now.
Not certain if this is permanent though, as the domain name still
exists for mail.
Author: Carlos Maddela <e7ap...@gmail.com>
Forwarded: not-needed
Last-Update: 2019-01-31
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
documentation/codec-specs/rs01.tex | 2 +-
documentation/codec-specs/rs02.tex | 2 +-
documentation/upstream-site/de/impressum.html | 2 +-
documentation/upstream-site/en/imprint.html | 2 +-
documentation/user-manual/background.tex | 2 +-
documentation/user-manual/download.tex | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/documentation/codec-specs/rs01.tex
b/documentation/codec-specs/rs01.tex
index a8c0d90..ca7f71f 100644
--- a/documentation/codec-specs/rs01.tex
+++ b/documentation/codec-specs/rs01.tex
@@ -44,7 +44,7 @@ correction files must be protected with an image level
error correction layer (by using RS01,RS02 or RS03 on the medium),
since only image level error correction avoids meta
data sectors to become a single point of failure. See the
-discussion at \url{http://dvdisaster.net/en/qa32.html} for
+discussion at
\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/qa32.html}
for
more information on the advantages of image level data protection
over file level approaches.
diff --git a/documentation/codec-specs/rs02.tex
b/documentation/codec-specs/rs02.tex
index fb88384..06e8126 100644
--- a/documentation/codec-specs/rs02.tex
+++ b/documentation/codec-specs/rs02.tex
@@ -74,7 +74,7 @@ the parity data portion of the image might not be written to
the medium.
Most current writing programs do however measure the .iso image by examining
its file size, and will transfer the parity data correctly. To be sure you
should follow the steps described under ``Testing image compatibility''
-at the dvdisaster site (\url{http://dvdisaster.net/en/howtos92.html}) once
+at the dvdisaster site
(\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/howtos92.html})
once
before using each version of your optical media authoring software.
Like the other dvdisaster codecs, RS02 is based on a RS(255,k) Reed-Solomon
code
diff --git a/documentation/upstream-site/de/impressum.html
b/documentation/upstream-site/de/impressum.html
index 7c5ded3..d8bf4f8 100644
--- a/documentation/upstream-site/de/impressum.html
+++ b/documentation/upstream-site/de/impressum.html
@@ -63,7 +63,7 @@ Carsten Gn??rlich (Anschrift wie oben).
Das Impressum gilt f??r die Internetpr??senz unter den Dom??nen<br>
<a href="http://dvdisaster.com";>dvdisaster.com</a>,
<a href="http://dvdisaster.de";>dvdisaster.de</a>,
-<a href="http://dvdisaster.net";>dvdisaster.net</a>,
+<a
href="https://web.archive.org/web/20180428070843/http://dvdisaster.net";>dvdisaster.net</a>,
<a href="http://dvdisaster.org";>dvdisaster.org</a>.
<!-- Page footer -->
diff --git a/documentation/upstream-site/en/imprint.html
b/documentation/upstream-site/en/imprint.html
index d99324b..43641f2 100644
--- a/documentation/upstream-site/en/imprint.html
+++ b/documentation/upstream-site/en/imprint.html
@@ -63,7 +63,7 @@ Carsten Gn??rlich (see above for address).
This notice covers the web sites under the domains<br>
<a href="http://dvdisaster.com";>dvdisaster.com</a>,
<a href="http://dvdisaster.de";>dvdisaster.de</a>,
-<a href="http://dvdisaster.net";>dvdisaster.net</a>,
+<a
href="https://web.archive.org/web/20180428070843/http://dvdisaster.net";>dvdisaster.net</a>,
<a href="http://dvdisaster.org";>dvdisaster.org</a>.<br>
<!-- Page footer -->
diff --git a/documentation/user-manual/background.tex
b/documentation/user-manual/background.tex
index ba602ef..9aba84f 100644
--- a/documentation/user-manual/background.tex
+++ b/documentation/user-manual/background.tex
@@ -272,7 +272,7 @@ media with augmented images may not play correctly on all
units \\
\end{tabular}
\paragraph{Further reading.} The specification for the dvdisaster codecs
-has been specified in a separate document called
\href{http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}.
+has been specified in a separate document called
\href{https://web.archive.org/web/20180428070843/http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}.
Good knowledge in coding theory and programming is required.
\subsection{The linear reading strategy}
diff --git a/documentation/user-manual/download.tex
b/documentation/user-manual/download.tex
index 79df7be..a91a44a 100644
--- a/documentation/user-manual/download.tex
+++ b/documentation/user-manual/download.tex
@@ -15,7 +15,7 @@ the \href{http://www.gnu.org/licenses/gpl-3.0.txt}{GNU
General Public License v3
\bigskip
-The dvdisaster developer site (\url{http://dvdisaster.net}) contains
+The dvdisaster developer site
(\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net})
contains
the latest source code releases for the FreeBSD, GNU/Linux and NetBSD
operating systems. These are mostly aimed at maintainers of binary packages for
the beforementioned platforms. As an end user you might find it more convenient
@@ -133,6 +133,6 @@ We cannot accept them for various reasons.
\smallskip
dvdisaster releases are always published with cryptographic signatures
-and md5 checksums. See the \href{http://dvdisaster.net}{download site} for
examples.
+and md5 checksums. See the
\href{https://web.archive.org/web/20180428070843/http://dvdisaster.net}{download
site} for examples.
Be very cautious if signatures and checksums are missing, invalid or not
matching those published at the sites mentioned above.
++++++ 36-fix-parallelism.patch ++++++
From: Carlos Maddela <e7ap...@gmail.com>
Date: Fri, 1 Feb 2019 22:28:18 +1100
Subject: Fix parallel build of locale strings.
Description: Fix parallel build of locale strings.
Author: Carlos Maddela <e7ap...@gmail.com>
Forwarded: no
Last-Update: 2019-02-01
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
GNUmakefile.template | 1 +
locale/create-makefile | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/GNUmakefile.template b/GNUmakefile.template
index 4509c48..3aae04e 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -297,6 +297,7 @@ clean:
rm -f simple-md5sum
$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs
clean;
$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual
clean;
+ $(MAKE) --no-print-directory -C $(SRCDIR)/locale clean;
BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3`
arch: archclean time-stamp
diff --git a/locale/create-makefile b/locale/create-makefile
index 5ed31ed..83a4abf 100644
--- a/locale/create-makefile
+++ b/locale/create-makefile
@@ -30,15 +30,19 @@ locale: \$(LOCALEFILES)
# Create the locale files.
+messages.pot: \$(CFILES)
+ @cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_
-k_utf \$(CFILES_NP)
+
+clean:
+ rm -f messages.pot
+
EOF
for i in $prefixes; do
cat >> Makefile <<EOF
-$i.po: \$(CFILES)
+$i.po: messages.pot
@echo "Updating $i.po"
- @cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_
-k_utf \$(CFILES_NP)
@msgmerge -q -U --no-wrap --no-fuzzy-matching $i.po messages.pot
- @rm -f messages.pot
$i/LC_MESSAGES/dvdisaster.mo: $i.po
@echo "Updating $i.mo"
++++++ dvdisaster-g_strdup_printf.patch ++++++
From: Dave Plater <davejpla...@gmail.com>
Date: Sun 23 Jan 15:23:17 SAST 2022
Subject: Segmentation fault
References: boo#1195036
A malformed variable causes _strdup_printf() to crash.
Index: b/closure.c
===================================================================
--- a/closure.c 2022-01-23 09:43:50.258898446 +0200
+++ b/closure.c 2022-01-23 11:17:29.599712942 +0200
@@ -444,8 +444,8 @@ void InitClosure()
#define BITNESS_STRING ""
#endif
- Closure->versionString = g_strdup_printf("dvdisaster %s build %s, %s%s",
- Closure->cookedVersion, buildCount,
SYS_NAME, BITNESS_STRING);
+ Closure->versionString = g_strdup_printf("dvdisaster %s build 272, %s%s",
+ Closure->cookedVersion, SYS_NAME,
BITNESS_STRING);
/* Replace the dot with a locale-resistant separator */
++++++ dvdisaster-no-tex.patch ++++++
--- /var/tmp/diff_new_pack.lHj1E2/_old 2022-01-23 15:25:44.297192450 +0100
+++ /var/tmp/diff_new_pack.lHj1E2/_new 2022-01-23 15:25:44.301192423 +0100
@@ -1,7 +1,7 @@
-Index: dvdisaster-0.79.6/GNUmakefile.template
+Index: b/GNUmakefile.template
===================================================================
---- dvdisaster-0.79.6.orig/GNUmakefile.template 2020-06-05
14:14:02.994769910 +0200
-+++ dvdisaster-0.79.6/GNUmakefile.template 2020-06-05 14:45:33.864641460
+0200
+--- a/GNUmakefile.template 2022-01-23 08:15:40.094058505 +0200
++++ b/GNUmakefile.template 2022-01-23 08:16:08.915120040 +0200
@@ -67,19 +67,16 @@ OFILES = $(CFG_OFILES)
# Compilation related
######################################################################
@@ -26,7 +26,7 @@
$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster
@@ -140,13 +137,6 @@ untranslated:
simple-md5sum: md5.c
- $(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c
$(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
+ $(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(LDFLAGS)
$(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
-version.tex:
- @echo "\\newcommand{\\projectversion}{$(VERSION)}"
>$(SRCDIR)/documentation/config/version.tex
@@ -38,17 +38,8 @@
manualclean:
@echo "Removing temporary user manual files... "
$(MAKE) --no-print-directory -C documentation/user-manual clean
-@@ -223,7 +213,7 @@ show:
- .PHONY : install uninstall clean distclean arch
- .PHONY : srcdist
-
--install: dvdisaster manual
-+install: dvdisaster
- @echo "Installing package..."
- install -d $(BUILDROOT)$(BINDIR)
- install dvdisaster $(BUILDROOT)$(BINDIR)
@@ -300,7 +290,7 @@ clean:
- $(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual
clean;
+ $(MAKE) --no-print-directory -C $(SRCDIR)/locale clean;
BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3`
-arch: archclean time-stamp
