Dealing with abort-on-upstream-changes + .gitignore + git-pbuilder

[Jonas Smedegaard]

On Tue, Jan 18, 2011 at 10:18:49PM -0300, Felipe Sateler wrote:
>On Tue, Jan 18, 2011 at 22:10, Jonas Smedegaard <dr at jones.dk> wrote:
>> On Tue, Jan 18, 2011 at 07:54:24PM -0300, Felipe Sateler wrote:
>>>
>>> I'm getting build failures when using .gitignore + 
>>> debian/source/local-options with the abort-on-upstream-changes due 
>>> to .gitignore being in the root source dir. Strangely, this happens 
>>> only when git-pbuilder is being used. Anyone has dealt with this 
>>> before?
>>
>> Are you sure you are using format 3.0?
>>
>> Previously I used this:
>>
>>  git-buildpackage --git-builder="localdebuild -i\.git/ -I.git
>>
>> With dpkg-source format 3.0 implicitly suppressin both .git and other 
>> niftyness, I switched to this:
>>
>>  git-buildpackage --git-builder="localdebuild
>>
>> ...but need to switch back whenever I need to build a package not in 
>> 3.0 format.
>
>As mentioned above, this fails only when git-pbuilder is in use. And 
>further searching suggests #606412 is the culprit.
>
>>
>>
>> Also, is the change commited to git?  And is it added in the Debian 
>> overlay or an extension to a .gitignore already existing in upstream 
>> source?  What are the actual package + command used?
>
>Package is csound, command is git-buildpackage --git-pbuilder

Ah, yes.  I seem to recall that I at some point looked into the source 
of git-buildpackage when hitting problems with format 3.0 and realizing 
that it used above -i and -I options (I didn't get that idea myself).

So I believ you are right that it is formally bug#606412, and I believe 
I was (accidentally) talking about exactly that same issue and therefore 
my suggested workaround is to replace

   git-buildpackage --git-pbuilder

with

   git-buildpackage --git-builder="pdebuild"


(sorry for confusing things earlier with my custom "localdebuild" hack).


  - Jonas

-- 
  * Jonas Smedegaard - idealist & Internet-arkitekt
  * Tlf.: +45 40843136  Website: http://dr.jones.dk/

  [x] quote me freely  [ ] ask before reusing  [ ] keep private
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20110119/bfda8909/attachment-0001.pgp>