Hi Andreas,
On 10-12-13 08:50, Andreas Tille wrote:
> Hi Lennart,
>
> On Mon, Dec 09, 2013 at 11:39:48PM +0100, L.C. Karssen wrote:
>> Ah, I see:
>> $ git tag
>> upstream/0.4.1
>> So git push --tags will do the job.
>
> Yes.
Done.
>
>>>> 2) W: probabel: package-contains-upstream-install-documentation
>>>> usr/share/doc/probabel/INSTALL.gz
>>>> What is the best way to deal with this? Remove the INSTALL file in
>>>> debian/rules? Or simply remove it from the directory structure?
>>>
>>> Remove it in debian/rules. It is just part of the upstream tarball and
>>> there is no point in fiddling around with this.
>>
>> I've tried to find out how to fix this in debian/rules, but I'm not sure
>> how to do it.
>> I tried adding the following to debian/rules, but then only INSTALL.gz
>> will not be installed, COPYING.gz and LICENSE are still there:
>>
>> override_dh_installdocs:
>> dh_installdocs -XINSTALL -XCOPYING -XLICENSE
>
> I think the problem is that these docs are not installed by dh_installdocs
> but rather by dh_install. Looking into the log file (*.build) I see:
>
> dh_auto_install -O--parallel
> ...
> Making install in doc
> make[2]: Entering directory `/tmp/buildd/probabel-0.4.1/doc'
> make[3]: Entering directory `/tmp/buildd/probabel-0.4.1/doc'
> make[3]: Nothing to be done for `install-exec-am'.
> /bin/mkdir -p '/tmp/buildd/probabel-0.4.1/debian/probabel/usr/share/doc/probabel'
> /usr/bin/install -c -m 644 ProbABEL_manual.tex QuickStart.txt short_coxph_data.txt short_height_base_add.out.txt.save short_height.txt short_logist_data.txt short_test.mldose test.map test.mlinfo test_regressi
> on.R COPYING LICENSE INSTALL ChangeLog TODO '/tmp/buildd/probabel-0.4.1/debian/probabel/usr/share/doc/probabel'
> ...
> dh_installdocs -O--parallel
>
> which means that the documentation files in question are just right into
> place before dh_installdocs is started. So I would solve this by doing
> something like
>
> override_dh_installdocs:
> dh_installdocs
> find debian -name INSTALL -delete
> rm -f debian/$(DEBPKGNAME)/usr/share/doc/$(DEBPKGNAME)/COPYING
> <whatever method to remove you prefer>/LICENSE
>
> Just pick your favourite method to remove the files manually.
Thanks, that cleared things up for me. As to the question below, as you
say, this is solved by your suggestions.
>
>> Also, in order to fix the name of the ChangeLog.gz file to changelog.gz
>> I tried adding
>>
>> mv usr/share/doc/probabel/{ChangeLog,changelog}.gz
>>
>> to the dh_installchangelogs override (which doesn't work because the
>> path is wrong). Is there a DH variable that points to the build dir, or
>> should I simply prefix the path above with debian/probabel?
>
> I'm not really sure whether I understand your question correctly. It
> might be helpful if you always just commit + push your changes even if
> it does not work as expected. Your code will help me to understand the
> question better and I could even push my fixes right into the repository
> which might be more helpful than any verbal description.
What I assumed was that variables like DH_BUILDDIR existed (instead of
debian/$(DEBPKGNAME).
Changes have been pushed.
>
> I somehow have the feeling that my example above could possibly answer
> your question, thought.
Indeed.
Thanks,
Lennart.
>
> Kind regards
>
> Andreas.
>
--
*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
L.C. Karssen
Utrecht
The Netherlands
lennart@karssen.org
http://blog.karssen.org
GPG key ID: A88F554A
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
Attachment:
signature.asc
Description: OpenPGP digital signature