diff --git a/Documentation/g15daemon_client_devel.3 b/Documentation/g15daemon_client_devel.3 index e59b991..89937c9 100644 --- a/Documentation/g15daemon_client_devel.3 +++ b/Documentation/g15daemon_client_devel.3 @@ -1,4 +1,6 @@ .TH "G15daemon Client Development" "" "1.0" "G15Daemon" "" +.SH "NAME" +g15daemon_client \- G15Daemon Server / Client communication for g15daemon. .SH "SYNOPSIS" #include .br diff --git a/debian/README.Debian b/debian/README.Debian index 58ea07b..36fd7d3 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,6 +1,7 @@ g15daemon for Debian -------------------- - +KDE: +If you have KDE, on keyboard setting, you should choose "G15daemon" - -- Anthony J. Mirabella , Thu, 28 Sep 2006 04:46:06 -0400 + -- Giacomo Catenazzi Mon, 27 Aug 2007 20:00:20 +0200 diff --git a/debian/changelog b/debian/changelog index 6c4ff91..ddbbcff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ -g15daemon (1.2.1-1) breezy; urgency=low +g15daemon (1.9.0-1) unstable; urgency=low - * Initial release + * New upstream release - -- Anthony J. Mirabella Thu, 28 Sep 2006 04:46:06 -0400 + -- Giacomo Catenazzi Tue, 28 Aug 2007 20:09:54 +0200 + +g15daemon (1.2.7-1) unstable; urgency=low + + * Initial release + + -- Giacomo Catenazzi Mon, 27 Aug 2007 20:00:20 +0200 diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 201ca73..647d5a6 100644 --- a/debian/control +++ b/debian/control @@ -1,28 +1,32 @@ Source: g15daemon Section: utils Priority: optional -Maintainer: Anthony J. Mirabella -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libg15-dev, libg15render-dev -Standards-Version: 3.6.2 +Maintainer: Giacomo Catenazzi +Build-Depends: cdbs, debhelper (>= 5), autotools-dev +Standards-Version: 3.7.2 Package: g15daemon +Section: utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client (= ${Source-Version}) -Description: Screen multiplexer for Logitech G15 Keyboard +Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client (=${binary:Version}) +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 Section: libs Architecture: any -Depends: ${shlibs:Depends} -Description: Client library for communicating with g15daemon - Provides interface functions for clients that wish to communicate with - a running instance of g15daemon +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-client (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client (= ${binary:Version}) Description: Development packages for libg15daemon-client Includes the files needed for developing g15daemon clients + diff --git a/debian/copyright b/debian/copyright index 15bc9de..649c1da 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,28 @@ -This package was debianized by Anthony J. Mirabella on -Thu, 28 Sep 2006 04:46:06 -0400. +This package was debianized by Giacomo A. Catenazzi on +Mon, 27 Aug 2007 20:00:20 +0200. -It was downloaded from +It was downloaded from http://g15daemon.sourceforge.net/ -Copyright Holder: +Upstream Authors: + + Mike Lampard + Sven Ludwig + James Green + Philip Lawatsch + +Copyright: + + Copyright (c) 2006 Mike Lampard, Philip Lawatsch, and others License: - + 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 A. Catenazzi and +is licensed under the GPL v2 (or later), see `/usr/share/common-licenses/GPL-2'. + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..ca882bb --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/debian/docs b/debian/docs index 5502ed8..65b0e67 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,5 @@ +FAQ NEWS README +README.usage TODO diff --git a/debian/g15daemon.default b/debian/g15daemon.default new file mode 100644 index 0000000..3bed6cc --- /dev/null +++ b/debian/g15daemon.default @@ -0,0 +1,10 @@ +# Defaults for g15daemon initscript +# sourced by /etc/init.d/g15daemon +# installed at /etc/default/g15daemon by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" diff --git a/debian/g15daemon.init b/debian/g15daemon.init new file mode 100644 index 0000000..3db3486 --- /dev/null +++ b/debian/g15daemon.init @@ -0,0 +1,84 @@ +#! /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 + +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: " + 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 diff --git a/debian/g15daemon.install b/debian/g15daemon.install index dde41c6..c7edb79 100644 --- a/debian/g15daemon.install +++ b/debian/g15daemon.install @@ -1 +1 @@ -usr/sbin/* +g15daemon/g15daemon usr/sbin diff --git a/debian/g15daemon.manpages b/debian/g15daemon.manpages new file mode 100644 index 0000000..fb76596 --- /dev/null +++ b/debian/g15daemon.manpages @@ -0,0 +1 @@ +Documentation/g15daemon.1 diff --git a/debian/libg15daemon-client.manpages b/debian/libg15daemon-client.manpages new file mode 100644 index 0000000..197204d --- /dev/null +++ b/debian/libg15daemon-client.manpages @@ -0,0 +1 @@ +Documentation/g15daemon_client_devel.3 diff --git a/debian/rules b/debian/rules index 9456ed0..1921a86 100755 --- a/debian/rules +++ b/debian/rules @@ -1,107 +1,5 @@ #!/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. + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -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 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..69e3b7f --- /dev/null +++ b/debian/watch @@ -0,0 +1,8 @@ +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://sf.net/g15daemon/g15daemon-(.*)\.tar\.bz2 + + diff --git a/g15daemon/main.c b/g15daemon/main.c index d5bc2b2..f264a9c 100644 --- a/g15daemon/main.c +++ b/g15daemon/main.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include