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

[Jaromír Mikeš]

2011/2/17 Reinhard Tartler <siretart at tauware.de>:
> On Thu, Feb 17, 2011 at 21:17:05 (CET), Jaromír Mikeš wrote:
>
>> 2011/2/17 Bilal Akhtar <bilalakhtar at ubuntu.com>:
>>> On 02/17/2011 10:17 PM, Jaromír Mikeš wrote:
>>>> Hi all,
>>>>
>>>> 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
>>>
>>> Hi,
>>>
>>> Just override the clean target to delete the config.guess and config.sub
>>> files every time clean is run. dpkg-source ignores the deletion of these
>>> files, and hence the build won't be aborted.
>>
>> It works, thank you. But these files are part of orig.tarball. this
>> mean I have this now in git:
>> $ git status
>> [snip]
>> #     deleted:    config.guess
>> #     deleted:    config.sub
>> [snip]
>>
>> Is this ok? Do it like this and just to be careful with "commit -a" ?
>
> I'd just delete those files from the master branch, but keep them in the
> upstream branch.

Also way to go. What do you think about Alessandro's way?

regards

mira