diff --git a/debian/changelog b/debian/changelog index c9ecc57..6c1ca7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ +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 Fri, 18 Dec 2009 07:52:26 +0100 + g15daemon (1.9.5.3-7) unstable; urgency=low - * Don't distribute .la file + * Change priority of libg15daemon-client1 from extra to optional + (mumble package needs it) - -- Giacomo Catenazzi Thu, 08 Oct 2009 07:22:15 +0200 + -- Giacomo Catenazzi Tue, 01 Sep 2009 19:50:38 +0200 g15daemon (1.9.5.3-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 3c0ab82..af9ab91 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: g15daemon Section: utils Priority: extra Maintainer: Giacomo Catenazzi -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 diff --git a/debian/libg15daemon-client-dev.install b/debian/libg15daemon-client-dev.install index 2c3b74d..e4dec96 100644 --- a/debian/libg15daemon-client-dev.install +++ b/debian/libg15daemon-client-dev.install @@ -1,4 +1,5 @@ debian/tmp/usr/include/* usr/include/ debian/tmp/usr/lib/lib*.a usr/lib/ debian/tmp/usr/lib/lib*.so usr/lib/ +debian/tmp/usr/lib/*.la usr/lib/ diff --git a/debian/rules b/debian/rules index 28679cd..496a85a 100755 --- a/debian/rules +++ b/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 @@ -23,9 +24,9 @@ AUTOMAKE_REMOVE += */.libs/ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/utils.mk -common-binary-predeb-arch:: list-missing +DEB_CONFIGURE_EXTRA_FLAGS = --quiet --disable-rpath -DEB_CONFIGURE_EXTRA_FLAGS = --quiet +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 diff --git a/g15daemon/main.c b/g15daemon/main.c index d0189ed..f9323fa 100644 --- a/g15daemon/main.c +++ b/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++; } diff --git a/g15daemon/utility_funcs.c b/g15daemon/utility_funcs.c index b8352da..67cca62 100644 --- a/g15daemon/utility_funcs.c +++ b/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++)