Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d60b7cda8c | ||
|
|
e8c4c975f1 | ||
|
|
037748dad9 | ||
|
|
9fefc4aace | ||
|
|
65139593fe | ||
|
|
acd26f4e1b | ||
|
|
9b57b2e29c | ||
|
|
107f0d8a79 | ||
|
|
7d071c32b7 |
No files matched your search
Vendored
+25
-1
@@ -1,3 +1,28 @@
|
||||
g15daemon (1.9.5.3-13) unstable; urgency=medium
|
||||
|
||||
* Move binaries to /usr.
|
||||
* Trim trailing whitespace.
|
||||
* Update standards version to 4.6.1, no changes needed.
|
||||
* Remove field Section on binary package g15daemon that duplicates source.
|
||||
|
||||
-- Andrej Shadura <andrewsh@debian.org> Sun, 26 Nov 2023 14:15:41 +0000
|
||||
|
||||
g15daemon (1.9.5.3-12) unstable; urgency=medium
|
||||
|
||||
* Add -fcommon compiler flag for compatibility with GCC 10.
|
||||
(Closes: bug#957243)
|
||||
* Compliant to policy 4.5.0
|
||||
|
||||
-- Alexander Ponyatykh <lazyranma@gmail.com> Tue, 28 Jul 2020 23:37:13 +0300
|
||||
|
||||
g15daemon (1.9.5.3-11) unstable; urgency=medium
|
||||
|
||||
* Reinitialize on eny error code, not only on a negative one.
|
||||
* Remove unused variables. (Closes: bug#688465)
|
||||
* Compliant to policy 4.4.1
|
||||
|
||||
-- Alexander Ponyatykh <lazyranma@gmail.com> Tue, 19 Nov 2019 00:50:44 +0300
|
||||
|
||||
g15daemon (1.9.5.3-10) unstable; urgency=medium
|
||||
|
||||
* Rebuild (no source changes).
|
||||
@@ -208,4 +233,3 @@ g15daemon (1.2.7-1) unstable; urgency=low
|
||||
* Initial release
|
||||
|
||||
-- Giacomo Catenazzi <cate@debian.org> Mon, 27 Aug 2007 20:00:20 +0200
|
||||
|
||||
Vendored
+2
-2
@@ -6,17 +6,17 @@ Uploaders:
|
||||
Andrej Shadura <andrewsh@debian.org>
|
||||
Build-Depends:
|
||||
debhelper-compat (= 12),
|
||||
dh-sequence-movetousr,
|
||||
libfreetype6-dev,
|
||||
libg15-dev (>= 1.2.7-3),
|
||||
libg15render-dev (>= 1.2.0.svn250-2),
|
||||
libtool
|
||||
Standards-Version: 4.1.4
|
||||
Standards-Version: 4.6.1
|
||||
Homepage: https://sourceforge.net/projects/g15daemon/
|
||||
Vcs-Browser: https://salsa.debian.org/debian/g15daemon
|
||||
Vcs-Git: https://salsa.debian.org/debian/g15daemon.git
|
||||
|
||||
Package: g15daemon
|
||||
Section: utils
|
||||
Architecture: any
|
||||
Pre-Depends:
|
||||
${misc:Pre-Depends}
|
||||
|
||||
+6
-5
@@ -3,20 +3,21 @@ Description: Reinitialize on any libusb error.
|
||||
Author: Alexander Ponyatykh <lazyranma@gmail.com>
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libusb/+bug/1357556
|
||||
Forwarded: no
|
||||
Last-Update: 2015-05-18
|
||||
Last-Update: 2019-11-17
|
||||
===================================================================
|
||||
--- a/g15daemon/main.c
|
||||
+++ b/g15daemon/main.c
|
||||
@@ -204,10 +204,10 @@
|
||||
@@ -203,11 +203,10 @@
|
||||
g15daemon_send_event(masterlist->current->lcd,
|
||||
G15_EVENT_KEYPRESS, keypresses);
|
||||
lastkeys = keypresses;
|
||||
|
||||
-
|
||||
- }else if(retval == -ENODEV && LIBG15_VERSION>=1200) {
|
||||
+ }else if(retval < 0 && LIBG15_VERSION>=1200) {
|
||||
+ }else if(retval != G15_NO_ERROR && retval != G15_ERROR_TIMEOUT && LIBG15_VERSION>=1200) {
|
||||
+ g15daemon_log(LOG_WARNING,"Keyboard error (%d).. Reinitializing\n", retval);
|
||||
pthread_mutex_lock(&g15lib_mutex);
|
||||
while((retval=re_initLibG15() != G15_NO_ERROR) && !leaving){
|
||||
- g15daemon_log(LOG_WARNING,"Keyboard has gone.. Retrying\n");
|
||||
+ g15daemon_log(LOG_WARNING,"Keyboard error (%d).. Reinitializing\n", retval);
|
||||
sleep(1);
|
||||
}
|
||||
if(!leaving) {
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
Description: Remove unused variables
|
||||
Global variable keyhandler is declared as pointer to incomplete struct type.
|
||||
Upon closer inspection, it turned out that this variable and
|
||||
client_handles_keys are unused.
|
||||
Author: Alexander Ponyatykh <lazyranma@gmail.com>
|
||||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688465
|
||||
Last-Update: 2019-11-18
|
||||
===================================================================
|
||||
--- a/g15daemon/linked_lists.c
|
||||
+++ b/g15daemon/linked_lists.c
|
||||
@@ -30,8 +30,6 @@
|
||||
#include <g15daemon.h>
|
||||
#include <libg15.h>
|
||||
|
||||
-extern lcd_t *keyhandler;
|
||||
-extern unsigned int client_handles_keys;
|
||||
extern plugin_info_t *generic_info;
|
||||
|
||||
lcd_t static * ll_create_lcd () {
|
||||
@@ -175,12 +173,6 @@
|
||||
(*masterlist)->current->lcd->state_changed = 1;
|
||||
}
|
||||
|
||||
- if(&oldnode->lcd == (void*)keyhandler) {
|
||||
- client_handles_keys = 0;
|
||||
- keyhandler = NULL;
|
||||
- g15daemon_log(LOG_WARNING,"Client key handler quit, going back to defaults");
|
||||
- }
|
||||
-
|
||||
if((*masterlist)->head!=oldnode){
|
||||
(*next)->prev = oldnode->prev;
|
||||
(*prev)->next = oldnode->next;
|
||||
--- a/g15daemon/main.c
|
||||
+++ b/g15daemon/main.c
|
||||
@@ -53,9 +53,7 @@
|
||||
int keyboard_backlight_off_onexit = 0;
|
||||
unsigned int g15daemon_debug = 0;
|
||||
unsigned int cycle_key;
|
||||
-unsigned int client_handles_keys = 0;
|
||||
static unsigned int set_backlight = 0;
|
||||
-struct lcd_t *keyhandler = NULL;
|
||||
|
||||
static int loaded_plugins = 0;
|
||||
|
||||
Vendored
+1
@@ -5,3 +5,4 @@
|
||||
05-send-a-sync-event-after-key-up-down.diff
|
||||
06-fix-buffer-overflow.diff
|
||||
07-reinit-on-any-error.diff
|
||||
08-remove-unused-variables.diff
|
||||
Vendored
+1
@@ -1,6 +1,7 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
DH_VERBOSE = 1
|
||||
export DEB_CFLAGS_MAINT_APPEND = -fcommon
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
Reference in new issue
Block a user