Bug#805314: [Pkg-kbd-devel] Bug#805314: kbd: new upstream release

2015-12-10 Thread Andreas Henriksson
Hello Michael Schutte.

On Mon, Nov 30, 2015 at 09:43:51PM +0100, Michael Schutte wrote:
> Hey again Andreas,
> 
> On Mon, Nov 30, 2015 at 12:35:17PM +0100, Andreas Henriksson wrote:
[...]
> > How about this middle ground:
> > [...]
> > The above means that after a "gbp pq import && gbp pq export && gbp pq drop"
> > the patch numbers will be gone, but also all the previous
> > debian/patches/*.diff will be renamed (based on their Subject: + .patch)
> > as well as have some additional meta-headers added by gbp pq.
> >
> > Does that sound ok to you or do you still prefer manual tweaking?
> 
> Yup, that sounds just fine -- doesn't matter which way round it is
> consistent :-)

I've now implemented the above in pkg-kbd git.

I've also pushed a bunch of more fixes (mostly for the kbd init script)
to the pkg-kbd git repo. I think the current state is ready for upload
now. I would be very happy if you have the time to review the new
changes before I upload.

Regards,
Andreas Henriksson

PS. I've also been thinking a bit about #796583, but will handle that in
a later upload. I think we'll first need to discuss which way to handle
it you'd prefer to see implemented. Will follow up on that later.



Bug#805314: [Pkg-kbd-devel] Bug#805314: kbd: new upstream release

2015-11-30 Thread Michael Schutte
Hey again Andreas,

On Mon, Nov 30, 2015 at 12:35:17PM +0100, Andreas Henriksson wrote:
> Please feel free to beat me to the uploading part if you feel like
> uploading sooner ("gbp dch --auto && dch -r" still pending to prepare
> the changelog for upload).

No hurry from my side!

> >   * The patch you added is straight from git-format-patch, which makes
> > its name and header format inconsistent with the others.  I would
> > suggest stripping the "0001-" prefix, using underscores and a .diff
> > extension, and patch tagging according to DEP 3, as I have done for
> > the other patches.
> 
> Yeah, inconsistency isn't very nice. OTOH I'd prefer to spend as little
> time as possible on reorganizing cherry-picks from upstream as they
> are highly temporary and will go away as soon as the next upstream
> release is out. Also, git format-patch style is DEP3 compliant as well!
> 
> How about this middle ground:
> [...]
> The above means that after a "gbp pq import && gbp pq export && gbp pq drop"
> the patch numbers will be gone, but also all the previous
> debian/patches/*.diff will be renamed (based on their Subject: + .patch)
> as well as have some additional meta-headers added by gbp pq.
>
> Does that sound ok to you or do you still prefer manual tweaking?

Yup, that sounds just fine -- doesn't matter which way round it is
consistent :-)

Cheers,
Michael