[SCM] libva/master: Fix FTBS by updating ignore-debian.upstream.patch * Remove debian.upstream, and associated unused stanzas from Makefile.am and Makefile.in

[Nicholas D Steeves]

On 17 July 2016 at 04:52, Sebastian Ramacher <sramacher at debian.org> wrote:
> On 2016-07-17 01:46:30, sten-guest at users.alioth.debian.org wrote:
>> The following commit has been merged in the master branch:
>> commit aa0330cf48fb0f6fd37840d46981efe0b0a3e2c0
>> Author: Nicholas D Steeves <nsteeves at gmail.com>
>> Date:   Sat Jul 16 21:21:08 2016 -0400
>>
>>     Fix FTBS by updating ignore-debian.upstream.patch
>>       * Remove debian.upstream, and associated unused stanzas
>>         from Makefile.am and Makefile.in
>>
...
>> + DEB_BUILDDIR = debian.build
>> +-
>> +-deb:
>> +-    @[ -d debian ] || ln -s debian.upstream debian
>> +-    dpkg-buildpackage -rfakeroot -uc -us
>> +-
>> +-deb.upstream: dist
>> +-    -mkdir -p $(DEB_BUILDDIR)
>> +-    cd $(DEB_BUILDDIR)                              && \
>> +-    rm -rf $(PACKAGE)-$(VERSION)                    && \
>> +-    tar zxvf ../$(PACKAGE)-$(VERSION).tar.gz        && \
>> +-    cd $(PACKAGE)-$(VERSION)                        && \
>> +-    $(MAKE) deb -f Makefile.am
>
> That's not used anyway. I'd leave it in.

I wasn't sure what the minimum necessary modifications were to prevent
these targets from being made by "make all"

>> +-SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
>> ++SUBDIRS = va dummy_drv_video pkgconfig test doc

Is removing the SUBDIR sufficient?

>> +Index: libva/Makefile.in
>> +===================================================================
>> +--- libva.orig/Makefile.in
>> ++++ libva/Makefile.in
>
> No, please don't patch any Makefile.in if dh_autoreconf is used.

Done, Makefile.in restored in commit 833f1ff432601266f3480adf120e76756a6c3f8f

Thank you for the tips!
Nicholas