Changes in config.{sub,guess} and "abort-on-upstream-changes"

[Reinhard Tartler]

On Fri, Feb 18, 2011 at 01:21:19 (CET), Jonas Smedegaard wrote:

> On Thu, Feb 17, 2011 at 11:45:52PM +0100, Jaromír Mikeš wrote:
>>2011/2/17 Felipe Sateler <fsateler at debian.org>:
>>> 2011/2/17 Jaromír Mikeš <mira.mikes at gmail.com>:
>>>> 2011/2/17 Alessandro Ghedini <al3xbio at gmail.com>:
>>>>> On Thu, Feb 17, 2011 at 08:17:47PM +0100, Jaromír Mikeš wrote:
>>>>>> file config.{sub,guess} are modified while running git-buildpackage -S
>>>>>> and "abort-on-upstream-changes" in local-options file aborting
>>>>>> process.
>>>>>> What is right solution for this situation?
>>>>>> git://git.debian.org/pkg-multimedia/phat.git
>>>>>
>>>>> Try adding something like:
>>>>>
>>>>>    extend-diff-ignore = "(^|/)config.(sub|guess)$"
>>>>>
>>>>> to debian/source/local-options. It makes dpkg ignore modifications to
>>>>> config.{sub,guess} when generating the diff for changes.
>>>>
>>>> This is nice solution, maybe this can be recommended in our wiki.
>>>> I can put it there if some general agreement for using this will
>>>> exists in team.
>>>> What others think?
>>>
>>> It will still generate git messages about uncommitted changes.
>>
>>No, it doesn't generate such messages ... I've pushed these changes
>>already, you can try.
>>
>>> The CDBS approach is to move the files aside on build and restore them on
>>> clean.
>>
>>I would like to stay with debhelper, do you know how to simulate
>>similar approach with debhelper?
>
> It is not really a "CDBS" approach, but plain classic make rules in the
> rules file.
>
> No, I don't know if short-form dh explodes if adding plain classic rules
> to the rules file after that magic let-debhelper-takeover-every-target.

It apparently doesn't.
-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4