[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-keyboard: Changes to 'debian-experimental'



 .gitignore                  |    4 
 ChangeLog                   |  347 ++++++++++++++++++++++++++++++++
 README                      |   20 +
 configure.ac                |   15 -
 debian/README.source        |   73 ++++++
 debian/changelog            |   26 ++
 debian/control              |    6 
 debian/local/10-x11-kbd.fdi |   11 +
 debian/rules                |    9 
 debian/xsfbs/repack.sh      |   32 ++
 debian/xsfbs/xsfbs.mk       |   21 -
 debian/xsfbs/xsfbs.sh       |  311 -----------------------------
 man/.gitignore              |    2 
 man/kbd.man                 |   19 -
 src/.gitignore              |    6 
 src/bsd_kbd.c               |   47 ----
 src/hurd_kbd.c              |    2 
 src/kbd.c                   |  470 +++++---------------------------------------
 src/lnx_kbd.c               |  239 ----------------------
 src/sco_kbd.c               |   60 -----
 src/sun_kbd.c               |  168 +++++++++++++--
 src/sun_kbd.h               |    1 
 src/sun_kbdMap.c            |   10 
 src/xf86Keymap.h            |    3 
 src/xf86OSKbd.h             |   11 -
 25 files changed, 756 insertions(+), 1157 deletions(-)

New commits:
commit 8d65a073fa378558b32f086d525d2b29982fe0bc
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Dec 5 23:14:47 2009 +0100

    Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index a56b0b0..0370b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-input-keyboard (1:1.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.4.0-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump the build-dep on xutils-dev (>= 1:7.5~1).
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 05 Dec 2009 01:49:03 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Dec 2009 23:14:40 +0100
 
 xserver-xorg-input-keyboard (1:1.3.2-4) unstable; urgency=low
 

commit d27fabe8df0f703b7a3af064db40040105365e59
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Sat Dec 5 02:09:23 2009 +0200

    Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index f519ccd..a56b0b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-keyboard (1:1.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump the build-dep on xutils-dev (>= 1:7.5~1).
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 30 Nov 2009 15:26:50 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 05 Dec 2009 01:49:03 +0200
 
 xserver-xorg-input-keyboard (1:1.3.2-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e933cfb..16e9202 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.or
 Build-Depends:
  debhelper (>= 5),
  pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
  x11proto-kb-dev,
  x11proto-input-dev,
  x11proto-core-dev,

commit 2661472efacf9435b73af4f4e8c7d7508d3db60b
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Mon Nov 30 15:28:58 2009 +0200

    Bump the build-dep on xutils-dev (>= 1:7.5~1).

diff --git a/debian/changelog b/debian/changelog
index 033b2b7..f519ccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-keyboard (1:1.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump the build-dep on xutils-dev (>= 1:7.5~1).
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 30 Nov 2009 15:26:50 +0200
 
diff --git a/debian/control b/debian/control
index 4db4b23..e933cfb 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  dpkg-dev (>= 1.14.17),
  automake,
  libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.3
 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 74896a1331fdd82a6901ad6fc6bcd9892947f57f
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Mon Nov 30 15:27:37 2009 +0200

    Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index ccd0000..6961860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,350 @@
+commit c66f4f9fcc7450f2c1378f6117bda4442d2af8ae
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Oct 7 10:53:14 2009 +1000
+
+    keyboard 1.4.0
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0c75afb4895b60aa08209ccfee9dfad4e4495f4d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Oct 6 17:02:33 2009 +1000
+
+    Remove now un-used autorepeat field.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit adc1048980113b329d97ebf5b974ca4a50fc86ba
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Oct 6 17:00:58 2009 +1000
+
+    Don't use XKB_DFLT_RULES from the server.
+    
+    On Linux, the server uses default rules of "evdev" which doesn't apply for
+    this driver. For all other cases, the server uses "base", so let's just
+    hardcode it here too.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit ecd34ebd43d5a8c0db0a6dd132b61a4c663c7fd8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Oct 6 17:05:56 2009 +1000
+
+    Require macros 1.3 for XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5427034948fd4d59d5d2d50f9188376f23119a72
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Sep 9 11:48:43 2009 +1000
+
+    keyboard 1.3.99.1
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 158d33c15df60696946031a0319e2bd2ec8b9541
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Aug 19 18:56:05 2009 -0700
+
+    sun_kbd: Check if streams module is already on the stack before pushing it
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 891d55e759ff6a30f62809081a11c3da20fc0551
+Author: Aaron Zang <Aaron.Zang@Sun.COM>
+Date:   Thu Aug 13 20:39:59 2009 -0700
+
+    sun_kbd: Use HID ioctl variants to get/set direct mode on usbhid devices
+    
+    When opening a usb hid* device node directly (instead of via the
+    /dev/kbd virtual/coalescing device node), use the HIDIOCKMGDIRECT
+    and HIDIOCKMSDIRECT ioctls instead of the KIO* versions.   When
+    closing the device, always reset back to direct mode, no matter
+    what state we found it in.
+    
+    Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 8e42e8f0034d89ef4b6cee44148961f808ba0602
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Aug 5 15:03:43 2009 -0700
+
+    sun_kbd: re-open keyboard if needed in KbdOn
+    
+    If we closed keyboard in KbdOff, we need to reopen it in KbdOn, or
+    will not be able to type after VT switch.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit bba90b4e87be3ae5a13d69f6d9c60aa97761c8d5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Aug 4 21:31:23 2009 -0700
+
+    Sun bug 6852921: Recycling Xorg runs out of file descriptors in kbd driver
+    
+    http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6852921
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 352aa83c416a78e59be4dfa7d8442e5eec50130a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Aug 4 21:04:24 2009 -0700
+
+    Stop checking for #ifdef __SOL8__ - assume Solaris is at least Solaris 8
+    
+    If you want to run a pre-1999 kernel, you'll need a pre-2009 X server
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit fe8d1f70fc7edce4f030766159aebae8f8a89ffc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Sat May 30 21:12:34 2009 +1000
+
+    Remove ModuleInfoRec.
+    
+    This struct was removed with 2107becb0ce2ffda001be65728c53563496d8d50 from
+    the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 29f075db9f86aa7e5e01688a5fd5e0081210e16b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon May 11 15:30:23 2009 +1000
+
+    Return BadValue if the server failed to init the keyboard. (#21278)
+    
+    If keyboard init failed, we don't have a useful keymap and thus can't
+    continue.
+    This is essentially 0e15697b53c9448ce9911aa6499b2ea0bda92af6 from
+    xserver ported over here.
+    
+    X.Org Bug 21278 <http://bugs.freedesktop.org/show_bug.cgi?id=21278>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7a4d6f396597c4b96e1402dadfcd2c0e5b7b0579
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri May 1 14:47:59 2009 -0700
+
+    Override HKTG & BSlash2 keycodes on Solaris
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 2bc18590e6b7b403dcec22a09820010748c48972
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Apr 30 16:26:23 2009 -0700
+
+    Solaris keyboard fixes for HAL hotplugging support
+    
+    - Handle hot-unplug by checking for ENODEV on read and removing device
+    - Make sure to re-push streams module on resume
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 810fe3a4afd7e77a645c312f9475e75c2f7e925c
+Author: Alan Curry <pacman@kosh.dhis.org>
+Date:   Sat Feb 28 00:53:10 2009 -0500
+
+    KDGETLED needs a char, not an int.
+    
+    KDGETLED actually only stores a single byte at the address indicated by
+    &real_leds, which on big-endian systems means the kernel's led state is put
+    into the most-significant byte of real_leds. The LED_CAP LED_NUM LED_SCR
+    macros then extract some bits from the least-significant byte, which still
+    contains stack garbage since real_leds hasn't been initialized.
+    
+    Don't believe what the console_ioctl(4) man page says. It's wrong. Go read
+    drivers/char/vt_ioctl.c in the kernel source.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0fafdc024624d27ddffdcc4ff0047dec59ef33e2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Apr 2 16:53:53 2009 -0700
+
+    Remove Initialised static variable (not used since xf86AddModuleInfo removal)
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 7b64df0a988674454522e353ea2b56485474af6e
+Author: David Miller <davem@davemloft.net>
+Date:   Tue Feb 24 16:50:22 2009 -0800
+
+    Fix xf86-input-keyboard build on Linux/sparc
+    
+    lnx_kbd.c: Fix Sparc build.
+    
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 62e663e7b107207b474713f22b6fec72f811dd86
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 17:24:21 2009 +1000
+
+    Switch to new XKB API
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ae630aef17185dd8d2c23d0eb1b3287fa6e26268
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Feb 11 09:09:59 2009 +1000
+
+    Really remove autorepeat.
+    
+    This strips all autorepeat from the keyboard driver. If you need autorepeat,
+    use XKB.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 74ffb8e1897e7dd73f1adf3a2cba6b4214cfc77a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Feb 11 09:04:53 2009 +1000
+
+    Don't set xkb repeat rate from the driver.
+
+commit 39b34a293a1502be2529b83575d03a46c5b0f1b9
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 17:28:06 2009 +1000
+
+    No autorepeat handling in the driver.
+    
+    It's bad enough in the server, let's not cook up a driver-specific
+    implementation on top of it.
+    
+    Extracted into separate commits by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9234a0a91ef0c848dead86df831124429c7f528a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Feb 10 17:01:37 2009 +1000
+
+    unifdef XKB and remove all "noXkb" handling.
+    
+    XKB is here to stay. Live with it.
+
+commit 9f95e38282164a617b68e4dedf7b72ebc0fedc3e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 16:47:52 2009 +1000
+
+    nec/jp layout is just "jp" these days.
+    
+    Extracted into separate commits by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit db59771946ac53f78fecf2d75eb165275a45f6aa
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 16:43:46 2009 +1000
+
+    No more special sun keyboards anymore.
+    
+    Extracted into separate commits by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ea428e52f599a6f575bc012b552e14535009d219
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 16:41:06 2009 +1000
+
+    Remove special support for Panix106
+    
+    Let's pretend that if google doesn't know it, it doesn't exist.
+    
+    Extracted into separate commits by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 425c0494e7ff4b7ed0ee7aec3b07a3bce812b9b7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 17:24:32 2009 +1000
+
+    Change KbdCtrlProc to a void
+    
+    6 years to follow an API surely is within reasonably response time, right?
+    
+    Extracted into separate commits by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 218ec4b53cc3e557317e188caf8762eac5e06e71
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 16:39:51 2009 +1000
+
+    Remove leftover ifdef XINPUT.
+    
+    XINPUT has been mandatory for a while now.
+    
+    Extracted into separate commits by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d12d2d2c789e8439ae6f2e63526c49c76c385c8e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Feb 10 16:38:56 2009 +1000
+
+    Remove SpecialKey handling.
+    
+    Are your keys really that special? Really?
+    No. They aren't. Take it from me.
+    
+    Extracted into separate commits by Peter Hutterer.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 862314c8dfced80631b2c7a6e00799fd2956b6dc
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Wed Feb 4 18:59:23 2009 -0200
+
+    Janitor: compiler warnings, .gitignore.
+    
+    Correct common sparse warning about integer used where a pointer
+    is expected. Remaining warnings are about the symbols that the
+    X Server loader should "dlsym()" to load the module, and are
+    extern/exported, but have no declaration anywhere.
+    
+      Use only one .gitignore file in the toplevel directory.
+    
+    Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 69d38cbda4ecff87dc63dd26cfae4262c1e6161c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 30 20:23:32 2009 -0800
+
+    Add README with pointers to mailing list, bugzilla & git repos
+
+commit 14267d89087c21071fde1960f77cceee49a6e551
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 20 16:54:21 2009 -0800
+
+    Use XKB_DFLT_RULES from xorg-server.h for default xkb rules filename
+
+commit f9857c498803ce8e5902df7319d2928b0db8cd49
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 9 14:50:56 2009 -0800
+
+    Add note on hal-based configuration to man page
+
+commit ba47bfd9c4ebab0c71f7918127506817378d9eef
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jan 7 10:02:23 2009 -0800
+
+    Move ifdefs to clear "warning: statement has no consequent: if"
+
+commit fb9c07cbf0339922816007f2d35c501266a439b1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jan 7 09:58:36 2009 -0800
+
+    Make LED masks more consistently unsigned long to clear compiler/lint warnings
+
+commit 2fde7c02565384ce774c20face9755359c5d5946
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jan 7 09:56:12 2009 -0800
+
+    Remove unused variables from Solaris code
+
 commit 708ecbf8557d9e676e3bb07c1f83170f6d9f7cd7
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Wed Jan 7 15:09:01 2009 -0200
diff --git a/debian/changelog b/debian/changelog
index ce8d885..033b2b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-keyboard (1:1.4.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 30 Nov 2009 15:26:50 +0200
+
 xserver-xorg-input-keyboard (1:1.3.2-4) unstable; urgency=low
 
   * Add README.source, bump Standards-Version to 3.8.3.

commit c66f4f9fcc7450f2c1378f6117bda4442d2af8ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Oct 7 10:53:14 2009 +1000

    keyboard 1.4.0
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index cbcb0be..c26e402 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-keyboard],
-        1.3.99.1,
+        1.4.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-keyboard)
 

commit 0c75afb4895b60aa08209ccfee9dfad4e4495f4d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Oct 6 17:02:33 2009 +1000

    Remove now un-used autorepeat field.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/src/kbd.c b/src/kbd.c
index b2e858f..556d594 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -307,7 +307,6 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl)
    leds = ctrl->leds & ~(XCAPS | XNUM | XSCR); /* ??? */
    pKbd->leds = leds;
   pKbd->SetLeds(pInfo, pKbd->leds);
-  pKbd->autoRepeat = ctrl->autoRepeat;
 }
 
 static void
diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h
index 2732649..daeabf1 100644
--- a/src/xf86OSKbd.h
+++ b/src/xf86OSKbd.h
@@ -69,7 +69,6 @@ typedef struct {
 
     int			bell_pitch;
     int			bell_duration;
-    Bool		autoRepeat;
     unsigned long	leds;
     unsigned long	xledsMask;
     unsigned long	keyLeds;

commit adc1048980113b329d97ebf5b974ca4a50fc86ba
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Oct 6 17:00:58 2009 +1000

    Don't use XKB_DFLT_RULES from the server.
    
    On Linux, the server uses default rules of "evdev" which doesn't apply for
    this driver. For all other cases, the server uses "base", so let's just
    hardcode it here too.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/src/kbd.c b/src/kbd.c
index c86c2fc..b2e858f 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -113,12 +113,6 @@ static const OptionInfoRec KeyboardOptions[] = {
     { -1,			NULL,		  OPTV_NONE,	{0}, FALSE }
 };
 
-/* Xorg 1.6 and earlier put the default XKB rules file in __XKBDEFRULES__
-   in xorg-server.h, later versions switched to XKB_DFLT_RULES */
-#if !defined(XKB_DFLT_RULES) && defined(__XKBDEFRULES__)
-# define XKB_DFLT_RULES __XKBDEFRULES__
-#endif
-
 static const char *kbdDefaults[] = {
 #ifdef XQUEUE 
     "Protocol",		"Xqueue",
@@ -126,7 +120,7 @@ static const char *kbdDefaults[] = {
     "Protocol",		"standard",
 #endif
     "AutoRepeat",	"500 30",
-    "XkbRules",		XKB_DFLT_RULES,
+    "XkbRules",		"base",
     "XkbModel",		"pc105",
     "XkbLayout",	"us",
     "CustomKeycodes",	"off",

commit ecd34ebd43d5a8c0db0a6dd132b61a4c663c7fd8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Oct 6 17:05:56 2009 +1000

    Require macros 1.3 for XORG_DEFAULT_OPTIONS
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index 9b41f79..cbcb0be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,9 @@ AC_INIT([xf86-input-keyboard],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-keyboard)
 
-# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and
-# XORG_CHANGELOG macros
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2.1)
+# Require xorg-macros version 1.3 or newer for XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_AUX_DIR(.)
@@ -112,7 +111,7 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto)
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto $REQUIRED_MODULES)
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
 AC_SUBST([XORG_CFLAGS])
 
@@ -121,8 +120,4 @@ AC_SUBST([XORG_CFLAGS])
 # Checks for header files.
 AC_HEADER_STDC
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile src/Makefile man/Makefile])

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 25 16:39:23 2009 +0200

    xsfbs.mk: remove more obsolete code
    
    We can use plain debconf-updatepo, and don't need to clean the 'imports'
    directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
 	dh_testdir
 	rm -rf .pc
 	rm -rf $(STAMP_DIR)
-	rm -rf imports
-	dh_clean debian/shlibs.local \
-	         debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-	sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
-	  -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-	debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+	dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 25 15:43:28 2009 +0200

    xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
    
    These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
 	dh_testdir
 	rm -rf .pc
-	rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+	rm -rf $(STAMP_DIR)
 	rm -rf imports
 	dh_clean debian/shlibs.local \
 	         debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
 	      | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
 	    sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
 	        -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-	        -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
 	      <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
 	    rm $$MAINTSCRIPT.tmp; \
 	  fi; \

commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 25 15:33:39 2009 +0200

    xsfbs.sh: fix typo and remove svn keyword

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 # This is the X Strike Force shell library for X Window System package
 # maintainer scripts.  It serves to define shell functions commonly used by
 # such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
 # removal tasks.
 
 # If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
 # skip past this library by scanning forward in this file to the string
 # "GOBSTOPPER".
 

commit 5427034948fd4d59d5d2d50f9188376f23119a72
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Sep 9 11:48:43 2009 +1000

    keyboard 1.3.99.1
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index aab639c..9b41f79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-keyboard],
-        1.3.2,
+        1.3.99.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-keyboard)
 

commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:53:36 2009 +0200

    xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
 	#                                    debian/*.prerm
 	>$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-	cat debian/*.shlibs >$@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:47:09 2009 +0200

    xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n "$1" ]; then
-    # does the operand contain any whitespace?
-    if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
-      # can't use die(), because I want to avoid forward references
-      echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
-           "possibly malicious garbage \"$1\"" >&2
-      exit $SHELL_LIB_THROWN_ERROR
-    fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:23:53 2009 +0200

    xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-    msg
-
-  reject_whitespace "$1"
-  message "Searching for overlapping packages..."
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-    if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
-      possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-        "(xbase-clients|x11-common|xfs|xlibs)")
-      if [ -n "$possible_culprits" ]; then
-        smoking_guns=$(grep -l "$1" $possible_culprits || true)
-        if [ -n "$smoking_guns" ]; then
-          bad_packages=$(printf "\\n")
-          for f in $smoking_guns; do
-            # too bad you can't nest parameter expansion voodoo
-            p=${f%*.list}      # strip off the trailing ".list"
-            package=${p##*/}   # strip off the directories
-            bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
-          done
-          msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install".  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove".  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System.  You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
-          message "$msg"
-          message "The overlapping packages are: $bad_packages"
-        else
-          message "no overlaps found."
-        fi
-      fi
-    else
-      message "cannot search; no matches for $dpkg_info_dir/*.list."
-    fi
-  else
-    message "cannot search; $dpkg_info_dir does not exist."
-  fi
-}
-
 font_update () {
   # run $UPDATECMDS in $FONTDIRS
 

commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:23:06 2009 +0200

    xsfbs.sh: remove unused maplink function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-
-maplink () {
-  # returns what symlink should point to; i.e., what the "sane" answer is
-  # Keep this in sync with the debian/*.links files.
-  # This is only needed for symlinks to directories.
-  #
-  # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
-  # If we've stopped using this function, fixing it might enable us to re-enable
-  # it again and catch more errors.
-  case "$1" in
-    /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
-    /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
-    /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
-    /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
-    /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
-    /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
-    /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
-    /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
-    /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
-    /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
-    /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
-    /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
-    /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
-    /usr/bin/X11) echo ../X11R6/bin ;;
-    /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
-    /usr/include/X11) echo ../X11R6/include/X11 ;;
-    /usr/lib/X11) echo ../X11R6/lib/X11 ;;
-    *) internal_error "maplink() called with unknown path \"$1\"" ;;
-  esac
-}
-
 find_culprits () {
   local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
     msg

commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:21:34 2009 +0200

    xsfbs.sh: remove unused analyze_path

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
   esac
 }
 
-analyze_path () {
-  # given a supplied set of pathnames, break each one up by directory and do an
-  # ls -dl on each component, cumulatively; i.e.
-  # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
-  # Thanks to Randolph Chung for this clever hack.
-
-  local f g
-
-  while [ -n "$1" ]; do
-    reject_whitespace "$1"
-    g=
-    message "Analyzing $1:"
-    for f in $(echo "$1" | tr / \  ); do
-      if [ -e /$g$f ]; then
-        ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
-        g=$g$f/
-      else
-        message "/$g$f: nonexistent; directory contents of /$g:"
-        ls -l /$g
-        break
-      fi
-    done
-    shift
-  done
-}
-
 find_culprits () {
   local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
     msg

commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:20:11 2009 +0200

    xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
   fi
 }
 
-check_symlink () {
-  # syntax: check_symlink symlink
-  #
-  # See if specified symlink points where it is supposed to.  Return 0 if it
-  # does, and 1 if it does not.
-  #
-  # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
-  local symlink
-
-  # validate arguments
-  if [ $# -ne 1 ]; then
-    usage_error "check_symlink() called with wrong number of arguments;" \
-                "expected 1, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  symlink="$1"
-


Reply to: