modifying libva (master) .gitignore

[Nicholas D Steeves]

Hi Sebastian,

On 8 July 2016 at 04:33, Sebastian Ramacher <sramacher at debian.org> wrote:
> On 2016-07-06 16:17:09, Nicholas D Steeves wrote:
>>
>> On 5 July 2016 at 05:30, Sebastian Ramacher <sramacher at debian.org> wrote:
>> >
>> > On 2016-07-04 14:54:17, Nicholas D Steeves wrote:
>> >> I ran into an issue with backporting libva.  Is it ok if I add the
>> >> following to libva (master) .gitignore?:
>> >>
>> >> debian.upstream/changelog
>> >> debian.upstream/control
>> >
>> > How will this change affect gbp import-orig since these files come from the
>> > upstream tarball?
>> >
>> > I usually use --git-ignore-new and cases where I really need gbp buildpackage.
>> >
>
> I think it's overly complicated for something that can simply be solved by using
> --git-ignore-new when using gbp buildpackage or patching the upstream build
> system to not include debian.upstream/Makefile.am. I'll probably add a patch for
> the latter.

Thank you for the assistance!  I'm going to bookmark this method for
future reference, and yes, I see why it is undeniably better than my
proposal. ;-)  I imagine those three commits need to be represented in
debian/changelog before I do the backport, so I've attached an example
patch.  To release the bpo while I still have the free time, is it ok
to add these items to a 1.7.1-1 bpo changelog, push and release, and
only later package 1.7.1-2 whenever it hits testing?

Also for future reference: Did I update the changelog properly, to
represent work another team member did on the package?  And is it ok
to push changelog diffs like this one, or should I wait for author of
the work to update the changelog?

Cheers,
Nicholas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: libva-update-changelog.patch
Type: text/x-patch
Size: 846 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20160711/cbf6a0d6/attachment-0001.bin>