Update the changelog

This allows g15daemon to continue working after keyboard was
replugged and after suspend or hibernate.

LP: #1357556

debian/README.Debian

@@ -1,10 +0,0 @@
-libg15 for Debian
------------------
-
-Notes about hardware
-
-Notes about configuration of other packages
-
-
-
- -- Giacomo Catenazzi <cate@debian.org>  Mon, 27 Aug 2007 07:56:10 +0200

debian/changelog

@@ -1,3 +1,19 @@
+libg15 (1.2.7-3) unstable; urgency=medium
+
+  * Reintroduce package (Closes: #928159).
+  * New maintainer.
+  * Remove redundant documentation files.
+  * debian/patches/00-fix-reinit.patch: fix re_initLibG15() to properly reset
+    internal state, allowing g15daemon to continue working after keyboard was
+    replugged and after suspend or hibernate (LP: #1357556).
+  * Use 3.0 (quilt) source format.
+  * Switch to dh from cdbs.
+  * Drop redundant build dependencies.
+  * Update the homepage.
+  * Multiarchify the package.
+
+ -- Alexander Ponyatykh <lazyranma@gmail.com>  Fri, 10 May 2019 11:45:05 +0200
+
 libg15 (1.2.7-2) unstable; urgency=low
 
   * add list-missing to debian/rules

debian/compat

@@ -1 +1 @@
-5
+12

debian/control

@@ -1,14 +1,15 @@
 Source: libg15
 Section: libs
 Priority: optional
-Maintainer: Giacomo Catenazzi <cate@debian.org>
+Maintainer: Alexander Ponyatykh <lazyranma@gmail.com>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libusb-dev
+Build-Depends: debhelper (>=12), libusb-dev
-Standards-Version: 3.8.3
+Standards-Version: 4.3.0
-Homepage: http://www.g15tools.com/
+Homepage: https://sourceforge.net/projects/g15tools/
 
 Package: libg15-1
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Library for interfacing with the Logitech G15 keyboards
  libg15 provides an API for low level control of the LCD display and
@@ -20,6 +21,7 @@ Package: libg15-dev
 Section: libdevel
 Depends: libg15-1 (= ${binary:Version}), ${misc:Depends}
 Architecture: any
+Multi-Arch: same
 Description: Library for interfacing with the Logitech G15 keyboards
  libg15 provides an API for low level control of the LCD display and
  the extra keys on some Logitech keyboards (G11, G15).

debian/libg15-1.install

@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib/
+debian/tmp/usr/lib/*/lib*.so.*

debian/libg15-dev.install

@@ -1,4 +1,3 @@
-debian/tmp/usr/include/* usr/include/
+debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a usr/lib/
+debian/tmp/usr/lib/*/lib*.a
-debian/tmp/usr/lib/lib*.so usr/lib/
+debian/tmp/usr/lib/*/lib*.so
-

debian/libg15.install

@@ -1 +1 @@
-usr/lib/libg15*.so.*
+usr/lib/*/libg15*.so.*

debian/patches/00-fix-reinit.patch

@@ -0,0 +1,85 @@
+Description: fix re_initLibG15() to properly reset internal state.
+Author: Alexander Ponyatykh <lazyranma@gmail.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libusb/+bug/1357556
+Forwarded: no
+Last-Update: 2015-05-17
+===================================================================
+--- a/libg15.c
++++ b/libg15.c
+@@ -275,19 +275,36 @@
+     return keyboard_device;
+ }
+ 
++/* reset the keyboard, returning it to a known state */
++static int closeKeyboardDevice()
++{
++    int retval = G15_NO_ERROR;
++
++    enospc_slowdown = shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0;
++    found_devicetype = -1;
++
++    if (keyboard_device){
++#ifndef SUN_LIBUSB
++        retval = usb_release_interface (keyboard_device, 0);
++        usleep(50*1000);
++#endif
++#if 0
++        retval = usb_reset(keyboard_device);
++        usleep(50*1000);
++#endif
++        usb_close(keyboard_device);
++        keyboard_device=0;
++        return retval;
++    }
++    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;
++    usb_find_busses();
++    usb_find_devices();
+   
+     keyboard_device = findAndOpenG15();
+     if (!keyboard_device)
+@@ -319,28 +336,12 @@
+     return retval;
+ }
+ 
+-/* reset the keyboard, returning it to a known state */
+ int exitLibG15()
+ {
+-    int retval = G15_NO_ERROR;
+-    if (keyboard_device){
+-#ifndef SUN_LIBUSB
+-        retval = usb_release_interface (keyboard_device, 0);
+-        usleep(50*1000);
+-#endif
+-#if 0
+-        retval = usb_reset(keyboard_device);
+-        usleep(50*1000);
+-#endif
+-        usb_close(keyboard_device);
+-        keyboard_device=0;
+-        pthread_mutex_destroy(&libusb_mutex);
+-        return retval;
+-    }
+-    return -1;
++    pthread_mutex_destroy(&libusb_mutex);
++    return closeKeyboardDevice();
+ }
+ 
+-
+ static void dumpPixmapIntoLCDFormat(unsigned char *lcd_buffer, unsigned char const *data)
+ {
+ /*

debian/patches/series

@@ -0,0 +1 @@
+00-fix-reinit.patch

debian/rules

@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
-  
+
+DH_VERBOSE = 1
+
 DEB_DH_MAKESHLIBS_ARGS_libg15 := --version-info
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
-include /usr/share/cdbs/1/class/autotools.mk
+	dh $@
-include /usr/share/cdbs/1/rules/utils.mk
 
-common-binary-predeb-arch:: list-missing
+override_dh_makeshlibs:
-
+	dh_makeshlibs --version-info=None
-
-DEB_CONFIGURE_EXTRA_FLAGS = --quiet

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)