Update the changelog

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

LP: #1357556

debian/changelog

@@ -1,61 +1,60 @@
-libg15 1.2.7 edgy; urgency=low
-  * Fix keypress detection for G15v2 keyboards
+libg15 (1.2.7-3) unstable; urgency=medium
 
- -- Anthony J. Mirabella <mirabeaj@gmail.com>  Mon, 24 Nov 2008 22:48:13 -0500
+  * 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.
 
-libg15 1.2.6 edgy; urgency=low
-  * Re-Add 5BYTE_RETURN flag. Auto-detect does not work with Solaris' libusb.
-  * Add laptop GamePanel support.
+ -- Alexander Ponyatykh <lazyranma@gmail.com>  Fri, 10 May 2019 11:45:05 +0200
 
-libg15 1.2.5 edgy; urgency=low
-  * Remove 5BYTE_RETURN flag and process key packets based on length. Please
-    report any regressions.
-  * Add Solaris detection and remove locks if detected.  Solaris' libUSB
-    blocks on read, forcing mutexes causes writes to block too.
+libg15 (1.2.7-2) unstable; urgency=low
 
-libg15 1.2.4 edgy; urgency=low
-  * Turns out that the newer G15's have a different (5 byte) keyboard protocol.  
-  * Optimise dumpPixmapIntoLCDFormat routine - Thanks to Adam Nielsen
+  * add list-missing to debian/rules
+  * Don't export the .la file (see debian-devel@l.d.o)
+  * We are conformant to policy 2.8.3
 
-libg15 1.2.3 edgy; urgency=low
-  * Add support for the newer G15 keyboards which have amber backlights and
-    six 'G' keys.
+ -- Giacomo Catenazzi <cate@debian.org>  Thu, 10 Sep 2009 08:19:39 +0200
 
-libg15 1.2.2 edgy; urgency=low
-  * Add support for the logitech Z-10 speakers - many thanks to Dwayne Fontenot for
-    detailed information and debugging.
+libg15 (1.2.7-1) unstable; urgency=low
 
-libg15 (1.2.1) edgy; urgency=low
-  * Add debugging function to enable/disable extra output
-  * All debugging output is now prefixed with libg15 to aid localising
-    problems.
-  * debugging function now also controls libusb debugging output.
-  * Try to claim usb interface up to 10 times before failing
-  * Slow down initialisation, to allow keyboard to come out of usb
-    auto-suspend on newer kernels.
-  * Attempt to combat ENOSPC by slowing down writes to the lcd if ENOSPC is
-    received.  Unless that error occurs at least once, transfers are sent as normal.
-  * Add function to change keyboard backlight (independant of lcd backlight).
-  * Add re-initialising function, which will attempt to reconnect a keyboard
-    that was previously removed and replugged.
-  * libg15 now uses pthread mutexes to force sequential access to the bus via
-    libusb.  Control message URBs are no longer being lost if sent by a different
-    thread in the middle of a screen transfer etc.
-  * Reset the keyboard before init to ensure correct initialisation on
-    kernels > 2.6.19
+  * New upstream release
 
-libg15 (1.1.1-1) edgy; urgency=low
+ -- Giacomo Catenazzi <cate@debian.org>  Wed, 22 Apr 2009 07:24:53 +0200
 
-  * Add basic support for the G11 keyboard
-  * revert all bulk transfers - bulk transfers are illegal for low-speed
-    devices, and cause -22 (EINVAL) warnings on new kernels.
-  * pass most errors to the client app.
+libg15 (1.2.6-1) unstable; urgency=low
 
- -- Anthony J. Mirabella <mirabeaj@gmail.com>  Fri, 15 Dec 2006 05:17:49 -0500
+  * New upstream release
 
-libg15 (1.0-1) breezy; urgency=low
+ -- Giacomo Catenazzi <cate@debian.org>  Mon, 28 Jan 2008 07:58:11 +0100
+
+libg15 (1.2.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Giacomo Catenazzi <cate@debian.org>  Wed, 09 Jan 2008 08:06:33 +0100
+
+libg15 (1.2.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 18 Dec 2007 08:08:43 +0100
+
+libg15 (1.2.3-1) unstable; urgency=low
+
+  * New upstrem version: add support of new g15 keyboards
+
+ -- Giacomo Catenazzi <cate@debian.org>  Thu, 15 Nov 2007 07:44:43 +0100
+
+libg15 (1.2.2-1) unstable; urgency=low
 
   * Initial release
 
- -- Anthony J. Mirabella <mirabeaj@gmail.com>  Sun, 24 Sep 2006 22:57:06 -0400
+ -- Giacomo Catenazzi <cate@debian.org>  Mon, 27 Aug 2007 07:56:10 +0200
 

debian/compat

@@ -1 +1 @@
-4
+12

debian/control

@@ -1,21 +1,30 @@
 Source: libg15
-Priority: optional
-Maintainer: Mike Lampard <mlampard@users.sourceforge.net>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libusb-dev
-Standards-Version: 3.6.2
 Section: libs
+Priority: optional
+Maintainer: Alexander Ponyatykh <lazyranma@gmail.com>
+Build-Depends: debhelper (>=12), libusb-dev
+Standards-Version: 4.3.0
+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
+ the extra keys on some Logitech keyboards (G11, G15)
+ .
+ This package contains the shared library and the runtime data.
 
 Package: libg15-dev
 Section: libdevel
+Depends: libg15-1 (= ${binary:Version}), ${misc:Depends}
 Architecture: any
-Depends: libg15 (= ${Source-Version})
-Description: Development packages for libg15
- Includes the files needed for developing software that uses libg15.
+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).
+ .
+ This package contains the header files and the static library.
 
-Package: libg15
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Library for interfacing with the Logitech G15 Keyboard
- Provides for low-level control of the lcd and extra keys on the 
- Logitech G15 keyboard.

debian/copyright

@@ -1,12 +1,30 @@
-This package was debianized by Anthony J. Mirabella <mirabeaj@gmail.com> on
-Sun, 24 Sep 2006 22:57:06 -0400.
+This package was debianized by Giacomo A. Catenazzi <cate@debian.org> on
+Mon, 27 Aug 2007 07:56:10 +0200.
 
-It was downloaded from sourceforge.net
+It was downloaded from http://g15tools.sourceforge.net/
 
-Copyright Holders: Philip Lawatsch <philip@lawatsch.at>
-		   Alex Ibrado <alex@ibrado.org>
-		   Autotools support added by Anthony J. Mirabella <mirabeaj@gmail.com>
+Upstream Authors: 
+
+    Philip Lawatsch <philip@lawatsch.at>
+    Alex Ibrado <alex@ibrado.org>
+    Anthony J. Mirabella <mirabeaj@gmail.com>
+
+Copyright: 
+
+    Copyright (C) 2006,2007	Philip Lawatsch <philip@lawatsch.at>
+				Alex Ibrado <alex@ibrado.org>
+				Anthony J. Mirabella <mirabeaj@gmail.com>
 
 License:
 
-GPL
+    g15tools is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+License can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+
+The Debian packaging is (C) 2007, Giacomo A. Catenazzi <cate@debian.org> and
+is licensed under the GPL v2 (or later), see `/usr/share/common-licenses/GPL-2'.
+

debian/libg15-1.install

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

debian/libg15-dev.install

@@ -1,6 +1,3 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/share/pkgconfig/*
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*/lib*.a
+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,115 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DH_VERBOSE = 1
 
+DEB_DH_MAKESHLIBS_ARGS_libg15 := --version-info
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh $@
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-# shared library versions, option 1
-version=1.0.0
-major=1
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs -plibg15
-	dh_installdirs -plibg15-dev
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs ChangeLog -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_install -a --sourcedir=debian/tmp
-	dh_installmenu -a
-	dh_installdebconf -a
-	dh_installlogrotate -a
-	dh_installemacsen -a
-	dh_installpam -a
-	dh_installmime -a
-	dh_installinit -a
-	dh_installcron -a
-	dh_installinfo -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-#	dh_perl -a
-#	dh_python -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_makeshlibs:
+	dh_makeshlibs --version-info=None

debian/source/format

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

debian/watch

@@ -0,0 +1,7 @@
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://sf.net/g15tools libg15-(.*)\.tar\.gz
+