xserver-xorg-input-keyboard: Changes to 'debian-unstable'
ChangeLog | 37 +++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 6 ++++++
man/kbd.man | 11 ++++++-----
4 files changed, 50 insertions(+), 6 deletions(-)
New commits:
commit 1e799881d54e516440f8a698c81585d9f63c7986
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 8 00:59:06 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index b0556a3..7b6a469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-keyboard (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.6.0-1) unstable; urgency=low
* New upstream release.
- -- Cyril Brulebois <kibi@debian.org> Tue, 08 Mar 2011 00:58:11 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 08 Mar 2011 00:59:01 +0100
xserver-xorg-input-keyboard (1:1.5.99.901-1) unstable; urgency=low
commit ce02be5941967455f51de3531ca90b973d3ff8c1
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 8 00:58:25 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index c032f43..1839823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+commit 0b9cd5121e1025e95a7e32addb675ab874bc6cb1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Mar 8 09:38:29 2011 +1000
+
+ keyboard 1.6.0
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 24ee4f6738955d507f500a90fda8153f19dd5038
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Mar 7 12:05:48 2011 +1000
+
+ man: explain what grp_led:scroll does in the example conf section
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed by: Magnus Kessler <Magnus.Kessler@gmx.net>
+
+commit d5634b77b578721e2bb2734f5fd92090e9d4c330
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Mar 7 11:35:44 2011 +1000
+
+ man: list xorg.conf.d snippets as possible configuration location
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed by: Magnus Kessler <Magnus.Kessler@gmx.net>
+
+commit 89358c49e519c7a1e0f9a9544f9c03b5d9c2115d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Mar 7 11:34:21 2011 +1000
+
+ man: don't mention the core keyboard.
+
+ Core devices are an obsolete concept these days.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed by: Magnus Kessler <Magnus.Kessler@gmx.net>
+
commit 6496bb21074faff2642e09389b5476225dc4fdb3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 09:59:14 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index 6c43948..b0556a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-keyboard (1:1.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 08 Mar 2011 00:58:11 +0100
+
xserver-xorg-input-keyboard (1:1.5.99.901-1) unstable; urgency=low
* New upstream release.
commit 0b9cd5121e1025e95a7e32addb675ab874bc6cb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 8 09:38:29 2011 +1000
keyboard 1.6.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 522d2fe..8692836 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-keyboard],
- [1.5.99.901],
+ [1.6.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-keyboard])
AC_CONFIG_SRCDIR([Makefile.am])
commit 24ee4f6738955d507f500a90fda8153f19dd5038
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 7 12:05:48 2011 +1000
man: explain what grp_led:scroll does in the example conf section
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed by: Magnus Kessler <Magnus.Kessler@gmx.net>
diff --git a/man/kbd.man b/man/kbd.man
index 3b4617f..d224ce5 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -95,7 +95,8 @@ The following xorg.conf fragment ensures that user will be able to switch betwee
.I us
and
.I sk
-layouts by pressing the "menu" key.
+layouts by pressing the "menu" key. The scroll lock LED shows which layout
+is currently active.
.PP
The
.B XkbVariant
commit d5634b77b578721e2bb2734f5fd92090e9d4c330
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 7 11:35:44 2011 +1000
man: list xorg.conf.d snippets as possible configuration location
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed by: Magnus Kessler <Magnus.Kessler@gmx.net>
diff --git a/man/kbd.man b/man/kbd.man
index 91c12bd..3b4617f 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -26,8 +26,9 @@ driver functions as a keyboard input device.
.SH CONFIGURATION DETAILS
.PP
Depending on the X server version in use, input device options may be set
-in either a __xconfigfile__ file, or in the configuration files read by the
-Hardware Abstraction Layer (HAL) daemon, hald(1).
+in either a __xconfigfile__ file, an xorg.conf.d snippet, or in the
+configuration files read by the Hardware Abstraction Layer (HAL) daemon,
+hald(1).
.PP
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
commit 89358c49e519c7a1e0f9a9544f9c03b5d9c2115d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 7 11:34:21 2011 +1000
man: don't mention the core keyboard.
Core devices are an obsolete concept these days.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed by: Magnus Kessler <Magnus.Kessler@gmx.net>
diff --git a/man/kbd.man b/man/kbd.man
index 4fb2336..91c12bd 100644
--- a/man/kbd.man
+++ b/man/kbd.man
@@ -22,8 +22,7 @@ driver formerly included in __xservername__.
.PP
The
.B kbd
-driver functions as a keyboard input device, and may be used as the
-X server's core keyboard.
+driver functions as a keyboard input device.
.SH CONFIGURATION DETAILS
.PP
Depending on the X server version in use, input device options may be set
Reply to: