Import Debian changes 1.9.5.3-8.2

g15daemon (1.9.5.3-8.2) unstable; urgency=low

  * Non-maintainer upload.
  * Use ATTR instead of SYSFS in udev rules (closes: #573434).
  * Remove references to other libraries from dependency_libs field
    (closes: #629592).

debian/changelog

@@ -1,3 +1,33 @@
+g15daemon (1.9.5.3-8.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use ATTR instead of SYSFS in udev rules (closes: #573434).
+  * Remove references to other libraries from dependency_libs field
+    (closes: #629592).
+
+ -- Luk Claes <luk@debian.org>  Tue, 31 May 2011 07:33:52 +0200
+
+g15daemon (1.9.5.3-8.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Send a sync event after key up/down (closes: #567213).
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 25 Jul 2010 11:39:22 +0200
+
+g15daemon (1.9.5.3-8) unstable; urgency=low
+
+  * Put the third argument (modes) on open with O_CREAT (Closes: #559649)
+  * remove rpath
+
+ -- Giacomo Catenazzi <cate@debian.org>  Fri, 18 Dec 2009 07:52:26 +0100
+
+g15daemon (1.9.5.3-7) unstable; urgency=low
+
+  * Change priority of libg15daemon-client1 from extra to optional
+    (mumble package needs it)
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 01 Sep 2009 19:50:38 +0200
+
 g15daemon (1.9.5.3-6) unstable; urgency=low
 
   * Shared devices (lcd dispaly + audio) are not good handled

debian/control

@@ -2,7 +2,7 @@ Source: g15daemon
 Section: utils
 Priority: extra
 Maintainer: Giacomo Catenazzi <cate@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, automake1.9, libtool,
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, automake1.9, libtool, chrpath,
  libg15-dev, libg15render-dev (>=1.2.0.svn250-2), libusb-dev, libfreetype6-dev
 Standards-Version: 3.8.2
 Homepage: http://www.g15tools.com/
@@ -21,6 +21,7 @@ Description:  Screen multiplexer for Logitech G15 Keyboard
 
 Package: libg15daemon-client1
 Section: libs
+Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Development packages for libg15daemon-client

debian/g15daemon.udev

@@ -4,17 +4,17 @@
 #
 
 # Logitech g11 -- extra keys, no LCD
-SYSFS{idVendor}=="046d", SYSFS{idProduct}=="c225", RUN+="/etc/init.d/g15daemon udev"
+ATTR{idVendor}=="046d", ATTR{idProduct}=="c225", RUN+="/etc/init.d/g15daemon udev"
 
 # Logitech G15 (blue) -- extra keys and LCD
-SYSFS{idVendor}=="046d", SYSFS{idProduct}=="c222", RUN+="/etc/init.d/g15daemon udev"
+ATTR{idVendor}=="046d", ATTR{idProduct}=="c222", RUN+="/etc/init.d/g15daemon udev"
 
 # Logitech G15 v2 (orange) -- extra keys and LCD
-SYSFS{idVendor}=="046d", SYSFS{idProduct}=="c227", RUN+="/etc/init.d/g15daemon shared-udev"
+ATTR{idVendor}=="046d", ATTR{idProduct}=="c227", RUN+="/etc/init.d/g15daemon shared-udev"
 
 # Logitech Z10 -- extra keys and LCD
-SYSFS{idVendor}=="046d", SYSFS{idProduct}=="0a07", RUN+="/etc/init.d/g15daemon udev"
+ATTR{idVendor}=="046d", ATTR{idProduct}=="0a07", RUN+="/etc/init.d/g15daemon udev"
 
 # Logitech G15 Gamepanel -- extra keys and LCD
-SYSFS{idVendor}=="046d", SYSFS{idProduct}=="c251", RUN+="/etc/init.d/g15daemon shared-udev"
+ATTR{idVendor}=="046d", ATTR{idProduct}=="c251", RUN+="/etc/init.d/g15daemon shared-udev"
 

debian/rules

@@ -7,7 +7,8 @@ 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::
+clean::
+	-rm -Rf debian/docs libg15daemon-client.install
 #	-rm -Rf $(AUTOMAKE_REMOVE)
 
 #makebuilddir:: Makefile
@@ -24,5 +25,10 @@ AUTOMAKE_REMOVE += */.libs/
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --quiet
+DEB_CONFIGURE_EXTRA_FLAGS = --quiet --disable-rpath
 
+install/libg15daemon-client1::
+	chrpath --delete $(DEB_DESTDIR)/usr/lib/libg15daemon_client.so.1.0.2 $(DEB_DESTDIR)/usr/lib/g15daemon/1.9.5.3/plugins/*.so $(DEB_DESTDIR)/usr/sbin/g15daemon
+
+common-install-arch::
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`

g15daemon/main.c

@@ -96,11 +96,10 @@ int g15daemon_send_event(void *caller, unsigned int event, unsigned long value)
                   displaying->backlight_state %= 3; // limit to 0-2 inclusive 
                 }
                 if(value & G15_KEY_M1 && value & G15_KEY_M3) {
-#define FILENAME_SIZE 128
                   static int scr_num=0;
-                  char filename[FILENAME_SIZE];
+                  char filename[128];
                   lcd_t *displaying = lcd->masterlist->current->lcd;
-                  snprintf(filename, FILENAME_SIZE, "/tmp/g15daemon-sc-%i.pbm",scr_num);
+                  sprintf(filename,"/tmp/g15daemon-sc-%i.pbm",scr_num);
                   uf_screendump_pbm(displaying->buf,filename);
                   scr_num++;
                 }

g15daemon/utility_funcs.c

@@ -356,7 +356,7 @@ int uf_conf_write(g15daemon_t *list,char *filename)
     config_items_t * item=NULL;
     char line[1024];
     
-    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC);
+    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC, 0644);
     if(config_fd){
     snprintf(line,1024,"# G15Daemon Configuration File\n# any items entered before a [section] header\n# will be in the Global config space\n# comments you wish to keep should start with a semicolon';'\n");
     write(config_fd,line,strlen(line));
@@ -674,15 +674,16 @@ int uf_screendump_pbm(unsigned char *buffer,char *filename) {
     memcpy(canvas->buffer,buffer,LCD_BUFSIZE);
     fd = open(filename, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
     if(fd == -1) {
-	g15daemon_log(LOG_WARNING, "uf_screendump_pbm failed: open, %s.\n", strerror(errno));
-	return -1;
+       g15daemon_log(LOG_WARNING, "uf_screendump_pbm failed: open, %s.\n", strerror(errno));
+       return -1;
     }
     f = fdopen(fd,"w");
     if(f==NULL) {
-	close(fd);
+       close(fd);
         g15daemon_log(LOG_WARNING, "uf_screendump_pbm failed: fdopen, %s.\n", strerror(errno));
         return -1;
     }
+
     fprintf(f,"P1\n160 43\n");
     fprintf(f,"# G15 screendump - %s\n\n",filename);
     for(y=0;y<43;y++)

plugins/g15_plugin_uinput.c

@@ -125,6 +125,13 @@ static void g15_uinput_keydown(unsigned char code)
     event.value = G15KEY_DOWN;
     
     write (uinp_fd, &event, sizeof(event));
+
+    memset(&event, 0, sizeof(event));
+
+    event.type = EV_SYN;
+    event.code = SYN_REPORT;
+
+    write (uinp_fd, &event, sizeof(event));
 }
 
 static void g15_uinput_keyup(unsigned char code)
@@ -137,6 +144,13 @@ static void g15_uinput_keyup(unsigned char code)
     event.value = G15KEY_UP;
     
     write (uinp_fd, &event, sizeof(event));
+
+    memset(&event, 0, sizeof(event));
+
+    event.type = EV_SYN;
+    event.code = SYN_REPORT;
+
+    write (uinp_fd, &event, sizeof(event));
 }
 
     void (*keyup)(unsigned char code) = &g15_uinput_keyup;