[SCM] pd-zexy/master: preserve autom4te.cache

[Reinhard Tartler]

On Mi, Sep 28, 2011 at 09:33:17 (CEST), IOhannes m zmoelnig wrote:

> On 2011-09-27 20:34, Reinhard Tartler wrote:
>>> deleting is probably the best thing, the question is how to achieve that
>>> here:
>>> - strip the autom4te.cache from the pristine-tar import?
>
> what i meant is to do a re-import with "git-import-orig --filter
> autom4te.cache"

Hm, I haven't done this before, but this should work as well.

>> pristine-tar imports the 'upstream' branch, not master. Don't delete
>> from 'upstream', only from 'master'.
>
> i was hesitant to do that, as i thought one was not supposed to do
> _anything_ outside of debian/.
>
> for modification of the upstream sources, we have patch systems like quilt.

Indeed, that's the general rule. Still, plain removals outside of
debian/ are IME okay, as dpkg will just ignore them. At least it used to
do in the past.

>
>>> - patch the offending sources away?
>>
>> I don't understand this? please elaborate.
>
> following my argumentation above, that one is not supposed to change the
> contents of the sources (outside the debian/ directory), my (somewhat
> clumsy) suggestion was to add a
> debian/patches/remove_autom4te.patch that would remove the offending
> files (and hopefully restore them after the build).

That seems gross to me.


-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4