From 72f70e6488203c59c3e293b8751938d05de4dc01 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 04:01:04 +1100 Subject: [PATCH 01/13] Add debian/gbp.conf to conform with DEP14 conventions. --- debian/changelog | 6 ++++++ debian/gbp.conf | 5 +++++ 2 files changed, 11 insertions(+) create mode 100644 debian/gbp.conf diff --git a/debian/changelog b/debian/changelog index e56690f..e6c7a1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdisaster (0.79.5-7) UNRELEASED; urgency=medium + + * Add debian/gbp.conf to conform with DEP14 conventions. + + -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 + dvdisaster (0.79.5-6) unstable; urgency=medium [ TANIGUCHI Takaki ] diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..4a1d6c6 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian/unstable +upstream-branch = upstream/latest +sign-tags = True +pristine-tar = True From 354e8a500af7853f3e8c35633294a38cd09c1159 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 04:16:12 +1100 Subject: [PATCH 02/13] Build with Debhelper compat level 12. --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6c7a1f..d8c2b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * Add debian/gbp.conf to conform with DEP14 conventions. + * Build with Debhelper compat level 12. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/compat b/debian/compat index b4de394..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/control b/debian/control index 19193e5..cc125b4 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Optical Media Tools Team , Rogério Brito , Carlos Maddela -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper (>= 12), gettext, libbz2-dev, libcam-dev [kfreebsd-any], From 3693b4e86efb5ca1fb7531ef8281012ec2aade00 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 04:25:17 +1100 Subject: [PATCH 03/13] Set "Rules-Requires-Root: no". --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d8c2b1a..590b75c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * Add debian/gbp.conf to conform with DEP14 conventions. * Build with Debhelper compat level 12. + * Set "Rules-Requires-Root: no". -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/control b/debian/control index cc125b4..7204333 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Standards-Version: 4.1.4 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/ +Rules-Requires-Root: no Package: dvdisaster Architecture: any From dc27f5e3faca785e4d4509bf4c5166e61b52f0b6 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 04:30:57 +1100 Subject: [PATCH 04/13] Simplify process by which mutable files are backed up and restored. --- debian/changelog | 1 + debian/rules | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 590b75c..754e877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dvdisaster (0.79.5-7) UNRELEASED; 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/rules b/debian/rules index 53a47e0..746eb40 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,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,10 +22,17 @@ 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 \ @@ -33,12 +41,6 @@ override_dh_auto_configure: --docsubdir=dvdisaster-doc \ --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 From e4f86281b16e6b5239752b7fe81bee42cbc05766 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 04:34:03 +1100 Subject: [PATCH 05/13] Build as verbosely as possible. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 754e877..d660267 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/rules b/debian/rules index 746eb40..705e958 100755 --- a/debian/rules +++ b/debian/rules @@ -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 From b24ad062377bc7137cc036500d3517ac96018543 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 04:51:51 +1100 Subject: [PATCH 06/13] Fix location of manual. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d660267..e4e5365 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/rules b/debian/rules index 705e958..33537cb 100755 --- a/debian/rules +++ b/debian/rules @@ -40,7 +40,7 @@ override_dh_auto_configure: --mandir=share/man \ --localedir=share/locale \ --docdir=share/doc \ - --docsubdir=dvdisaster-doc \ + --docsubdir=dvdisaster \ --with-embedded-src-path=no override_dh_auto_build-arch: From b289d165dbd6b472babb63e6c09d455616007250 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 05:06:04 +1100 Subject: [PATCH 07/13] Fix dh_auto_build overrides to take advantage of parallel builds. --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4e5365..dc771b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/rules b/debian/rules index 33537cb..8ec46ca 100755 --- a/debian/rules +++ b/debian/rules @@ -44,10 +44,10 @@ override_dh_auto_configure: --with-embedded-src-path=no override_dh_auto_build-arch: - make all + dh_auto_build -a -- all override_dh_auto_build-indep: - make manual + dh_auto_build -i -- manual override_dh_auto_install-arch: dh_auto_install -a -- BUILDROOT=$(BUILDROOT) From 9fc9a741717ec4df7a47dfdce746c1670739af05 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 05:21:34 +1100 Subject: [PATCH 08/13] Fix format security compilation warning in GCC-8. --- debian/changelog | 1 + debian/patches/34-gcc8-format-security.patch | 27 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/34-gcc8-format-security.patch diff --git a/debian/changelog b/debian/changelog index dc771b7..1ba903b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/patches/34-gcc8-format-security.patch b/debian/patches/34-gcc8-format-security.patch new file mode 100644 index 0000000..5cb504c --- /dev/null +++ b/debian/patches/34-gcc8-format-security.patch @@ -0,0 +1,27 @@ +From: Carlos Maddela +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 +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); diff --git a/debian/patches/series b/debian/patches/series index 1fa90f6..e37cd26 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ 31-improve-hurd-and-kfreebsd-support.patch 32-display-compilation-commands.patch 33-honour-LDFLAGS.patch +34-gcc8-format-security.patch From b7344e4855717ef3c9dd3b50e1afa7d9b6ab7104 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 05:46:07 +1100 Subject: [PATCH 09/13] 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. --- debian/changelog | 4 + debian/control | 2 +- debian/copyright | 2 +- debian/patches/35-archived-homepage.patch | 108 ++++++++++++++++++++++ debian/patches/series | 1 + debian/upstream/metadata | 2 +- debian/watch | 2 +- 7 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 debian/patches/35-archived-homepage.patch diff --git a/debian/changelog b/debian/changelog index 1ba903b..5fa10f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/control b/debian/control index 7204333..3fe7431 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends-Indep: texlive-fonts-recommended, Standards-Version: 4.1.4 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 diff --git a/debian/copyright b/debian/copyright index 00b4268..c2184a5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: Carsten Gnörlich Upstream-Name: dvdisaster -Source: http://dvdisaster.net/ +Source: https://web.archive.org/web/20180428070843/http://dvdisaster.net/ Files: * Copyright: 2004–2015, Carsten Gnörlich diff --git a/debian/patches/35-archived-homepage.patch b/debian/patches/35-archived-homepage.patch new file mode 100644 index 0000000..0ba77a5 --- /dev/null +++ b/debian/patches/35-archived-homepage.patch @@ -0,0 +1,108 @@ +From: Carlos Maddela +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 +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
+ dvdisaster.com,   + dvdisaster.de,   +-dvdisaster.net,   ++dvdisaster.net,   + dvdisaster.org. + + +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
+ dvdisaster.com,   + dvdisaster.de,   +-dvdisaster.net,   ++dvdisaster.net,   + dvdisaster.org.
+ + +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. diff --git a/debian/patches/series b/debian/patches/series index e37cd26..ba10600 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,3 +26,4 @@ 32-display-compilation-commands.patch 33-honour-LDFLAGS.patch 34-gcc8-format-security.patch +35-archived-homepage.patch diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 6773fc9..d4612dc 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -3,4 +3,4 @@ # https://wiki.debian.org/UpstreamMetadata Contact: Carsten Gnörlich Name: dvdisaster -Homepage: http://dvdisaster.net/ +Homepage: https://web.archive.org/web/20180428070843/http://dvdisaster.net/ diff --git a/debian/watch b/debian/watch index 39ff875..a55f045 100644 --- a/debian/watch +++ b/debian/watch @@ -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 From 44bc4b1916ae2c688710751d06047e4460a1f125 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 06:48:26 +1100 Subject: [PATCH 10/13] Add support for nodoc build profile. --- debian/changelog | 1 + debian/control | 7 ++++--- debian/rules | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5fa10f2..29dd973 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/control b/debian/control index 3fe7431..7ad0e02 100644 --- a/debian/control +++ b/debian/control @@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 12), libgtk2.0-dev, libpng-dev, pkg-config -Build-Depends-Indep: texlive-fonts-recommended, - texlive-latex-base, - texlive-latex-extra +Build-Depends-Indep: texlive-fonts-recommended , + texlive-latex-base , + texlive-latex-extra Standards-Version: 4.1.4 Vcs-Browser: https://salsa.debian.org/optical-media-team/dvdisaster Vcs-Git: https://salsa.debian.org/optical-media-team/dvdisaster.git @@ -31,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: Section: doc Architecture: all Multi-Arch: foreign diff --git a/debian/rules b/debian/rules index 8ec46ca..40e13a9 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,9 @@ override_dh_auto_build-arch: dh_auto_build -a -- all override_dh_auto_build-indep: - dh_auto_build -i -- 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) From 86207af360e84e08bcc62be07ed821ec7e2c222d Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 07:06:20 +1100 Subject: [PATCH 11/13] Add more details to upstream metadata. --- debian/changelog | 1 + debian/upstream/metadata | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 29dd973..43ad4e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium 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. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/upstream/metadata b/debian/upstream/metadata index d4612dc..c9203a8 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -2,5 +2,7 @@ --- # https://wiki.debian.org/UpstreamMetadata Contact: Carsten Gnörlich -Name: dvdisaster +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 +Security-Contact: Carsten Gnörlich From ddaf4cfc233930ce91370c7008c253e314c01de2 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 07:09:23 +1100 Subject: [PATCH 12/13] Indicate compliance with Debian Policy 4.3.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 43ad4e4..0315b3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium 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 Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/control b/debian/control index 7ad0e02..282c2ca 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 12), Build-Depends-Indep: texlive-fonts-recommended , texlive-latex-base , texlive-latex-extra -Standards-Version: 4.1.4 +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: https://web.archive.org/web/20180428070843/http://dvdisaster.net/ From 4b4495b6933cf20146c70ba7f2a912029027e795 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 07:10:55 +1100 Subject: [PATCH 13/13] Release version 0.79.5-7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0315b3b..c7b4228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dvdisaster (0.79.5-7) UNRELEASED; urgency=medium +dvdisaster (0.79.5-7) unstable; urgency=medium * Add debian/gbp.conf to conform with DEP14 conventions. * Build with Debhelper compat level 12. @@ -16,7 +16,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * Add more details to upstream metadata. * Indicate compliance with Debian Policy 4.3.0. - -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 + -- Carlos Maddela Thu, 31 Jan 2019 07:10:46 +1100 dvdisaster (0.79.5-6) unstable; urgency=medium