From c8d7f9138e8bfb34ca4825d72c394057f55a8f28 Mon Sep 17 00:00:00 2001
From: Giacomo Catenazzi <cate@debian.org>
Date: Thu, 6 Aug 2009 08:32:33 +0200
Subject: [PATCH] Import Debian changes 1.9.5.3-4

g15daemon (1.9.5.3-4) unstable; urgency=low

  * Try to load uinput module, in order to have Gx key working
    (Closes: #475000).
  * Usual updates
---
 debian/changelog      |  8 ++++++++
 debian/control        |  8 ++++----
 debian/docs           |  1 -
 debian/g15daemon.docs |  4 ++++
 debian/g15daemon.init | 22 ++++++++++++++++++++++
 5 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 debian/g15daemon.docs

diff --git a/debian/changelog b/debian/changelog
index 63cbb6e..63a80cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+g15daemon (1.9.5.3-4) unstable; urgency=low
+
+  * Try to load uinput module, in order to have Gx key working
+    (Closes: #475000).
+  * Usual updates
+
+ -- Giacomo Catenazzi <cate@debian.org>  Thu, 06 Aug 2009 08:32:33 +0200
+
 g15daemon (1.9.5.3-3) unstable; urgency=low
 
   * Changing default in /etc/default/g15daemon: Use L1 key instead of MR
diff --git a/debian/control b/debian/control
index 0430797..3c0ab82 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Priority: extra
 Maintainer: Giacomo Catenazzi <cate@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), autotools-dev, automake1.9, libtool,
  libg15-dev, libg15render-dev (>=1.2.0.svn250-2), libusb-dev, libfreetype6-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
 Homepage: http://www.g15tools.com/
 
 Package: g15daemon
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, libg15daemon-client1 (=${binary:Version})
+Depends: libg15daemon-client1 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
 Recommends: xkb-data ( >= 0.9+cvs.20070428-1)
 Description:  Screen multiplexer for Logitech G15 Keyboard
  G15daemon provides multiple virtual screens for the LCD on the Logitech
@@ -22,14 +22,14 @@ Description:  Screen multiplexer for Logitech G15 Keyboard
 Package: libg15daemon-client1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Development packages for libg15daemon-client
  Includes the files needed for developing g15daemon clients
 
 Package: libg15daemon-client-dev
 Section: libdevel
 Architecture: any
-Depends: libg15daemon-client1 (= ${binary:Version})
+Depends: libg15daemon-client1 (= ${binary:Version}), ${misc:Depends}
 Description: Development packages for libg15daemon-client
  Includes the files needed for developing g15daemon clients
 
diff --git a/debian/docs b/debian/docs
index 73286e9..5502ed8 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,3 @@
-FAQ
 NEWS
 README
 TODO
diff --git a/debian/g15daemon.docs b/debian/g15daemon.docs
new file mode 100644
index 0000000..73286e9
--- /dev/null
+++ b/debian/g15daemon.docs
@@ -0,0 +1,4 @@
+FAQ
+NEWS
+README
+TODO
diff --git a/debian/g15daemon.init b/debian/g15daemon.init
index b40bb0b..aacab04 100644
--- a/debian/g15daemon.init
+++ b/debian/g15daemon.init
@@ -31,9 +31,31 @@ fi
 
 set -e
 
+
+load_uinput () {
+    DEVICE=/dev/input/uinput
+    DEV=".none."
+    if [ ! -e "$DEVICE" ] ; then
+	modprobe -q uinput || true
+        for i in `seq 80`; do
+            if [ -e "$DEVICE" ]; then
+                DEV="$DEVICE"
+                break
+            fi
+            echo -n "."
+            sleep 0.1
+        done
+        if [ "$DEV" = ".none." ]; then
+            echo -n "Warning: uinput ($DEVICE) doesn't exist. The G-keys are unsupported..."
+        fi
+    fi
+}
+
+
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
+	load_uinput
 	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
 		--exec $DAEMON -- $DAEMON_OPTS
 	echo "$NAME."