New xmltooling 1.6.3
wferi at niif.hu
Wed Jan 17 13:31:45 UTC 2018
Etienne Dysli-Metref <etienne.dysli-metref at switch.ch> writes:
> On 17/01/18 12:26, Ferenc Wágner wrote:
>> On the other hand, we could change a couple of things in our gbp.conf as
>> well, to make things more bulletproof. For example:
>> - move pristine-tar = True into the DEFAULT section
>> - add merge-mode = replace into the import-orig section (if supported by
>> your version)
>> What do you think?
> merge-mode is listed in my man gbp-import-orig so it should work. Isn't
> there a risk, with replace, that files outside of debian/ that were
> deleted by maintainers come back?
We mustn't make any changes to the tarball contents, so your premise
can't hold. In theory. The 3.0 (quilt) source format does not allow
this. (The shibsp/paths.h file begs for trouble, but still we managed
to avoid it.) The "replace" merge mode protects against upstream
debian/ directory content mixing into our packaging. Fortunately the
Shibboleth upstream material does not contain debian/ directories, so we
don't need such countermeasures, and it's the default since 0.8.14
anyway, so let's forget it.
The pristine-tar option is used by several subcommands, though, so we'd
better promote it on the next round of changes.
More information about the Pkg-shibboleth-devel