[SCM] hydrogen/master: Exclude .gitignore file from upstream tarball.

[James Cowgill]

On 10/11/16 17:52, Jaromír Mikeš wrote:
> 2016-11-10 18:47 GMT+01:00 James Cowgill <jcowgill at debian.org>:
>> On 10/11/16 17:45, mira-guest at users.alioth.debian.org wrote:
>>> The following commit has been merged in the master branch:
>>> commit 04a67b78303a484388d130485693cb277183b231
>>> Author: Jaromír Mikeš <mira.mikes at seznam.cz>
>>> Date:   Thu Nov 10 13:45:37 2016 +0100
>>>
>>>     Exclude .gitignore file from upstream tarball.
>>>
>>> diff --git a/debian/copyright b/debian/copyright
>>> index 78e3337..2d6d1e0 100644
>>> --- a/debian/copyright
>>> +++ b/debian/copyright
>>> @@ -2,6 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
>>>  Upstream-Name: Hydrogen
>>>  Upstream-Contact: Alessandro Cominu (Comix) <comix at users.sourceforge.net>
>>>  Source: http://sourceforge.net/projects/hydrogen/
>>> +Files-Excluded:
>>> + .gitignore
>>
>> You can't seriously be repacking the tarball just for this !?
> 
> Hmm ... What do you suggest?
> Just exclude gitignore file without adding repack suffix to upstream tarball?

You can just resolve the merge conflict without repacking anything.

James

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20161110/ed383948/attachment.sig>