From bee8419a4ae56b0e54c7d3471eaa30048e811710 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Thu, 31 Jan 2019 08:55:53 +1100 Subject: [PATCH] Prepare changelog and rebase patches. Gbp-Dch: Ignore --- debian/changelog | 6 ++++++ debian/patches/34-gcc8-format-security.patch | 2 +- debian/patches/35-archived-homepage.patch | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a13b5f..40d1aaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdisaster (0.79.6-3) UNRELEASED; urgency=medium + + * Merge changes from 0.79.5-7. + + -- Carlos Maddela Thu, 31 Jan 2019 08:52:02 +1100 + dvdisaster (0.79.6-2) experimental; urgency=medium [ TANIGUCHI Takaki ] diff --git a/debian/patches/34-gcc8-format-security.patch b/debian/patches/34-gcc8-format-security.patch index 5cb504c..7e7eccc 100644 --- a/debian/patches/34-gcc8-format-security.patch +++ b/debian/patches/34-gcc8-format-security.patch @@ -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/udf.c b/udf.c -index ef02c6d..01a47a3 100644 +index 174fa36..9e345c2 100644 --- a/udf.c +++ b/udf.c @@ -794,7 +794,7 @@ void FreeIsoHeader(IsoHeader *ih) diff --git a/debian/patches/35-archived-homepage.patch b/debian/patches/35-archived-homepage.patch index 0ba77a5..370a1a3 100644 --- a/debian/patches/35-archived-homepage.patch +++ b/debian/patches/35-archived-homepage.patch @@ -34,7 +34,7 @@ index a8c0d90..ca7f71f 100644 over file level approaches. diff --git a/documentation/codec-specs/rs02.tex b/documentation/codec-specs/rs02.tex -index c026772..073bf28 100644 +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. @@ -47,7 +47,7 @@ index c026772..073bf28 100644 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 +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). @@ -60,7 +60,7 @@ index d291df1..cb459bb 100644 diff --git a/documentation/upstream-site/en/imprint.html b/documentation/upstream-site/en/imprint.html -index b2d3e40..4db75f4 100644 +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).