mikhail/libg15
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update packaging:

Browse Source 
* Remove watch file.
 * Сonformant to policy 4.4.1.1.
 * Remove obsolete variable from debian/rules.
 * Add Vcs fileds to debian/control
This commit is contained in:
Alexander Ponyatykh committed 2019-11-14 00:29:44 +03:00
1 parent 63fce22fd8
commit 854430b9b8
5 files changed
+27 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

debian/changelog
Vendored
+7
View File
@@ -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 <lazyranma@gmail.com> Thu, 14 Nov 2019 00:03:11 +0300
libg15 (1.2.7-3) unstable; urgency=medium libg15 (1.2.7-3) unstable; urgency=medium
* Reintroduce package (Closes: #928159). * Reintroduce package (Closes: #928159).
debian/control
Vendored
+3 -2
View File
@@ -3,11 +3,12 @@ Section: libs
Priority: optional Priority: optional
Maintainer: Alexander Ponyatykh <lazyranma@gmail.com> Maintainer: Alexander Ponyatykh <lazyranma@gmail.com>
Build-Depends: debhelper (>=12), libusb-dev Build-Depends: debhelper (>=12), libusb-dev
Standards-Version: 4.3.0 Standards-Version: 4.4.1
Homepage: https://sourceforge.net/projects/g15tools/ 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 Package: libg15-1
Section: libs
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
debian/patches/00-fix-reinit.patch
Vendored
+17 -17
View File
@@ -6,18 +6,25 @@ Last-Update: 2015-05-17
=================================================================== ===================================================================
--- a/libg15.c --- a/libg15.c
+++ b/libg15.c +++ b/libg15.c
@@ -275,19 +275,36 @@ @@ -283,19 +283,36 @@
return keyboard_device; return keyboard_device;
} }
-
-int re_initLibG15()
+/* reset the keyboard, returning it to a known state */ +/* reset the keyboard, returning it to a known state */
+static int closeKeyboardDevice() +static int closeKeyboardDevice()
+{ {
+ int retval = G15_NO_ERROR; + int retval = G15_NO_ERROR;
+
- usb_init();
+ enospc_slowdown = shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0; + enospc_slowdown = shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0;
+ found_devicetype = -1; + 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){ + if (keyboard_device){
+#ifndef SUN_LIBUSB +#ifndef SUN_LIBUSB
+ retval = usb_release_interface (keyboard_device, 0); + retval = usb_release_interface (keyboard_device, 0);
@@ -34,25 +41,18 @@ Last-Update: 2015-05-17
+ return -1; + 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()) - if (!usb_find_devices())
- return G15_ERROR_OPENING_USB_DEVICE; - return G15_ERROR_OPENING_USB_DEVICE;
+int re_initLibG15()
+{
+ closeKeyboardDevice();
+
+ usb_find_busses(); + usb_find_busses();
+ usb_find_devices(); + usb_find_devices();
keyboard_device = findAndOpenG15(); keyboard_device = findAndOpenG15();
if (!keyboard_device) if (!keyboard_device)
@@ -319,28 +336,12 @@ @@ -327,28 +344,12 @@
return retval; return retval;
} }
debian/rules
Vendored
-2
View File
@@ -2,8 +2,6 @@
DH_VERBOSE = 1 DH_VERBOSE = 1
DEB_DH_MAKESHLIBS_ARGS_libg15 := --version-info
%: %:
dh $@ dh $@
debian/watch
Vendored
-7
View File
@@ -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