diff --git a/debian/changelog b/debian/changelog index f618a5e..d931199 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +dvdisaster (0.79.5-4) UNRELEASED; urgency=medium + + * Team upload. + * Use complete Debian revision number as build number, instead of + just the numeric part. + * Re-implement scripts/time-stamper.bash without direct calls to + dpkg-parsechangelog. + + -- Carlos Maddela Mon, 14 Aug 2017 23:04:38 +1000 + dvdisaster (0.79.5-3) unstable; urgency=medium * Team upload. diff --git a/debian/patches/14-make-builds-reproducible.patch b/debian/patches/14-make-builds-reproducible.patch index d93e63e..b448716 100644 --- a/debian/patches/14-make-builds-reproducible.patch +++ b/debian/patches/14-make-builds-reproducible.patch @@ -7,15 +7,111 @@ Description: Make builds reproducible. so that we can make reproducible binaries. Author: Carlos Maddela Forwarded: not-needed -Last-Update: 2016-12-19 +Last-Update: 2017-08-14 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- - scripts/time-stamper.bash | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + build.c | 2 +- + closure.c | 2 +- + dvdisaster.h | 2 +- + locale/cs.po | 4 ++-- + locale/pt_BR.po | 4 ++-- + locale/ru.po | 4 ++-- + scripts/time-stamper.bash | 8 ++++---- + 7 files changed, 13 insertions(+), 13 deletions(-) +diff --git a/build.c b/build.c +index 1666795..05a3b24 100644 +--- a/build.c ++++ b/build.c +@@ -25,4 +25,4 @@ + /* build is incremented at each make; + make recompile of dependent file as fast as possible */ + +-int buildCount = BUILD; ++const char *const buildCount = BUILD; +diff --git a/closure.c b/closure.c +index 7568cba..51e91a2 100644 +--- a/closure.c ++++ b/closure.c +@@ -433,7 +433,7 @@ void InitClosure() + #define BITNESS_STRING "" + #endif + +- Closure->versionString = g_strdup_printf("dvdisaster %s build %d, %s%s", ++ Closure->versionString = g_strdup_printf("dvdisaster %s build %s, %s%s", + Closure->cookedVersion, buildCount, SYS_NAME, BITNESS_STRING); + + /* Replace the dot with a locale-resistant separator */ +diff --git a/dvdisaster.h b/dvdisaster.h +index db2031e..bcfd4f5 100644 +--- a/dvdisaster.h ++++ b/dvdisaster.h +@@ -450,7 +450,7 @@ void FreeBitmap(Bitmap*); + *** build.h + ***/ + +-int buildCount; ++extern const char *const buildCount; + + /*** + *** cacheprobe.h +diff --git a/locale/cs.po b/locale/cs.po +index ed1fc65..24b1e7c 100644 +--- a/locale/cs.po ++++ b/locale/cs.po +@@ -6476,11 +6476,11 @@ msgstr "Novinky v této verzi:" + + #~ msgid "" + #~ "\n" +-#~ "dvdisaster version %s build %d\n" ++#~ "dvdisaster version %s build %s\n" + #~ "\n" + #~ msgstr "" + #~ "\n" +-#~ "dvdisaster verze %s sestavení %d\n" ++#~ "dvdisaster verze %s sestavení %s\n" + #~ "\n" + + #~ msgid "--prefetch-sectors must be in range 32...8096" +diff --git a/locale/pt_BR.po b/locale/pt_BR.po +index 04b33b5..012ce9e 100644 +--- a/locale/pt_BR.po ++++ b/locale/pt_BR.po +@@ -6200,11 +6200,11 @@ msgstr "Novidades dessa versão:" + + #~ msgid "" + #~ "\n" +-#~ "dvdisaster version %s build %d\n" ++#~ "dvdisaster version %s build %s\n" + #~ "\n" + #~ msgstr "" + #~ "\n" +-#~ "dvdisaster, versão %s build %d\n" ++#~ "dvdisaster, versão %s build %s\n" + + #~ msgid "--cache-size maximum is 8192MiB." + #~ msgstr "--cache-size máximo é 8192MiB." +diff --git a/locale/ru.po b/locale/ru.po +index 6cd3789..912d6fb 100644 +--- a/locale/ru.po ++++ b/locale/ru.po +@@ -6215,11 +6215,11 @@ msgstr "Новое в этой версии:" + + #~ msgid "" + #~ "\n" +-#~ "dvdisaster version %s build %d\n" ++#~ "dvdisaster version %s build %s\n" + #~ "\n" + #~ msgstr "" + #~ "\n" +-#~ "dvdisaster версия %s сборка %d\n" ++#~ "dvdisaster версия %s сборка %s\n" + #~ "\n" + + #~ msgid "--cache-size maximum is 8192MiB." diff --git a/scripts/time-stamper.bash b/scripts/time-stamper.bash -index fd28794..60fe91a 100755 +index fd28794..4ec3e60 100755 --- a/scripts/time-stamper.bash +++ b/scripts/time-stamper.bash @@ -1,7 +1,7 @@ @@ -23,9 +119,10 @@ index fd28794..60fe91a 100755 -build=$(grep BUILD $1 | cut -d\ -f3) -build=$((build+1)) -+# Use Debian changelog details to derive build number and date. -+build=$(dpkg-parsechangelog -S Version | sed 's/.*-\([0-9]\+\).*/\1/') - echo "#define BUILD $build" >$1 +-echo "#define BUILD $build" >$1 -date=$(date +"%d.%m.%y (%A, %H:%M)") -+date=$(date --date="$(dpkg-parsechangelog -S Date)" +"%d.%m.%y (%A, %H:%M)") ++# Use Debian changelog details to derive build number and date. ++build=$(echo "${DEB_VERSION}" | cut -f2 -d-) ++echo "#define BUILD \"$build\"" >$1 ++date=$(date --date="@${SOURCE_DATE_EPOCH}" --utc +"%d.%m.%y (%A, %H:%M)") echo "#define BDATE \"$date\"" >>$1 diff --git a/debian/patches/17-fix-all-but-deprecated-api-warnings.patch b/debian/patches/17-fix-all-but-deprecated-api-warnings.patch index 01ababb..312c5ee 100644 --- a/debian/patches/17-fix-all-but-deprecated-api-warnings.patch +++ b/debian/patches/17-fix-all-but-deprecated-api-warnings.patch @@ -22,7 +22,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ 9 files changed, 38 insertions(+), 32 deletions(-) diff --git a/closure.c b/closure.c -index 7568cba..0e2f889 100644 +index 51e91a2..40bb225 100644 --- a/closure.c +++ b/closure.c @@ -196,7 +196,7 @@ void ReadDotfile() diff --git a/debian/patches/27-allow-opening-in-browser-again.patch b/debian/patches/27-allow-opening-in-browser-again.patch index d61a01b..fddee5f 100644 --- a/debian/patches/27-allow-opening-in-browser-again.patch +++ b/debian/patches/27-allow-opening-in-browser-again.patch @@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ create mode 100644 show-html.c diff --git a/closure.c b/closure.c -index 0e2f889..632c103 100644 +index 40bb225..f408f7a 100644 --- a/closure.c +++ b/closure.c @@ -467,6 +467,7 @@ void InitClosure() @@ -37,7 +37,7 @@ index 0e2f889..632c103 100644 cond_free(Closure->simulateCD); cond_free(Closure->dDumpDir); diff --git a/dvdisaster.h b/dvdisaster.h -index db2031e..22eab5a 100644 +index bcfd4f5..ae874ae 100644 --- a/dvdisaster.h +++ b/dvdisaster.h @@ -213,6 +213,7 @@ typedef struct _GlobalClosure diff --git a/debian/patches/29-fix-more-typos.patch b/debian/patches/29-fix-more-typos.patch index cb083ec..e803d36 100644 --- a/debian/patches/29-fix-more-typos.patch +++ b/debian/patches/29-fix-more-typos.patch @@ -40,7 +40,7 @@ index 51ff827..80fe9d3 100644 \bigskip diff --git a/locale/cs.po b/locale/cs.po -index ed1fc65..9010d21 100644 +index 24b1e7c..497a4a9 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -1903,7 +1903,7 @@ msgid "Media ejection" @@ -79,7 +79,7 @@ index a074339..000d5c3 100644 #: preferences.c:2091 diff --git a/locale/pt_BR.po b/locale/pt_BR.po -index 04b33b5..00bcaee 100644 +index 012ce9e..4624071 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1839,7 +1839,7 @@ msgid "Media ejection" @@ -92,7 +92,7 @@ index 04b33b5..00bcaee 100644 #: preferences.c:2091 diff --git a/locale/ru.po b/locale/ru.po -index 6cd3789..1c677d4 100644 +index 912d6fb..66fc036 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1841,7 +1841,7 @@ msgid "Media ejection" diff --git a/debian/patches/31-improve-hurd-and-kfreebsd-support.patch b/debian/patches/31-improve-hurd-and-kfreebsd-support.patch index a62d867..84a883f 100644 --- a/debian/patches/31-improve-hurd-and-kfreebsd-support.patch +++ b/debian/patches/31-improve-hurd-and-kfreebsd-support.patch @@ -75,7 +75,7 @@ index 60c55f9..f30f5d3 100644 diff --git a/closure.c b/closure.c -index 632c103..7c8b3bd 100644 +index f408f7a..f4b1893 100644 --- a/closure.c +++ b/closure.c @@ -50,7 +50,8 @@ static void get_base_dirs() diff --git a/debian/rules b/debian/rules index db7de76..8181a4c 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) -Wall -Wno-deprecated-declarations export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed include /usr/share/dpkg/pkg-info.mk +export DEB_VERSION export FORCE_SOURCE_DATE = 1 MUTABLE_FILES := build.h $(wildcard locale/*.po) \