From 854430b9b8044d8e8b536488fadc54e20b2e262a Mon Sep 17 00:00:00 2001 From: Alexander Ponyatykh Date: Thu, 14 Nov 2019 00:08:14 +0300 Subject: [PATCH] =?UTF-8?q?Update=20packaging:=20=20*=20Remove=20watch=20f?= =?UTF-8?q?ile.=20=20*=20=D0=A1onformant=20to=20policy=204.4.1.1.=20=20*?= =?UTF-8?q?=20Remove=20obsolete=20variable=20from=20debian/rules.=20=20*?= =?UTF-8?q?=20Add=20Vcs=20fileds=20to=20debian/control?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 ++++++ debian/control | 5 +++-- debian/patches/00-fix-reinit.patch | 34 +++++++++++++++--------------- debian/rules | 2 -- debian/watch | 7 ------ 5 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index cd1bbe5..c2cf7c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libg15 (1.3.0~svn324-1) unstable; urgency=medium + + * New upstream version 1.3.0~svn324 + - Support for G13, G110 and G510 devices (closes: bug#622898). + + -- Alexander Ponyatykh Thu, 14 Nov 2019 00:03:11 +0300 + libg15 (1.2.7-3) unstable; urgency=medium * Reintroduce package (Closes: #928159). diff --git a/debian/control b/debian/control index 71291c5..944dd10 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,12 @@ Section: libs Priority: optional Maintainer: Alexander Ponyatykh Build-Depends: debhelper (>=12), libusb-dev -Standards-Version: 4.3.0 +Standards-Version: 4.4.1 Homepage: https://sourceforge.net/projects/g15tools/ +Vcs-Git: https://salsa.debian.org/debian/libg15.git +Vcs-Browser: https://salsa.debian.org/debian/libg15 Package: libg15-1 -Section: libs Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/patches/00-fix-reinit.patch b/debian/patches/00-fix-reinit.patch index ea6c91e..04e9674 100644 --- a/debian/patches/00-fix-reinit.patch +++ b/debian/patches/00-fix-reinit.patch @@ -6,18 +6,25 @@ Last-Update: 2015-05-17 =================================================================== --- a/libg15.c +++ b/libg15.c -@@ -275,19 +275,36 @@ +@@ -283,19 +283,36 @@ return keyboard_device; } +- +-int re_initLibG15() +/* reset the keyboard, returning it to a known state */ +static int closeKeyboardDevice() -+{ + { + int retval = G15_NO_ERROR; -+ + +- usb_init(); + enospc_slowdown = shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0; + found_devicetype = -1; -+ + +- /** +- * usb_find_busses and usb_find_devices both report the number of devices +- * / busses added / removed since the last call. since this is the first +- * call we have to return values != 0 or else we didnt find anything */ + if (keyboard_device){ +#ifndef SUN_LIBUSB + retval = usb_release_interface (keyboard_device, 0); @@ -34,25 +41,18 @@ Last-Update: 2015-05-17 + return -1; +} - int re_initLibG15() - { -+ closeKeyboardDevice(); - -- usb_init(); -- -- /** -- * usb_find_busses and usb_find_devices both report the number of devices -- * / busses added / removed since the last call. since this is the first -- * call we have to return values != 0 or else we didnt find anything */ -- - if (!usb_find_devices()) - return G15_ERROR_OPENING_USB_DEVICE; ++int re_initLibG15() ++{ ++ closeKeyboardDevice(); ++ + usb_find_busses(); + usb_find_devices(); - + keyboard_device = findAndOpenG15(); if (!keyboard_device) -@@ -319,28 +336,12 @@ +@@ -327,28 +344,12 @@ return retval; } diff --git a/debian/rules b/debian/rules index 0cd220d..8c6f976 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,6 @@ DH_VERBOSE = 1 -DEB_DH_MAKESHLIBS_ARGS_libg15 := --version-info - %: dh $@ diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 891d4bb..0000000 --- a/debian/watch +++ /dev/null @@ -1,7 +0,0 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -http://sf.net/g15tools libg15-(.*)\.tar\.gz -