modifying libva (master) .gitignore

[Nicholas D Steeves]

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:
>> Hi Sebastian,
>>
>> 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.
>> >
>>
>> From what I understand of that page, and what I understand of the
>> build process, it should be safe and desirable to prevent the
>> debian.upstream/* from being imported into (master), because we use
>> the ones in the (master) libva/debian.  Debian.upstream should
>> probably still be imported into the (upstream) branch.
>>
>> Today I a tested a variety of approaches in combination with gbp
>> import-orig, and it seems like this simple .gitignore solution might
>> not be viable.  For example, adding debian.upstream to .gitignore and
...
> 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.

It seems I spoke too soon wrt my last email.  Currently, libva still
wants to run make in debian.upstream.  What I find strange is that
outright removing the debian.upstream dir didn't cause the following
build failures:

checkout f57b4ed747be83f72a4c6b72a845011ef6c35ce6
  * I then removed the debian.upstream directory, and commited the changes
  * It built just fine for sid and for jessie-backports (gbp)

checkout dbb99e381206508d213797dbe1214a8f04368333
  * build fails (gbp) with

make[5]: Nothing to be done for 'all-am'.
make[5]: Leaving directory '/build/libva-1.7.1/test'
make[4]: Leaving directory '/build/libva-1.7.1/test'
Making all in debian.upstream
make[4]: Entering directory '/build/libva-1.7.1/debian.upstream'
make[4]: *** No rule to make target 'all'.  Stop.
make[4]: Leaving directory '/build/libva-1.7.1/debian.upstream'
Makefile:465: recipe for target 'all-recursive' failed
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory '/build/libva-1.7.1'
Makefile:397: recipe for target 'all' failed
make[2]: *** [all] Error 2
make[2]: Leaving directory '/build/libva-1.7.1'
dh_auto_build: make -j1 returned exit code 2
debian/rules:20: recipe for target 'override_dh_auto_build' failed
make[1]: *** [override_dh_auto_build] Error 2
make[1]: Leaving directory '/build/libva-1.7.1'
debian/rules:14: recipe for target 'build' failed
make: *** [build] Error 2

checkout 3836579b289964afe57ed3986693d1b882b74efb
  * build fails for the same reason

checkout 22796dd3c4cf90c44e27ca74692fdad127b545e5
  * build fails for the same reason

Cheers,
Nicholas