Control: tags -1 patch Hi,
On 12/11/16 11:41, Jaromír Mikeš wrote: > 2016-11-12 11:58 GMT+01:00 <treb...@tuxfamily.org>: > >> while you're working around the Hydrogen packaging, can I humbly >> ask you to have a look at this bug : >> https://bugs.debian.org/629107 ? >> >> There is willingness upstream (which I'm part of regarding the >> manual) to update and improve the bundled update manual and not >> having it displayed/accessible in the GUI is frustrating. >> >> As said in bug 629107, I've been looking at it but am not >> knowledgeable/competent to resolve it. Help here would be >> appreciated. > > Hi Olivier, > > I know about this bug and I am not ignoring it. > I already tried fix it in past without success :( > Hopefully some more skilled mate from team will give a hand with it. How about the attached patch? I think the original purpose of that code in debian/rules was to force the manual to always be rebuilt. Unfortunately it moves 'manual.docbook' out of the way (as if it was autogenerated) but it looks like this is the master manual which is directly edited. My alternate implementation simply touches the master manuals which should hopefully force everything to be rebuilt as well. Thanks, James
--- a/debian/rules +++ b/debian/rules @@ -35,23 +35,9 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^.*\.(flac|png|qm)|debian/(changelog|copyrigh # according to upstream INSTALL.txt this avoids potential clash with Qt3 export QTDIR=/usr/share/qt4 -# Put aside upstream-shipped autogenerated files during build -upstreamtmpfiles = $(wildcard data/doc/*.html data/doc/*.docbook) -upstreamtmpfiles_ = $(patsubst %.upstream,%,$(wildcard data/doc/*.html.upstream data/doc/*.docbook.upstream)) -pre-build:: debian/stamp-upstreamtmpstuff -debian/stamp-upstreamtmpstuff: debian/stamp-copyright-check - for file in $(upstreamtmpfiles); do \ - [ ! -e $$file ] || [ -e $$file.upstream ] || mv $$file $$file.upstream; \ - done - touch $@ -clean:: - for file in $(upstreamtmpfiles_); do \ - [ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \ - done - rm -f debian/stamp-upstreamtmpstuff - common-build-indep:: debian/docs.stamp debian/docs.stamp: + touch data/doc/manual.docbook data/doc/tutorial.docbook $(MAKE) -C data/doc touch $@ clean::
signature.asc
Description: OpenPGP digital signature
