Import Debian changes 1.9.0-wip.20070910-5

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

  * change priority to "extra"
  * force libg15render-dev versioned dependencies

debian/changelog

@@ -1,3 +1,30 @@
+g15daemon (1.9.0-wip.20070910-5) unstable; urgency=low
+
+  * change priority to "extra"
+  * force libg15render-dev versioned dependencies
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 09 Oct 2007 13:28:56 +0200
+
+g15daemon (1.9.0-wip.20070910-4) unstable; urgency=low
+
+  * Correct building errors (closes: #441919, #442995)
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 18 Sep 2007 20:29:54 +0200
+
+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)

debian/control

@@ -1,8 +1,9 @@
 Source: g15daemon
 Section: utils
-Priority: optional
+Priority: extra
 Maintainer: Giacomo Catenazzi <cate@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, automake1.9, libtool, libg15-dev, libg15render-dev, libusb-dev
+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.2
 
 Package: g15daemon

debian/copyright

@@ -23,6 +23,6 @@ License:
 
 License can be found in the file `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2007, Giacomo A. Catenazzi <cate@debian.org> and
+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/g15daemon.install

@@ -1,6 +1,6 @@
 debian/tmp/usr/sbin/g15daemon usr/sbin
-debian/tmp/usr/lib/g15daemon/1.9pre/plugins/g15plugin_uinput.so usr/lib/g15daemon/plugins-1.9pre/
+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/plugins/1.9pre/
+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/plugins-1.9pre/
+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/rules

@@ -1,14 +1,22 @@
 #!/usr/bin/make -f
 
-DEB_MAKE_CLEAN_TARGET = distclean
+
+AUTOMAKE_REMOVE := Makefile Makefile.in */Makefile */Makefile.in configure aclocal.m4
+AUTOMAKE_REMOVE += *.lo *.o *.la */*.lo */*.o */*.la
+AUTOMAKE_REMOVE += g15daemon/g15daemon g15daemon/g15daemontest
+AUTOMAKE_REMOVE += config.status config.log config.h config.h.in config/* libtool stamp-h1
+AUTOMAKE_REMOVE += */.libs/
 
 clean::
-	-rm config/* configure config.log config.status Makefile.in */Makefile.in aclocal.m4 config.h.in Makefile
+	-rm -Rf $(AUTOMAKE_REMOVE)
 
-pre-build::
+makebuilddir:: Makefile
+
+
+Makefile:: Makefile.am autogen.sh
 	[ -d config ] || mkdir config
 	aclocal -I config
-	libtoolize --force --copy
+	libtoolize --automake --force --copy
 	autoheader
 	automake --add-missing --copy
 	autoconf
@@ -16,4 +24,3 @@ pre-build::
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-

debian/watch

@@ -3,6 +3,5 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-http://sf.net/g15daemon/g15daemon-(.*)\.tar\.bz2
+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);