ChangeLog | 247 +++++++++++++
configure.ac | 4
debian/NEWS | 8
debian/README.source | 24 -
debian/changelog | 29 +
debian/compat | 2
debian/control | 21 -
debian/rules | 111 -----
debian/watch | 1
debian/xserver-xorg-input-kbd.install | 2
debian/xserver-xorg-input-kbd.manpages | 1
debian/xsfbs/repack.sh | 32 -
debian/xsfbs/xsfbs.mk | 285 ---------------
debian/xsfbs/xsfbs.sh | 622 ---------------------------------
src/bsd_KbdMap.c | 200 ----------
src/bsd_kbd.c | 53 --
src/hurd_kbd.c | 9
src/kbd.c | 174 +++------
src/lnx_KbdMap.c | 4
src/lnx_kbd.c | 9
src/sun_kbd.c | 41 --
src/sun_kbdMap.c | 12
src/xf86Keymap.h | 139 -------
src/xf86OSKbd.h | 26 -
24 files changed, 394 insertions(+), 1662 deletions(-)
New commits:
commit 4d8907a2e5a05faa57c4cef2f350a5e882a31fe3
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Feb 21 02:33:15 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index b03d41f..5d98f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-keyboard (1:1.5.99.901-1+exp1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.5.99.901-1+exp1) experimental; urgency=low
* Rebuild against Xserver 1.10 rc2.
- -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:32:52 +0100
+ -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:33:12 +0100
xserver-xorg-input-keyboard (1:1.5.99.901-1) unstable; urgency=low
commit 4543fe260df5986203e667be2b04bb8c913c5ec5
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Feb 21 02:33:00 2011 +0100
Rebuild against Xserver 1.10 rc2.
diff --git a/debian/changelog b/debian/changelog
index 6c43948..b03d41f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-keyboard (1:1.5.99.901-1+exp1) UNRELEASED; urgency=low
+
+ * Rebuild against Xserver 1.10 rc2.
+
+ -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:32:52 +0100
+
xserver-xorg-input-keyboard (1:1.5.99.901-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 44b08e7..4fcb750 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.9.99.902),
x11proto-kb-dev,
x11proto-input-dev,
x11proto-core-dev,
commit 46ad498c6e6998cc492e4fce5d1124b459e7a670
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Feb 21 02:30:02 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 241bac8..6c43948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-keyboard (1:1.5.99.901-1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.5.99.901-1) unstable; urgency=low
* New upstream release.
- -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:28:26 +0100
+ -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:29:57 +0100
xserver-xorg-input-keyboard (1:1.5.0-2) unstable; urgency=low
commit ef018ad8637c0c8ca54aa6880a2df46b8de68f5d
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Feb 21 02:28:36 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 170dc0a..c032f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,250 @@
+commit 6496bb21074faff2642e09389b5476225dc4fdb3
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Feb 21 09:59:14 2011 +1000
+
+ keyboard 1.5.99.901
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 15f0a4b71b4580c7dd9a0abd7b8fb92756b6733a
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Thu Feb 17 15:40:29 2011 +0500
+
+ Removed unnecessary code, since ABI_XINPUT_VERSION >= 2
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit de7a5c120f646e293cc216007a5df865b41833b8
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Thu Feb 17 15:40:28 2011 +0500
+
+ Require server 1.4 or later
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a02757d7c3d8018f44c63553578763fcef41bcca
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Wed Feb 16 13:21:03 2011 +0500
+
+ Cleanup set the value of CustomKeycodes
+
+ Also, do not print values of variables CustomKeycodes twice.
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit f45f3dbcf1f2a54d7d6a51d6e9884820cff4be12
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Fri Feb 11 15:33:00 2011 +0500
+
+ Do not print values of Protocol twice
+
+ Protocol printed when found in xf86SetStrOption().
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 6fca7f2371c113796d4cf27cca5635f3c6fb30af
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Fri Feb 11 15:32:59 2011 +0500
+
+ Remove unused XQUEUE
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 8a540fa439bd7ea30c49d43ff3339ab599a7ba14
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Fri Feb 11 15:32:57 2011 +0500
+
+ lnx: Fix detect CustomKeycodes for __powerpc__
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 849f5092efd770cf169ce9950e9dbb0bccbf9017
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Sat Jan 8 17:09:10 2011 +0500
+
+ Removing unused bell_pitch and bell_duration
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit dd9ed7921ccffff9cacb6dc128b3f426f9312535
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Sat Jan 8 20:09:48 2011 +0500
+
+ Removing unused PROT_XQUEUE and PROT_USB
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 78652023a9f7758635e5507255826d79fbb2b028
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Sat Jan 8 17:09:38 2011 +0500
+
+ bsd: Replace deprecated xfree/xcalloc with free & calloc
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit f7a81ab4225e14a50e26a49a0a17a2cf773a4ab1
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Sat Jan 8 17:08:41 2011 +0500
+
+ Remove random History comment and OS_KBD_VERSION_CURRENT
+
+ In xf86-input-mouse similar cleanup already done, can also make for
keyboard?
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e2f6e5d976ff8bbe68dc41b51d983cc95c11db84
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Thu Jan 6 14:43:13 2011 +0500
+
+ Do not print values of variables XkbRules etc. twice
+
+ xf86SetStrOption prints in log value of the variables XkbRules etc.,
+ there is no need to take this information twice.
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 7d03efb3a3af77ca6831492a793d18b89cc64083
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Thu Jan 6 13:37:39 2011 +0500
+
+ bsd: Fix print wscons type keyboard for Sun5
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 40ed9bb3dc87702510d5e54c42a60a2cdd73c135
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Thu Jan 6 13:21:35 2011 +0500
+
+ Fix default options for PC98
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit e929446a401e73bcc680c488ada2fc50eb225b23
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Thu Jan 6 12:59:19 2011 +0500
+
+ Removing unused SetKbdRepeat
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit cc1a2ba8c9aa3a4bed25394c981b41c903502c84
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Dec 23 15:53:32 2010 -0800
+
+ sun_kbd: Replace deprecated xfree/xcalloc with free & calloc
+
+ Also greatly simplified option/pointer handling to avoid generating
+ new warnings from passing const char * pointers to free()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit bd099b5a87399d6ff1fd324172bfcc4bc07a362b
+Author: Javier Acosta <javier.aco...@oracle.com>
+Date: Thu Dec 23 09:43:51 2010 -0800
+
+ Make key codes for Sun Japanese keyboard match xkb-config mappings
+
+ Solaris bug #7005752:
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=7005752
+
+ Signed-off-by: Javier Acosta <javier.aco...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit cb8b2fca90810a1a2d6e5f930e4eac0f929947c6
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Tue Nov 30 20:12:24 2010 +0500
+
+ Removing unused OpenBSD PCCONS code
+
+ In OpenBSD removed support PCCONS in 2002 year
+ http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 26af626a2c4afba858a32bbb42077f8661d3de4f
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Jan 3 12:42:58 2011 -0500
+
+ linux: warning fixes
+
+ lnx_KbdMap.c: In function 'KbdGetMapping':
+ lnx_KbdMap.c:44:17: warning: unused variable 'type'
+ lnx_KbdMap.c:42:13: warning: unused variable 'pKbd'
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 492c14cdd1c4b950c475633a64086235d3550f5b
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Mon Jan 3 12:40:25 2011 -0500
+
+ bsd: Include fix
+
+ Reviewed-by: Adam Jackson <a...@redhat.com>
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+
+commit a72c47487b67ad7134045d551dbe222eb4662058
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Mon Jan 3 12:37:34 2011 -0500
+
+ Remove unused code
+
+ Reviewed-by: Adam Jackson <a...@redhat.com>
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+
+commit 6c368bc3aa6d8e1b33d128a22f98ecda0d037e3b
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Dec 17 16:35:49 2010 -0500
+
+ Remove paranoia about event processing during suspend
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 155b3e80fc95ea8397bc66fad18f5fa68d54a88e
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Mon Nov 29 21:02:39 2010 +0500
+
+ Removing unused variables vtSwitchSupported and VTSwitchEnabled
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit f11f2a7b5643cde57440102ad822995c70b142fb
+Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+Date: Sat Nov 27 02:39:13 2010 +0500
+
+ Removing unused variable kbdType.
+
+ Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 6e97362d7eee5b81bc8681559fbd8a8f6137915c
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Oct 25 15:25:03 2010 +1000
+
+ Adjust to input ABI 12.
+
+ New PreInit prototype and a few other things.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+
commit 90f69d7b859caff9f51b6fe20580582a91ed6d0d
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Oct 30 09:15:11 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 11d9c17..241bac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-keyboard (1:1.5.99.901-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:28:26 +0100
+
xserver-xorg-input-keyboard (1:1.5.0-2) unstable; urgency=low
* Switch to dh:
commit 6496bb21074faff2642e09389b5476225dc4fdb3
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Feb 21 09:59:14 2011 +1000
keyboard 1.5.99.901
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index f6fdf26..522d2fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-keyboard],
- [1.5.0],
+ [1.5.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-keyboard])
AC_CONFIG_SRCDIR([Makefile.am])
commit 15f0a4b71b4580c7dd9a0abd7b8fb92756b6733a
Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Date: Thu Feb 17 15:40:29 2011 +0500
Removed unnecessary code, since ABI_XINPUT_VERSION >= 2
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/kbd.c b/src/kbd.c
index e0f0d33..d89d234 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -276,51 +276,7 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl)
static void
InitKBD(InputInfoPtr pInfo, Bool init)
{
- xEvent kevent;
KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 1
- DeviceIntPtr pKeyboard = pInfo->dev;
- KeyClassRec *keyc = pKeyboard->key;
- KeySym *map = keyc->curKeySyms.map;
- unsigned int i;
-#endif
-
- kevent.u.keyButtonPointer.time = GetTimeInMillis();
- kevent.u.keyButtonPointer.rootX = 0;
- kevent.u.keyButtonPointer.rootY = 0;
-
-/* The server does this for us with i-h. */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 1
- /*
- * Hmm... here is the biggest hack of every time !
- * It may be possible that a switch-vt procedure has finished BEFORE
- * you released all keys neccessary to do this. That peculiar behavior
- * can fool the X-server pretty much, cause it assumes that some keys
- * were not released. TWM may stuck alsmost completly....
- * OK, what we are doing here is after returning from the vt-switch
- * exeplicitely unrelease all keyboard keys before the input-devices
- * are reenabled.
- */
- for (i = keyc->curKeySyms.minKeyCode, map = keyc->curKeySyms.map;
- i < keyc->curKeySyms.maxKeyCode;
- i++, map += keyc->curKeySyms.mapWidth)
- if (KeyPressed(i))
- {
- switch (*map) {
- /* Don't release the lock keys */
- case XK_Caps_Lock:
- case XK_Shift_Lock:
- case XK_Num_Lock:
- case XK_Scroll_Lock:
- case XK_Kana_Lock:
- break;
- default:
- kevent.u.u.detail = i;
- kevent.u.u.type = KeyRelease;
- (* pKeyboard->public.processInputProc)(&kevent, pKeyboard, 1);
- }
- }
-#endif
pKbd->scanPrefix = 0;
commit de7a5c120f646e293cc216007a5df865b41833b8
Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Date: Thu Feb 17 15:40:28 2011 +0500
Require server 1.4 or later
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index f6ebb96..f6fdf26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto inputproto)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4] xproto inputproto)
# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir,
commit a02757d7c3d8018f44c63553578763fcef41bcca
Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Date: Wed Feb 16 13:21:03 2011 +0500
Cleanup set the value of CustomKeycodes
Also, do not print values of variables CustomKeycodes twice.
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 3b45e22..710470a 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -443,7 +443,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
pKbd->RemapScanCode = NULL;
pKbd->OpenKeyboard = OpenKeyboard;
- pKbd->CustomKeycodes = FALSE;
pKbd->private = calloc(sizeof(BsdKbdPrivRec), 1);
if (pKbd->private == NULL) {
diff --git a/src/hurd_kbd.c b/src/hurd_kbd.c
index dde5fbb..8c0cd60 100644
--- a/src/hurd_kbd.c
+++ b/src/hurd_kbd.c
@@ -158,7 +158,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
pKbd->KbdGetMapping = KbdGetMapping;
pKbd->RemapScanCode = ATScancode;
pKbd->OpenKeyboard = OpenKeyboard;
- pKbd->CustomKeycodes = FALSE;
pKbd->private = NULL;
pInfo->read_input = ReadInput;
return TRUE;
diff --git a/src/kbd.c b/src/kbd.c
index 43a194e..e0f0d33 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -85,7 +85,6 @@ static const char *kbdDefaults[] = {
"XkbRules", "base",
"XkbModel", "pc105",
"XkbLayout", "us",
- "CustomKeycodes", "off",
NULL
};
@@ -94,7 +93,6 @@ static const char *kbd98Defaults[] = {
"XkbRules", "xfree98",
"XkbModel", "pc98",
"XkbLayout", "jp",
- "CustomKeycodes", "off",
NULL
};
@@ -143,7 +141,6 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int
flags)
#endif
{
KbdDevPtr pKbd;
- MessageType from = X_DEFAULT;
char *s;
const char **defaults;
int rc = Success;
@@ -212,16 +209,8 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int
flags)
xkb_variant = xf86SetStrOption(pInfo->options, "XkbVariant", NULL);
xkb_options = xf86SetStrOption(pInfo->options, "XkbOptions", NULL);
- pKbd->CustomKeycodes = FALSE;
- from = X_DEFAULT;
- if (xf86FindOption(pInfo->options, "CustomKeycodes")) {
- pKbd->CustomKeycodes = xf86SetBoolOption(pInfo->options,
"CustomKeycodes",
- pKbd->CustomKeycodes);
- from = X_CONFIG;
- }
-
- xf86Msg(from, "%s: CustomKeycodes %s\n",
- pInfo->name, pKbd->CustomKeycodes ? "enabled" : "disabled");
+ pKbd->CustomKeycodes = xf86SetBoolOption(pInfo->options, "CustomKeycodes",
+ FALSE);
out:
return rc;
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index 05d1bd9..a240087 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -518,8 +518,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
pKbd->OpenKeyboard = OpenKeyboard;
- pKbd->CustomKeycodes = FALSE;
-
pKbd->private = calloc(sizeof(sunKbdPrivRec), 1);
if (pKbd->private == NULL) {
xf86Msg(X_ERROR,"can't allocate keyboard OS private data\n");
commit f45f3dbcf1f2a54d7d6a51d6e9884820cff4be12
Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Date: Fri Feb 11 15:33:00 2011 +0500
Do not print values of Protocol twice
Protocol printed when found in xf86SetStrOption().
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 127b6ab..3b45e22 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -357,7 +357,6 @@ OpenKeyboard(InputInfoPtr pInfo)
free(s);
return FALSE;
}
- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, s);
free(s);
s = xf86SetStrOption(pInfo->options, "Device", NULL);
diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
index 5292f77..e69e1b6 100644
--- a/src/lnx_kbd.c
+++ b/src/lnx_kbd.c
@@ -183,7 +183,6 @@ OpenKeyboard(InputInfoPtr pInfo)
return FALSE;
}
- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, s);
free(s);
s = xf86SetStrOption(pInfo->options, "Device", NULL);
commit 6fca7f2371c113796d4cf27cca5635f3c6fb30af
Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Date: Fri Feb 11 15:32:59 2011 +0500
Remove unused XQUEUE
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/kbd.c b/src/kbd.c
index f4b51ff..43a194e 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -81,11 +81,7 @@ _X_EXPORT InputDriverRec KEYBOARD = {
};
static const char *kbdDefaults[] = {
-#ifdef XQUEUE
- "Protocol", "Xqueue",
-#else
"Protocol", "standard",
-#endif
"XkbRules", "base",
"XkbModel", "pc105",
"XkbLayout", "us",
@@ -94,11 +90,7 @@ static const char *kbdDefaults[] = {
};
static const char *kbd98Defaults[] = {
-#ifdef XQUEUE
- "Protocol", "Xqueue",
-#else
"Protocol", "standard",
-#endif
"XkbRules", "xfree98",
"XkbModel", "pc98",
"XkbLayout", "jp",
commit 8a540fa439bd7ea30c49d43ff3339ab599a7ba14
Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Date: Fri Feb 11 15:32:57 2011 +0500
lnx: Fix detect CustomKeycodes for __powerpc__
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
index 63b51d9..5292f77 100644
--- a/src/lnx_kbd.c
+++ b/src/lnx_kbd.c
@@ -233,7 +233,7 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
f = fopen("/proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes","r");
if (f) {
if (fgetc(f) == '0')
- pKbd->CustomKeycodes = TRUE;
+ xf86ReplaceBoolOption(pInfo->options, "CustomKeycodes", TRUE);
fclose(f);
}
}
commit eabd200d91112c2c060d30a8426c817aa35aa1bb
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 5 14:38:58 2011 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 82f7ef1..11d9c17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.5.0-2) unstable; urgency=low
* Switch to dh:
- Use debhelper 8.
@@ -13,7 +13,7 @@ xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED;
urgency=low
* Bump Standards-Version to 3.9.1 (no changes needed).
* Remove obsolete NEWS file.
- -- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 04:56:35 +0100
+ -- Cyril Brulebois <k...@debian.org> Sat, 05 Feb 2011 14:38:58 +0100
xserver-xorg-input-keyboard (1:1.5.0-1) experimental; urgency=low
commit 3fa08b356631d77e7b488e2649547f00be0a5d87
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Feb 4 11:40:06 2011 +0100
Fix sequence ordering.
Since both the autoreconf and quilt sequences insert a command before
dh_auto_configure, it is important that we use the quilt one in the first
place, so that autoreconf is run on a patched tree. Ditto for dh_clean.
diff --git a/debian/rules b/debian/rules
index 41ee77f..9fb65ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,4 +20,4 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
%:
- dh $@ --with autoreconf,quilt,xsf --builddirectory=build/
+ dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
commit 6b4cce8df5bb83ca2483f4aec0501cc2cee590be
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 3 05:07:58 2011 +0100
Remove obsolete NEWS file.
diff --git a/debian/NEWS b/debian/NEWS
deleted file mode 100644
index b1cdf60..0000000
--- a/debian/NEWS
+++ /dev/null
@@ -1,8 +0,0 @@
-xserver-xorg-input-keyboard (1:1.2.1-1) unstable; urgency=low
-
- The old "keyboard" driver has been removed and is now superseded by the
- "kbd" driver. The corresponding "InputDevice" section in the xorg.conf
- configuration file should be updated by replacing "keyboard" with "kbd"
- on the "Driver" line.
-
- -- Brice Goglin <brice.gog...@ens-lyon.org> Tue, 24 Apr 2007 00:25:19 +0200
diff --git a/debian/changelog b/debian/changelog
index e61b99c..82f7ef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED;
urgency=low
* Update Uploaders list. Thanks, David & Brice!
* Wrap Depends/Provides.
* Bump Standards-Version to 3.9.1 (no changes needed).
+ * Remove obsolete NEWS file.
-- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 04:56:35 +0100
commit 2c2950113258d929a94c925be61bae3a6a9b229b
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 3 05:07:26 2011 +0100
Bump Standards-Version to 3.9.1 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 8d3be59..e61b99c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED;
urgency=low
* Remove long obsolete Replaces.
* Update Uploaders list. Thanks, David & Brice!
* Wrap Depends/Provides.
+ * Bump Standards-Version to 3.9.1 (no changes needed).
-- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 04:56:35 +0100
diff --git a/debian/control b/debian/control
index fa8962a..44b08e7 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
x11proto-randr-dev,
quilt,
xutils-dev (>= 1:7.5+4)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-keyboard
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-keyboard.git
commit a04f55506c3ad27d886354b63ce6b07b19d5ce4a
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 3 05:07:07 2011 +0100
Wrap Depends/Provides.
diff --git a/debian/changelog b/debian/changelog
index cb94845..8d3be59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED; urgency=low
* Remove xsfbs accordingly.
* Remove long obsolete Replaces.
* Update Uploaders list. Thanks, David & Brice!
+ * Wrap Depends/Provides.
-- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 04:56:35 +0100
diff --git a/debian/control b/debian/control
index f7dda34..fa8962a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,12 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-keyboar
Package: xserver-xorg-input-kbd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}
-Provides: ${xinpdriver:Provides}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xinpdriver:Depends},
+Provides:
+ ${xinpdriver:Provides}
Description: X.Org X server -- keyboard input driver
This package provides the driver for keyboard input devices.
.
commit e4e6756f69644ad860e4bd4e9f0baeca6a833a81
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 3 05:06:43 2011 +0100
Update Uploaders list. Thanks, David & Brice!
diff --git a/debian/changelog b/debian/changelog
index 412182f..cb94845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED; urgency=low
- Specify usr/share/man in .install, remove .manpages accordingly.
* Remove xsfbs accordingly.
* Remove long obsolete Replaces.
+ * Update Uploaders list. Thanks, David & Brice!
-- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 04:56:35 +0100
diff --git a/debian/control b/debian/control
index 411c705..f7dda34 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-keyboard
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois
<k...@debian.org>
+Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit c8f2cc7711ace21ae19e1310796d060001242923
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 3 05:06:07 2011 +0100
Remove long obsolete Replaces.
diff --git a/debian/changelog b/debian/changelog
index 60c7386..412182f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED; urgency=low
debhelper sequence.
- Specify usr/share/man in .install, remove .manpages accordingly.
* Remove xsfbs accordingly.
+ * Remove long obsolete Replaces.
-- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 04:56:35 +0100
diff --git a/debian/control b/debian/control
index 67fbee8..411c705 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Package: xserver-xorg-input-kbd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}
Provides: ${xinpdriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- keyboard input driver
This package provides the driver for keyboard input devices.
.
commit d2f657837fe2d676305e366aed157385a780d326
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 3 05:05:52 2011 +0100
Remove xsfbs accordingly.
diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
case, it appears directly in the .diff.gz.
* Otherwise, the patch is added to debian/patches/ which is managed
with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
- git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the "debian-*" branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
diff --git a/debian/changelog b/debian/changelog
index dadb58e..60c7386 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-input-keyboard (1:1.5.0-2) UNRELEASED; urgency=low
- Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf
debhelper sequence.
- Specify usr/share/man in .install, remove .manpages accordingly.
+ * Remove xsfbs accordingly.
-- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 04:56:35 +0100
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
deleted file mode 100755
index 5935cc9..0000000
--- a/debian/xsfbs/repack.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if ! [ -d debian/prune ]; then
- exit 0
-fi
-
-if [ "x$1" != x--upstream-version ]; then
- exit 1
-fi
-
-version="$2"
-filename="$3"
-
-if [ -z "$version" ] || ! [ -f "$filename" ]; then
- exit 1
-fi
-
-dir="$(pwd)"
-tempdir="$(mktemp -d)"
-
-cd "$tempdir"
-tar xf "$dir/$filename"
-cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
-
-tar czf "$dir/$filename" *
-cd "$dir"
-rm -rf "$tempdir"
-echo "Done pruning upstream tarball"
-
-exit 0
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
deleted file mode 100755
index 3c59c20..0000000
--- a/debian/xsfbs/xsfbs.mk
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/usr/bin/make -f
-
-# Debian X Strike Force Build System (XSFBS): Make portion
-
-# Copyright 1996 Stephen Early
-# Copyright 1997 Mark Eichin
-# Copyright 1998-2005, 2007 Branden Robinson
-# Copyright 2005 David Nusinow
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1prkhp-00030d...@alioth.debian.org
