xorg: Changes to 'debian-unstable'

[Christian Perrier <bubulle@alioth.debian.org>]

 debian/changelog                |    7 +++++++
 debian/xserver-xorg.postinst.in |    1 +
 2 files changed, 8 insertions(+)

New commits:
commit 2ebaa5cb66245ea52279179e6f2136dcf8e241f7
Author: Christian Perrier <bubulle@mykerinos.kheops.frmug.org>
Date:   Thu Feb 8 17:20:22 2007 +0100

    Map French Canadian keyboard

diff --git a/debian/changelog b/debian/changelog
index 7e92bd5..41f55f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.1.0-12) UNRELEASED; urgency=low
+
+  * Map French Canadian console keymap to "ca" X keymap in the postinst
+    Closes: #408482
+
+ -- Christian Perrier <bubulle@debian.org>  Fri, 26 Jan 2007 08:49:47 +0100
+
 xorg (1:7.1.0-11) unstable; urgency=medium
 
   [ Julien Cristau ]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 89e45d5..b3ddb96 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1158,6 +1158,7 @@ if [ -n "$DOKBDETECT" ]; then
     br) XMAP="us"; VARIANT="intl"; MODEL="pc104";;
     br-abnt2) XMAP="br"; VARIANT="abnt2"; MODEL="abnt2";;
     by) XMAP="by";;
+    cf) XMAP="ca";;
     lfc-cat) XMAP="es"; VARIANT="cat";;
     cz-lat2) XMAP="cz";;
     de-latin1-nodeadkeys) XMAP="de"; VARIANT="nodeadkeys";;