Import Debian changes 1.9.0-wip.20070910-3

g15daemon (1.9.0-wip.20070910-3) unstable; urgency=low

  * first try to make a debian/rules full working for
    svn and released version
  * fix directory fixes (closes: #442296)

Documentation/g15daemon_client_devel.3

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

debian/README.Debian

@@ -1,6 +1,35 @@
 g15daemon for Debian
 --------------------
 
-<possible notes regarding this package - if none, delete this file>
 
- -- Anthony J. Mirabella <mirabeaj@gmail.com>, Thu, 28 Sep 2006 04:46:06 -0400
+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,6 +1,40 @@
-g15daemon (1.2.1-1) breezy; urgency=low
+g15daemon (1.9.0-wip.20070910-3) unstable; urgency=low
+
+  * first try to make a debian/rules full working for
+    svn and released version
+  * fix directory fixes (closes: #442296)
+  
+ -- Giacomo Catenazzi <cate@debian.org>  Fri, 14 Sep 2007 20:59:27 +0200
+
+g15daemon (1.9.0-wip.20070910-2) unstable; urgency=low
+
+  * pause() instead of busy loop.
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 11 Sep 2007 06:12:01 +0200
+
+g15daemon (1.9.0-wip.20070910-1) unstable; urgency=low
+
+  * New upstream release (from svn)
+  * Don't install plugin in /usr/share (Closes: #441619)
+
+ -- Giacomo Catenazzi <cate@debian.org>  Mon, 10 Sep 2007 23:02:14 +0200
+
+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
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 28 Aug 2007 20:09:54 +0200
+
+g15daemon (1.2.7-1) unstable; urgency=low
 
   * Initial release
 
- -- Anthony J. Mirabella <mirabeaj@gmail.com>  Thu, 28 Sep 2006 04:46:06 -0400
+ -- Giacomo Catenazzi <cate@debian.org>  Mon, 27 Aug 2007 20:00:20 +0200
 

debian/compat

@@ -1 +1 @@
-4
+5

debian/control

@@ -1,28 +1,33 @@
 Source: g15daemon
 Section: utils
 Priority: optional
-Maintainer: Anthony J. Mirabella <mirabeaj@gmail.com>
+Maintainer: Giacomo Catenazzi <cate@debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libg15-dev, libg15render-dev
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, automake1.9, libtool, libg15-dev, libg15render-dev, libusb-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: g15daemon
+Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client (= ${Source-Version})
+Depends: ${shlibs:Depends}, libg15daemon-client1 (=${binary:Version})
-Description: Screen multiplexer for Logitech G15 Keyboard
+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
- G15 Keyboard
+ G11 and G15 keyboards.
+ .
+ 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}
-Description: Client library for communicating with g15daemon
+Description: Development packages for libg15daemon-client
- Provides interface functions for clients that wish to communicate with
+ Includes the files needed for developing g15daemon clients
- a running instance of g15daemon
 
 Package: libg15daemon-client-dev
 Section: libdevel
 Architecture: any
-Depends: libg15daemon-client (= ${Source-Version})
+Depends: libg15daemon-client1 (= ${binary:Version})
 Description: Development packages for libg15daemon-client
  Includes the files needed for developing g15daemon clients
+

debian/copyright

@@ -1,10 +1,28 @@
-This package was debianized by Anthony J. Mirabella <mirabeaj@gmail.com> on
+This package was debianized by Giacomo A. Catenazzi <cate@debian.org> on
-Thu, 28 Sep 2006 04:46:06 -0400.
+Mon, 27 Aug 2007 20:00:20 +0200.
 
-It was downloaded from <fill in ftp site>
+It was downloaded from http://g15daemon.sourceforge.net/
 
-Copyright Holder: <put author(s) name and email here>
+Upstream Authors: 
+
+    Mike Lampard <mlampard@users.sf.net>
+    Sven Ludwig
+    James Green
+    Philip Lawatsch <philip@lawatsch.at>
+
+Copyright:
+
+    Copyright (c) 2006 Mike Lampard, Philip Lawatsch, and others
 
 License:
 
-<Put the license of the package here>
+    g15tools is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+License can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is (C) 2007, Giacomo Catenazzi <cate@debian.org> and
+is licensed under the GPL v2 (or later), see `/usr/share/common-licenses/GPL-2'.
+

debian/dirs

@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

debian/docs

@@ -1,3 +1,4 @@
+FAQ
 NEWS
 README
 TODO

debian/g15daemon.default

@@ -0,0 +1,12 @@
+# Defaults for g15daemon initscript
+
+# SWITCH_KEY selects  the key used to switch between client screens
+#
+# 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

@@ -0,0 +1,89 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:          g15daemon
+# Required-Start:    $local_fs
+# Required-Stop:     $local_fs
+# Should-Start:      $remote_fs
+# Should-Stop:       $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: load deamon for Logitech G15 keyboard lcd display
+# Description:       load deamon for Logitech G15 keyboard lcd display
+### END INIT INFO
+
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/g15daemon
+NAME=g15daemon
+DESC=g15daemon
+
+test -x $DAEMON || exit 0
+
+# Include g15daemon defaults if available
+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
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	$DAEMON -k
+	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart" except that it does nothing if the
+	#   daemon isn't already running.
+	# check wether $DAEMON is running. If so, restart
+	start-stop-daemon --stop --test --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON \
+	&& $0 restart \
+	|| exit 0
+	;;
+  restart)
+    echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	sleep 1
+	start-stop-daemon --start --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

debian/g15daemon.install

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

debian/g15daemon.manpages

@@ -0,0 +1 @@
+Documentation/g15daemon.1

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/

debian/libg15daemon-client1.manpages

@@ -0,0 +1 @@
+Documentation/g15daemon_client_devel.3

debian/rules

@@ -1,107 +1,26 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 
-# These are used for cross-compiling and for saving the configure script
+AUTOMAKE_REMOVE := Makefile Makefile.in */Makefile */Makefile.in configure aclocal.m4
-# from having to guess our platform (since we know it already)
+AUTOMAKE_REMOVE += *.lo *.o *.la */*.lo */*.o */*.la
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+AUTOMAKE_REMOVE += g15daemon/g15daemon g15daemon/g15daemontest
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+AUTOMAKE_REMOVE += config.status config.log config.h config.h.in config/* libtool stamp-h1
+AUTOMAKE_REMOVE += */.libs/
+
+clean::
+	-rm -Rf $(AUTOMAKE_REMOVE)
+
+makebuilddir:: Makefile
 
 
-CFLAGS = -Wall -g
+Makefile:: Makefile.am autogen.sh
+	[ -d config ] || mkdir config
+	aclocal -I config
+	libtoolize --automake --force --copy
+	autoheader
+	automake --add-missing --copy
+	autoconf
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+include /usr/share/cdbs/1/rules/debhelper.mk
-	CFLAGS += -O0
+include /usr/share/cdbs/1/class/autotools.mk
-else
-	CFLAGS += -O2
-endif
 
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/g15daemon.sgml > g15daemon.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/g15daemon.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install -a --sourcedir=debian/tmp
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman Documentation/g15daemon.1  Documentation/g15daemon_client_devel.3
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

debian/watch

@@ -0,0 +1,7 @@
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://sf.net/g15daemon/g15daemon-([1-9].*)\.tar\.bz2
+

g15daemon/g15_plugins.c

@@ -46,7 +46,7 @@
 
 #include <libg15render.h>
 
-extern int leaving;
+extern volatile int leaving;
 
 void * g15daemon_dlopen_plugin(char *name,unsigned int library) {
 

g15daemon/main.c

@@ -49,7 +49,7 @@
 #endif
 
 /* all threads will exit if leaving >0 */
-int leaving = 0;
+volatile int leaving = 0;
 int keyboard_backlight_off_onexit = 0;
 unsigned int g15daemon_debug = 0;
 unsigned int cycle_key;
@@ -464,7 +464,7 @@ int main (int argc, char *argv[])
     	sigaction(SIGUSR1, &new_action, NULL);
         
         do {
-            sleep(1);
+            pause();
   
         } while( leaving == 0);