Please merge xkeyboard-config 1.6-1 (main) from Debian unstable

[Michael Terry]

Binary package hint: xkeyboard-config

xkeyboard-config (1.6-1) unstable; urgency=low

  * Add Breaks on old libx11-6. It seems some people are keeping very, very
    old libx11-6 versions, which didn't know about some keysyms we're now
    using, thus making their keyboard unusable (closes: #530585, #514975).
  * New upstream release
    + adds Crimean Tatar layouts (closes: #513557)
    + French translation updated (closes: #529479)
    + fixes handling of compat layouts (closes: #514409)
  * Patches sclk_toggle.diff and unhide_lv3_enter_switch.diff are upstream.
  * Add README.source, bump Standards-Version to 3.8.1.

 -- Julien Cristau <email address hidden> Sat, 30 May 2009 16:39:19 +0200

[Michael Terry (mterry)]

Just the debian/ changes.

[Daniel Holbach (dholbach)]

I imagine the .pot file is needed for Rosetta? In this case, why don't we just run
  cd po; intltool-update -p
some time during the build?

Is the README.Debian change something we should let Debian know about too?

What about the one small part of 110_fi_brokenbar.patch which upstream rejected? Is it necessary?

CCing Bryce to get his opinion.

[Michael Terry (mterry)]

No, the fi_brokenbar change is not necessary. The patch added support to the Finnish layout for several characters (<, >, |, and the broken pipe/bar). But upstream took only <, >, and |, saying that the broken bar was too unusual to consume one of the reserved keys that were meant for future extensions. There are other ways to type it. See the upstream bug about it: https://bugs.freedesktop.org/show_bug.cgi?id=20300

Debian knew that documentation section was not quite right, but they didn't seem to know about our patch to it. I forwarded it on: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=497341

As for the pot file, I had assumed it had to be a part of the source package, not the binary package, but I see that other packages merely generate the pot file during build. Is that really enough for Rosetta to find? i.e. It actually builds the package and then grabs the pot file? Interesting. I couldn't find any documentation on that process with a quick search. I'm attaching a debdiff that does this. If this is correct, I'll file a Debian bug about it.

[Bryce Harrington (bryce)]

Looks good, upload sponsored. Thanks michael!

fi_brokenbar - agreed it's not important enough to maintain as a divergence from upstream.

Thanks for forwarding the patch about the documentation. Really, it should be fixed by improving the procedure for customizing things, but really that's best done by Debian; for us just continuing to drop the incorrect directions is probably the simplest solution.

Thanks for updating the pot file as well; at some point it would be nice to make it automatically update during packaging as Daniel suggested, but for now updating it manually is probably sufficient.

[Launchpad Janitor (janitor)]

This bug was fixed in the package xkeyboard-config - 1.6-1ubuntu1

---------------
xkeyboard-config (1.6-1ubuntu1) karmic; urgency=low

  * Merge from debian unstable (LP: #386445), remaining changes:
    - debian/xkeyboard-config.pot: Add pot file for translations (updated)
    - README.Debian: Don't advertise hacking on base.xml
  * All Ubuntu patches dropped, applied in source. Except for one small
    part of 110_fi_brokenbar.patch which upstream rejected.

xkeyboard-config (1.6-1) unstable; urgency=low

  * Add Breaks on old libx11-6. It seems some people are keeping very, very
    old libx11-6 versions, which didn't know about some keysyms we're now
    using, thus making their keyboard unusable (closes: #530585, #514975).
  * New upstream release
    + adds Crimean Tatar layouts (closes: #513557)
    + French translation updated (closes: #529479)
    + fixes handling of compat layouts (closes: #514409)
  * Patches sclk_toggle.diff and unhide_lv3_enter_switch.diff are upstream.
  * Add README.source, bump Standards-Version to 3.8.1.

 -- Michael Terry <email address hidden> Fri, 12 Jun 2009 13:51:29 -0400

[Daniel Holbach (dholbach)]

It does not need to be part of the binary package nor of the source package. If it's in there during build time, that's good enough for pkgstriptranslations.