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

Bug#844232: daisy-player: man page title is wrong if build directory isn't named ${package}-${version}



Source: daisy-player
Version: 10.3-2
Severity: minor
Tags: upstream patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: buildpath

Dear Maintainer,

Whilst working on the Reproducible Builds effort [0], we noticed
that daisy-player 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..94c89c2
--- /dev/null
+++ b/debian/patches/build-path-agnostic.diff
@@ -0,0 +1,16 @@
+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
+
+--- daisy-player-10.3.orig/man/Makefile.am
++++ daisy-player-10.3/man/Makefile.am
+@@ -3,7 +3,7 @@ man_MANS = daisy-player.1
+ all: daisy-player
+ 
+ daisy-player:
+-	@which txt2man > /dev/null && txt2man -p ${srcdir}/../doc/$@.txt > ${srcdir}/$@.1
++	@which txt2man > /dev/null && txt2man -t $@ -s 1 -v "Linux Reference Manual" -r $(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
]]]


Reply to: