[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#844228: ebook-speaker: man page title is wrong if build directory isn't named ${package}-${version}



Is changed in the next release of eBook-speaker.

   Thanks.

On Sun, Nov 13, 2016 at 04:14:13PM +0000, Daniel Shahaf wrote:
> Source: ebook-speaker
> Version: 4.1.0-1                              
> Severity: minor
> Tags: patch upstream
> User: reproducible-builds@lists.alioth.debian.org
> Usertags: buildpath
>
> Dear Maintainer,
>
> Whilst working on the Reproducible Builds effort [0], we noticed
> that ebook-speaker could not be built reproducibly, due to `txt2man -p`
> parsing the last component of the build directory.
>
> Patch attached.
>
>  [0] https://reproducible-builds.org/
>
> Cheers,
>
> Daniel
>
> P.S. The patch as written is upstreamable.  For Debian it might make
> sense to use «$$(cd .. && dpkg-parsechangelog -SVersion)» so as to have
> a more detailed version number.
>
>
> [[[
> diff --git a/debian/patches/build-path-agnostic.diff b/debian/patches/build-path-agnostic.diff
> new file mode 100644
> index 0000000..5d547f3
> --- /dev/null
> +++ b/debian/patches/build-path-agnostic.diff
> @@ -0,0 +1,19 @@
> +Description: Make the build reproducible
> +  Avoid 'txt2man -p' because it parses the build path.
> +Bug-Debian: https://bugs.debian.org/-1
> +Last-Update: 2016-11-13
> +
> +--- a/man/Makefile.am
> ++++ b/man/Makefile.am
> +@@ -3,7 +3,10 @@
> + all: eBook-speaker
> +
> + eBook-speaker:
> +-	@which txt2man > /dev/null && txt2man -p ${srcdir}/../doc/$@.txt > \
> ++	@which txt2man > /dev/null && txt2man \
> ++		-t 'eBook-speaker' -s 1 -v "Linux Reference Manual" \
> ++		-r "ebook-speaker-$(VERSION)" \
> ++		${srcdir}/../doc/$@.txt > \
> + 	       ${srcdir}/$@.1
> + 	@file ${srcdir}/$@.1 && \
> + 	  man2html ${srcdir}/$@.1 | tail -n +3 > ${srcdir}/../doc/$@.html
> diff --git a/debian/patches/series b/debian/patches/series
> new file mode 100644
> index 0000000..222072b
> --- /dev/null
> +++ b/debian/patches/series
> @@ -0,0 +1 @@
> +build-path-agnostic.diff
> ]]]

--

   Sent from Ubuntu 16.10

   -------------------------------
   Jos Lemmens
   The Netherlands
   E-mail: jos@jlemmens.nl
   Homepage: www.jlemmens.nl


Reply to: