Merge branch 'debian/unstable' into debian/experimental
This commit is contained in:
Carlos Maddela
20
debian/changelog
vendored
20
debian/changelog
vendored
@@ -20,6 +20,26 @@ dvdisaster (0.79.6-1) experimental; urgency=medium
|
||||
|
||||
-- Carlos Maddela <e7appew@gmail.com> Thu, 21 Dec 2017 05:51:54 +1100
|
||||
|
||||
dvdisaster (0.79.5-7) unstable; urgency=medium
|
||||
|
||||
* Add debian/gbp.conf to conform with DEP14 conventions.
|
||||
* Build with Debhelper compat level 12.
|
||||
* Set "Rules-Requires-Root: no".
|
||||
* Simplify process by which mutable files are backed up and restored.
|
||||
* Build as verbosely as possible.
|
||||
* Fix location of manual.
|
||||
* Fix dh_auto_build overrides to take advantage of parallel builds.
|
||||
* Fix format security compilation warning in GCC-8.
|
||||
* 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.
|
||||
* Add support for nodoc build profile.
|
||||
* Add more details to upstream metadata.
|
||||
* Indicate compliance with Debian Policy 4.3.0.
|
||||
|
||||
-- Carlos Maddela <e7appew@gmail.com> Thu, 31 Jan 2019 07:10:46 +1100
|
||||
|
||||
dvdisaster (0.79.5-6) unstable; urgency=medium
|
||||
|
||||
[ TANIGUCHI Takaki ]
|
||||
|
||||
2
debian/compat
vendored
2
debian/compat
vendored
@@ -1 +1 @@
|
||||
11
|
||||
12
|
||||
|
||||
14
debian/control
vendored
14
debian/control
vendored
@@ -5,20 +5,21 @@ Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org
|
||||
Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
|
||||
Rogério Brito <rbrito@ime.usp.br>,
|
||||
Carlos Maddela <e7appew@gmail.com>
|
||||
Build-Depends: debhelper (>= 11),
|
||||
Build-Depends: debhelper (>= 12),
|
||||
gettext,
|
||||
libbz2-dev,
|
||||
libcam-dev [kfreebsd-any],
|
||||
libgtk2.0-dev,
|
||||
libpng-dev,
|
||||
pkg-config
|
||||
Build-Depends-Indep: texlive-fonts-recommended,
|
||||
texlive-latex-base,
|
||||
texlive-latex-extra
|
||||
Standards-Version: 4.1.4
|
||||
Build-Depends-Indep: texlive-fonts-recommended <!nodoc>,
|
||||
texlive-latex-base <!nodoc>,
|
||||
texlive-latex-extra <!nodoc>
|
||||
Standards-Version: 4.3.0
|
||||
Vcs-Browser: https://salsa.debian.org/optical-media-team/dvdisaster
|
||||
Vcs-Git: https://salsa.debian.org/optical-media-team/dvdisaster.git
|
||||
Homepage: http://dvdisaster.net/
|
||||
Homepage: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: dvdisaster
|
||||
Architecture: any
|
||||
@@ -30,6 +31,7 @@ Description: data loss/scratch/aging protection for CD/DVD media
|
||||
used to recover unreadable sectors if the disc becomes damaged at a later time.
|
||||
|
||||
Package: dvdisaster-doc
|
||||
Build-Profiles: <!nodoc>
|
||||
Section: doc
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
|
||||
2
debian/copyright
vendored
2
debian/copyright
vendored
@@ -1,7 +1,7 @@
|
||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Contact: Carsten Gnörlich <carsten@dvdisaster.org>
|
||||
Upstream-Name: dvdisaster
|
||||
Source: http://dvdisaster.net/
|
||||
Source: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
|
||||
|
||||
Files: *
|
||||
Copyright: 2004–2015, Carsten Gnörlich <carsten@dvdisaster.org>
|
||||
|
||||
5
debian/gbp.conf
vendored
Normal file
5
debian/gbp.conf
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
[DEFAULT]
|
||||
debian-branch = debian/unstable
|
||||
upstream-branch = upstream/latest
|
||||
sign-tags = True
|
||||
pristine-tar = True
|
||||
27
debian/patches/34-gcc8-format-security.patch
vendored
Normal file
27
debian/patches/34-gcc8-format-security.patch
vendored
Normal file
@@ -0,0 +1,27 @@
|
||||
From: Carlos Maddela <e7appew@gmail.com>
|
||||
Date: Thu, 31 Jan 2019 05:10:21 +1100
|
||||
Subject: Fix format security warning in GCC-8.
|
||||
|
||||
Description: Fix format security warning in GCC-8.
|
||||
Author: Carlos Maddela <e7appew@gmail.com>
|
||||
Forwarded: no
|
||||
Last-Update: 2019-01-31
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
---
|
||||
udf.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/udf.c b/udf.c
|
||||
index ef02c6d..01a47a3 100644
|
||||
--- a/udf.c
|
||||
+++ b/udf.c
|
||||
@@ -794,7 +794,7 @@ void FreeIsoHeader(IsoHeader *ih)
|
||||
|
||||
void AddFile(IsoHeader *ih, char *name, guint64 size)
|
||||
{ static int n;
|
||||
- char iso[20], joliet[strlen(name)+3];
|
||||
+ char iso[22], joliet[strlen(name)+3];
|
||||
|
||||
n++;
|
||||
sprintf(iso,"RAN_%04d.DAT;1", n);
|
||||
108
debian/patches/35-archived-homepage.patch
vendored
Normal file
108
debian/patches/35-archived-homepage.patch
vendored
Normal file
@@ -0,0 +1,108 @@
|
||||
From: Carlos Maddela <e7appew@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 <e7appew@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 c026772..073bf28 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 d291df1..cb459bb 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 b2d3e40..4db75f4 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.
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@@ -25,3 +25,5 @@
|
||||
31-improve-hurd-and-kfreebsd-support.patch
|
||||
32-display-compilation-commands.patch
|
||||
33-honour-LDFLAGS.patch
|
||||
34-gcc8-format-security.patch
|
||||
35-archived-homepage.patch
|
||||
|
||||
30
debian/rules
vendored
30
debian/rules
vendored
@@ -1,5 +1,7 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
export DH_VERBOSE = 1
|
||||
|
||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
DPKG_EXPORT_BUILDFLAGS = 1
|
||||
include /usr/share/dpkg/buildflags.mk
|
||||
@@ -13,6 +15,7 @@ export FORCE_SOURCE_DATE = 1
|
||||
MUTABLE_FILES := build.h $(wildcard locale/*.po) \
|
||||
documentation/config/version.tex \
|
||||
documentation/user-manual/manual.pdf
|
||||
BACKUP_TAR_FILE := debian/backup.tar
|
||||
|
||||
BUILDROOT := $(CURDIR)/debian/tmp
|
||||
ICONS := $(wildcard contrib/dvdisaster*.png)
|
||||
@@ -21,29 +24,32 @@ ICON_SIZES := $(patsubst contrib/dvdisaster%.png,%,$(ICONS))
|
||||
%:
|
||||
dh $@
|
||||
|
||||
override_dh_update_autotools_config:
|
||||
dh_update_autotools_config
|
||||
test -f $(BACKUP_TAR_FILE) || \
|
||||
tar cpf $(BACKUP_TAR_FILE) $(MUTABLE_FILES)
|
||||
|
||||
override_dh_clean:
|
||||
dh_clean
|
||||
test ! -f $(BACKUP_TAR_FILE) || \
|
||||
tar xpf $(BACKUP_TAR_FILE) && rm -f $(BACKUP_TAR_FILE)
|
||||
|
||||
override_dh_auto_configure:
|
||||
for f in $(MUTABLE_FILES); do \
|
||||
cp -an $$f $$f.orig; \
|
||||
done
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=share/man \
|
||||
--localedir=share/locale \
|
||||
--docdir=share/doc \
|
||||
--docsubdir=dvdisaster-doc \
|
||||
--docsubdir=dvdisaster \
|
||||
--with-embedded-src-path=no
|
||||
|
||||
override_dh_clean:
|
||||
dh_clean -X.orig
|
||||
for f in $(MUTABLE_FILES); do \
|
||||
test ! -f $$f.orig || mv -f $$f.orig $$f; \
|
||||
done
|
||||
|
||||
override_dh_auto_build-arch:
|
||||
make all
|
||||
dh_auto_build -a -- all
|
||||
|
||||
override_dh_auto_build-indep:
|
||||
make manual
|
||||
dh_auto_build -i \
|
||||
$(if $(findstring nodoc,$(DEB_BUILD_OPTIONS)),--no-act) \
|
||||
-- manual
|
||||
|
||||
override_dh_auto_install-arch:
|
||||
dh_auto_install -a -- BUILDROOT=$(BUILDROOT)
|
||||
|
||||
4
debian/upstream/metadata
vendored
4
debian/upstream/metadata
vendored
@@ -2,5 +2,7 @@
|
||||
---
|
||||
# https://wiki.debian.org/UpstreamMetadata
|
||||
Contact: Carsten Gnörlich <carsten@dvdisaster.org>
|
||||
Documentation: https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/misc.html#manual
|
||||
Homepage: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
|
||||
Name: dvdisaster
|
||||
Homepage: http://dvdisaster.net/
|
||||
Security-Contact: Carsten Gnörlich <carsten@dvdisaster.org>
|
||||
|
||||
2
debian/watch
vendored
2
debian/watch
vendored
@@ -1,4 +1,4 @@
|
||||
version=3
|
||||
opts="pgpsigurlmangle=s/$/.gpg/" \
|
||||
http://dvdisaster.net/en/index.html \
|
||||
https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/index.html \
|
||||
(?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate
|
||||
|
||||
Reference in New Issue
Block a user