Import Debian changes 1.9.0-2

g15daemon (1.9.0-2) unstable; urgency=low

  * Updates: better init.d scripts (with support for L1 key)
  * install also the sample plugin (clock, net, uinput)

Documentation/g15daemon_client_devel.3

@@ -1,6 +1,5 @@
 .TH "G15daemon Client Development" "" "1.0" "G15Daemon" ""
-.SH "NAME"
+.SH "NAME" g15daemon_client \- G15Daemon Server / Client communication for g15daemon.
-g15daemon_client \- G15Daemon Server / Client communication for g15daemon.
 .SH "SYNOPSIS"
 #include <libg15.h>
 .br 

debian/README.Debian

@@ -1,7 +1,35 @@
 g15daemon for Debian
 --------------------
 
-KDE:
-If you have KDE, on keyboard setting, you should choose "G15daemon"
 
- -- Giacomo Catenazzi <cate@debian.org>  Mon, 27 Aug 2007 20:00:20 +0200
+Debian 'xkeyboard-config' package already have support for g15
+keyboards, so you don't need to exec 'xmodmap' as described on
+original documentations.  Anywaym you should configure your
+xorg.conf file, so that xorg will understand the extra keys.
+
+To have the full support of the extra keys, you should edit the
+xorg configuration file /etc/X11/xorg.conf .  The 'XkbModel' should
+be "logitech_g15".
+
+I.e. on my machine:
+
+Section "InputDevice"
+        Identifier      "Generic Keyboard"
+        Driver          "kbd"
+        Option          "CoreKeyboard"
+        Option          "XkbRules"      "xorg"
+        Option          "XkbModel"      "logitech_g15"
+        Option          "XkbLayout"     "us"
+EndSection
+
+
+Also in KDE and gnome you should set the g15daemon keyboard.
+In KDE you find the configuration in:
+  Control Center
+    Regional & Accessibility
+      Keyboard Layout
+        On the right at the top "Keyboard model" select:
+        "Logitech G15 extra keys via G15daemon"
+
+
+ -- Giacomo Catenazzi <cate@debian.org>  Mon, 30 Aug 2007 08:04:22 +0200

debian/changelog

@@ -1,3 +1,10 @@
+g15daemon (1.9.0-2) unstable; urgency=low
+
+  * Updates: better init.d scripts (with support for L1 key)
+  * install also the sample plugin (clock, net, uinput)
+
+ -- Giacomo Catenazzi <cate@debian.org>  Thu, 30 Aug 2007 23:31:18 +0200
+
 g15daemon (1.9.0-1) unstable; urgency=low
 
   * New upstream release

debian/control

@@ -8,7 +8,8 @@ Standards-Version: 3.7.2
 Package: g15daemon
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client (=${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client1 (=${binary:Version})
+Recommends: xkeyboard-config ( >= 0.9+cvs.20070428-1)
 Description:  Screen multiplexer for Logitech G15 Keyboard
  G15daemon provides multiple virtual screens for the LCD on the Logitech
  G11 and G15 keyboards.
@@ -16,7 +17,7 @@ Description:  Screen multiplexer for Logitech G15 Keyboard
  This package contain the daemon and a generic client to talk to the
  daemon.
 
-Package: libg15daemon-client
+Package: libg15daemon-client1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -26,7 +27,7 @@ Description: Development packages for libg15daemon-client
 Package: libg15daemon-client-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client1 (= ${binary:Version})
 Description: Development packages for libg15daemon-client
  Includes the files needed for developing g15daemon clients
 

debian/docs

@@ -1,5 +1,4 @@
 FAQ
 NEWS
 README
-README.usage
 TODO

debian/g15daemon.default

@@ -1,10 +1,12 @@
 # Defaults for g15daemon initscript
-# sourced by /etc/init.d/g15daemon
-# installed at /etc/default/g15daemon by the maintainer scripts
 
+# SWITCH_KEY selects  the key used to switch between client screens
 #
-# This is a POSIX shell fragment
+# SWITCH_KEY="MR"   to use the MR key (on top left) (default)
-#
+# SWITCH_KEY="L1    to use the L1 key: the small round key below the LCD
+
+
+SWITCH_KEY="MR"
 
 # Additional options that are passed to the Daemon.
 DAEMON_OPTS=""

debian/g15daemon.init

@@ -25,6 +25,10 @@ if [ -f /etc/default/g15daemon ] ; then
 	. /etc/default/g15daemon
 fi
 
+if [ "$SWITCH_KEY" = "L1" ]; then
+	DAEMON_OPTS="-s $DAEMON_OPTS"
+fi
+
 set -e
 
 case "$1" in
@@ -36,6 +40,7 @@ case "$1" in
 	;;
   stop)
 	echo -n "Stopping $DESC: "
+	$DAEMON -k
 	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
 		--exec $DAEMON
 	echo "$NAME."

debian/g15daemon.install

@@ -1 +1,6 @@
-g15daemon/g15daemon usr/sbin
+debian/tmp/usr/sbin/g15daemon usr/sbin
+debian/tmp/usr/share/g15daemon/plugins/g15plugin_uinput.so usr/lib/g15daemon/plugins/
+debian/tmp/usr/share/g15daemon/plugins/g15plugin_tcpserver.so usr/lib/g15daemon/plugins/
+debian/tmp/usr/share/g15daemon/plugins/g15plugin_clock.so usr/lib/g15daemon/plugins/
+debian/tmp/usr/share/g15daemon/splash/g15logo2.wbmp usr/lib/g15daemon/splash/
+

debian/libg15daemon-client-dev.install

@@ -1,6 +1,5 @@
-usr/include/*
+debian/tmp/usr/include/* usr/include/
-usr/lib/lib*.a
+debian/tmp/usr/lib/lib*.a usr/lib/
-usr/lib/lib*.so
+debian/tmp/usr/lib/lib*.so usr/lib/
-usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*.la usr/lib/
-usr/lib/*.la
+
-usr/share/pkgconfig/*

debian/libg15daemon-client1.install

@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.* usr/lib/