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

[Andreas Henriksson]

Hello Michael.

On Sun, Nov 29, 2015 at 07:26:48PM +0100, Michael Schutte wrote:
> Hi Andreas,
> 
> Looks good to me!  I've added you to the kbd packaging group on Alioth;
> if you would like to, feel free to add yourself to Uploaders, push to
> /git/pkg-kbd/kbd.git and upload the package.

Thanks for your review. Only pushed the new upstream to the alioth repo
for now. Postponing the upload until I'm a bit less busy and will sleep
on the Uploaders bit.... 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).

> 
> Two small suggestions:
> 
>   * 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:

--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,3 +6,6 @@ upstream-branch = upstream/master
 [buildpackage]
 export-dir = ../build-area/
 sign-tags = True
+
+[gbp-pq]
+patch-numbers = False


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?

I'm personally quite keen on automating as much of my workflow as
possible (eg. by utilizing the packaging tools features as much as
possible).

> 
>   * The libkeymap split as well as the reorganisation of the docs has
>     made some paths in debian/copyright invalid (namely everything
>     starting with man/ as well as some stuff related to loadkeys).  It
>     might be nice to update these.

I've done my best effort to update the debian/copyright file and pushed
those changes as well. Any help for further improvements welcome.

> 
> Thanks again for your contribution!
> 

Regards,
Andreas Henriksson

PS. I'll try to look into #796583 soon. Possibly before uploading.