Update the changelog

Drop an explicit libusb-1.0-0 dependency in the binary package
This dependency will get generated automatically by dh_shlibdeps.
2019-12-05 14:34:56 +00:00 · 2019-12-05 14:32:40 +00:00 · 2019-12-05 14:32:14 +00:00 · 2019-12-05 14:31:20 +00:00 · 2019-12-05 14:30:54 +00:00 · 2019-12-05 14:23:46 +00:00
30 changed files with 1543 additions and 41313 deletions
@@ -34,3 +34,18 @@
 1.2.3
 * Add support for the newer G15 keyboards which have amber backlights and
  six 'G' keys.
+1.2.4
+* Turns out that the newer G15's have a different (5 byte) keyboard protocol.  
+* Optimise dumpPixmapIntoLCDFormat routine - Thanks to Adam Nielsen
+1.2.5
+* 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.
+1.2.6
+* Re-Add 5BYTE_RETURN flag. Auto-detect does not work with Solaris' libusb.
+* Add laptop GamePanel support.
+1.2.7
+* Fix keypress detection for G15v2 keyboards
+1.3
+* Add support for the G13 device
@@ -1,7 +1,7 @@
 LLIBDIR=@LIBDIR@ 
 lib_LTLIBRARIES = libg15.la
 libg15_la_SOURCES = libg15.h libg15.c
-libg15_la_LDFLAGS = -version-info 1:0:0
+libg15_la_LDFLAGS = -version-info 1:1:0
 include_HEADERS= libg15.h
 EXTRA_DIST = debian rpm

@@ -1,650 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS config/config.guess config/config.sub \
-	config/depcomp config/install-sh config/ltmain.sh \
-	config/missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libg15_la_LIBADD =
-am_libg15_la_OBJECTS = libg15.lo
-libg15_la_OBJECTS = $(am_libg15_la_OBJECTS)
-libg15_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libg15_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libg15_la_SOURCES)
-DIST_SOURCES = $(libg15_la_SOURCES)
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-LLIBDIR = @LIBDIR@ 
-lib_LTLIBRARIES = libg15.la
-libg15_la_SOURCES = libg15.h libg15.c
-libg15_la_LDFLAGS = -version-info 1:0:0
-include_HEADERS = libg15.h
-EXTRA_DIST = debian rpm
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libg15.la: $(libg15_la_OBJECTS) $(libg15_la_DEPENDENCIES) 
-	$(libg15_la_LINK) -rpath $(libdir) $(libg15_la_OBJECTS) $(libg15_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libg15.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
-	dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \
-	dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-libLTLIBRARIES
-
-
-dist-hook:
-	rm -rf `find $(distdir)/debian -name .svn`
-	rm -rf `find $(distdir)/rpm -name .svn`
-
-dist-rpm: dist-bzip2
-	rpmbuild -ts $(distdir).tar.bz2
-
-dist-archives:
-	$(MAKE) dist-bzip2
-	$(MAKE) dist-rpm
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
@@ -1 +1,10 @@
-This is a library to handle the LCD and extra keys on the Logitech G15 Gaming Keyboard.  This library requires libusb.
+This is a library to handle the LCD and extra keys on the Logitech G15 Gaming
+Keyboard and similar devices.
+This library requires libusb.
+LibG15 currently supports LCD & keys on the following devices:
+- Original G15 keyboard
+- G11 keyboard
+- Z10 speakers
+- 2nd revision of the G15 (amber backlight, 6 'G' keys, LCD)
+- Gamepanel available on some laptops
+- G13 game device
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+set -x
+aclocal -I config
+libtoolize --force --copy
+autoheader
+automake --add-missing --copy
+autoconf
@@ -1,67 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `usb' library (-lusb). */
-#undef HAVE_LIBUSB
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <usb.h> header file. */
-#undef HAVE_USB_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
@@ -1,584 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2006-10-15.18
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
-
-# This program 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, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
@@ -1,507 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-10-14.15
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-posix_glob=
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chmodcmd=$chmodprog
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-c         (ignored)
-d         create directories instead of installing files.
-g GROUP   $chgrpprog installed files to GROUP.
-m MODE    $chmodprog installed files to MODE.
-o USER    $chownprog installed files to USER.
-s         $stripprog installed files.
-t DIRECTORY  install into DIRECTORY.
-T         report an error if DSTFILE is a directory.
--help     display this help and exit.
--version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        shift
-        shift
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dstarg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
-      shift # fnord
-    fi
-    shift # arg
-    dstarg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
-      esac
-
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob && set -f
-      set fnord $dstdir
-      shift
-      $posix_glob && set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program 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, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
--run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
@@ -2,9 +2,11 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.59)
-AC_INIT(libg15, 1.2.3, mlampard@users.sourceforge.net)
+AC_INIT(libg15, 1.3, mlampard@users.sourceforge.net)
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
+AC_CANONICAL_TARGET()
+
 AM_INIT_AUTOMAKE()
 AC_CONFIG_SRCDIR([libg15.c])
 AC_CONFIG_HEADER([config.h])
@@ -13,9 +15,29 @@ AC_CONFIG_HEADER([config.h])
 AC_PROG_CC
 AC_PROG_LIBTOOL

+case $host_os in
+	*linux*) 
+	  AC_DEFINE([OSTYPE_LINUX], [1],[Target OS is Linux])
+	  ;;
+	*darwin*)
+	  AC_DEFINE([OSTYPE_DARWIN], [1],[Target OS is Darwin])
+	  ;;
+        *solaris*)
+          AC_DEFINE([OSTYPE_SOLARIS], [1],[Target OS is Solaris])
+	  AC_SEARCH_LIBS([nanosleep],rt,[],[],[])
+          AC_DEFINE(SUN_LIBUSB, 1, [Define to 1 for Sun version of libusb.])
+	  libusb_blocks=true	  
+	  ;;
+esac
+
 # Checks for libraries.
 AC_CHECK_LIB([usb], [main], ,AC_MSG_ERROR(["libusb not found. please install it"]))

+dnl Some versions of libusb do not honour timeout and block. Suns' version is one of them.
+if test "x$libusb_blocks" == "xtrue"; then
+      AC_DEFINE([LIBUSB_BLOCKS], [1],[Define if libusb implementation blocks on read or write])
+fi
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([string.h])
@@ -0,0 +1,90 @@
+libg15 (1.3.0~svn324-2) unstable; urgency=medium
+
+  [ Alexander Ponyatykh ]
+  * Switch from legacy libusb 0.1 to libusb 1.0 (closes: bug#810409,
+    bug#611649, LP: #1357556).
+  * Remove 00-fix-reinit.patch obsoleted by 02-switch-to-libusb-1.0.patch.
+  * Use debhelper-compat instead of debian/compat.
+
+  [ Andrej Shadura ]
+  * Minor cleanups:
+    - Rename 01-fix-spelling.pat{,c}h.
+    - Put some spaces into the dependency specifications for readability.
+    - Drop an explicit libusb-1.0-0 dependency in the binary package.
+      This dependency will be generated automatically by dh_shlibdeps
+      anyway.
+
+ -- Andrej Shadura <andrewsh@debian.org>  Thu, 05 Dec 2019 14:33:43 +0000
+
+libg15 (1.3.0~svn324-1) unstable; urgency=medium
+
+  * New upstream version 1.3.0~svn324.
+    - Support for G13, G110 and G510 devices (Closes: #622898).
+  * Fix spelling in the log message.
+  * Remove an outdated and useless watch file.
+  * Сonformant to policy 4.4.1.1.
+  * Remove obsolete (CDBS) variable from debian/rules.
+  * Add Vcs fields to debian/control.
+
+ -- Alexander Ponyatykh <lazyranma@gmail.com>  Thu, 14 Nov 2019 00:55:32 +0300
+
+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
+  * Don't export the .la file (see debian-devel@l.d.o)
+  * We are conformant to policy 2.8.3
+
+ -- Giacomo Catenazzi <cate@debian.org>  Thu, 10 Sep 2009 08:19:39 +0200
+
+libg15 (1.2.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Giacomo Catenazzi <cate@debian.org>  Wed, 22 Apr 2009 07:24:53 +0200
+
+libg15 (1.2.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- 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
+
+ -- Giacomo Catenazzi <cate@debian.org>  Mon, 27 Aug 2007 07:56:10 +0200
+
@@ -0,0 +1,31 @@
+Source: libg15
+Section: libs
+Priority: optional
+Maintainer: Alexander Ponyatykh <lazyranma@gmail.com>
+Build-Depends: debhelper-compat (= 12), libusb-1.0-0-dev (>= 2:1.0.22)
+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
+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
+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.
+
@@ -0,0 +1,30 @@
+This package was debianized by Giacomo A. Catenazzi <cate@debian.org> on
+Mon, 27 Aug 2007 07:56:10 +0200.
+
+It was downloaded from http://g15tools.sourceforge.net/
+
+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:
+
+    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'.
+
@@ -0,0 +1,2 @@
+NEWS
+README
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/lib*.so.*
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
@@ -0,0 +1 @@
+usr/lib/*/libg15*.so.*
@@ -0,0 +1,30 @@
+From: Alexander Ponyatykh <lazyranma@gmail.com>
+Date: Fri, 15 Nov 2019 02:19:01 +0300
+Subject: fix spelling error
+
+---
+ libg15.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libg15.c b/libg15.c
+index 31b2bd6..56df958 100644
+--- a/libg15.c
+++ b/libg15.c
+@@ -152,7 +152,7 @@ static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device, int d
+                 if (!devh)
+                 {
+                     g15_log(stderr,G15_LOG_INFO, "Error, could not open the keyboard\n");
+-                    g15_log(stderr,G15_LOG_INFO, "Perhaps you dont have enough permissions to access it\n");
+                    g15_log(stderr,G15_LOG_INFO, "Perhaps you don't have enough permissions to access it\n");
+                     return 0;
+                 }
+ 
+@@ -433,7 +433,7 @@ int handle_usb_errors(const char *prefix, int ret) {
+         case -ETIMEDOUT:
+             return G15_ERROR_READING_USB_DEVICE;  /* backward-compatibility */
+             break;
+-            case -ENOSPC: /* the we dont have enough bandwidth, apparently.. something has to give here.. */
+            case -ENOSPC: /* the we don't have enough bandwidth, apparently.. something has to give here.. */
+                 g15_log(stderr,G15_LOG_INFO,"usb error: ENOSPC.. reducing speed\n");
+                 enospc_slowdown = 1;
+                 break;
@@ -0,0 +1,820 @@
+From: Alexander Ponyatykh <lazyranma@gmail.com>
+Date: Fri, 15 Nov 2019 08:46:54 +0300
+Subject: Migrate from legacy libusb-0.1 to libusb-1.0
+
+---
+ configure.in |   5 +-
+ libg15.c     | 624 +++++++++++++++++++++++++++++++----------------------------
+ 2 files changed, 332 insertions(+), 297 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 074d98e..b533d2c 100644
+--- a/configure.in
+++ b/configure.in
+@@ -31,7 +31,8 @@ case $host_os in
+ esac
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB([usb], [main], ,AC_MSG_ERROR(["libusb not found. please install it"]))
+AC_CHECK_LIB([usb-1.0], [main], ,AC_MSG_ERROR(["libusb-1.0 not found. Please install it."]))
+AC_CHECK_LIB([usb-1.0], [libusb_set_option], ,AC_MSG_ERROR(["libusb-1.0 is too old. Please upgrade to version 1.0.22 or later."]))
+ 
+ dnl Some versions of libusb do not honour timeout and block. Suns' version is one of them.
+ if test "x$libusb_blocks" == "xtrue"; then
+@@ -41,7 +42,7 @@ fi
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([string.h])
+-AC_CHECK_HEADERS([usb.h])
+AC_CHECK_HEADERS([libusb-1.0/libusb.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff --git a/libg15.c b/libg15.c
+index 56df958..4c0afc4 100644
+--- a/libg15.c
+++ b/libg15.c
+@@ -24,20 +24,22 @@
+ #include "libg15.h"
+ #include <stdio.h>
+ #include <stdarg.h>
+-#include <usb.h>
+#include <libusb-1.0/libusb.h>
+ #include <string.h>
+ #include <errno.h>
+#include <unistd.h>
+ #include "config.h"
+ 
+-static usb_dev_handle *keyboard_device = 0;
+static libusb_device_handle *keyboard_device = 0;
+ static int libg15_debugging_enabled = 0;
+-static int enospc_slowdown = 0;
+ 
+ static int found_devicetype = -1;
+ static int shared_device = 0;
+ static int g15_keys_endpoint = 0;
+ static int g15_lcd_endpoint = 0;
+static int g15_interface_id = -1;
+ static pthread_mutex_t libusb_mutex;
+static libusb_context *libg15_libusb_context = NULL;
+ 
+ /* to add a new device, simply create a new DEVICE() in this list */
+ /* Fields are: "Name",VendorID,ProductID,Capabilities */
+@@ -67,7 +69,9 @@ int g15DeviceCapabilities() {
+ void libg15Debug(int option) {
+ 
+     libg15_debugging_enabled = option;
+-    usb_set_debug(option);
+    if (option && libg15_libusb_context) {
+        libusb_set_option(libg15_libusb_context, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
+    }
+ }
+ 
+ /* debugging wrapper */
+@@ -86,216 +90,280 @@ static int g15_log (FILE *fd, unsigned int level, const char *fmt, ...) {
+ 
+ /* return number of connected and supported devices */
+ int g15NumberOfConnectedDevices() {
+-    struct usb_bus *bus = 0;
+-    struct usb_device *dev = 0;
+-    int i=0;
+    struct libusb_device_descriptor desc;
+    libusb_device **list;
+     unsigned int found = 0;
+ 
+-    for (i=0; g15_devices[i].name !=NULL;i++)
+-        for (bus = usb_busses; bus; bus = bus->next)
+    ssize_t cnt = libusb_get_device_list(libg15_libusb_context, &list);
+
+    if (cnt < 0)
+     {
+-        for (dev = bus->devices; dev; dev = dev->next)
+        g15_log(stderr, G15_LOG_INFO, "Unable to list USB devices: %s\n", libusb_strerror(cnt));
+        return 0;
+    }
+
+    for (ssize_t i = 0; i < cnt; i++)
+    {
+        libusb_get_device_descriptor(list[i], &desc);
+
+        for (int j = 0; g15_devices[i].name != NULL; j++)
+         {
+-            if ((dev->descriptor.idVendor == g15_devices[i].vendorid && dev->descriptor.idProduct == g15_devices[i].productid))
+            if ((desc.idVendor == g15_devices[j].vendorid && desc.idProduct == g15_devices[j].productid))
+                 found++;
+                break;
+         }
+     }
+
+    libusb_free_device_list(list, 1);
+
+     g15_log(stderr,G15_LOG_INFO,"Found %i supported devices\n",found);
+     return found;
+ }
+ 
+ static int initLibUsb()
+ {
+-    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 */
+    int errcode = libusb_init(&libg15_libusb_context);
+ 
+-    if (!usb_find_busses())
+    if (errcode != 0)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Failed to initialize libusb-1.0: %s\n", libusb_strerror(errcode));
+         return G15_ERROR_OPENING_USB_DEVICE;
+    }
+ 
+-    if (!usb_find_devices())
+-        return G15_ERROR_OPENING_USB_DEVICE;
+    libg15Debug(libg15_debugging_enabled);
+ 
+     return G15_NO_ERROR;
+ }
+ 
+-static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device, int device_index)
+static libusb_device_handle* findAndOpenG15()
+ {
+-    struct usb_bus *bus = 0;
+-    struct usb_device *dev = 0;
+-    int retries=0;
+-    int j,i,k,l;
+-    int interface=0;
+    struct libusb_config_descriptor *cfg = NULL;
+    libusb_device_handle *devh = 0;
+    libusb_device *dev = NULL;
+    libusb_device **list = 0;
+    /* Use configuration 1 by default. */
+    int configuration = 1;
+    int unconfigured = 0;
+    int found_dev = -1;
+    int ret;
+
+    ssize_t cnt = libusb_get_device_list(libg15_libusb_context, &list);
+
+    if (cnt < 0)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Unable to list USB devices: %s\n", libusb_strerror(cnt));
+        return 0;
+    }
+ 
+-    for (bus = usb_busses; bus; bus = bus->next)
+    for (ssize_t devno = 0; devno < cnt && found_dev == -1; devno++)
+     {
+-        for (dev = bus->devices; dev; dev = dev->next)
+-        {
+-            if ((dev->descriptor.idVendor == handled_device.vendorid && dev->descriptor.idProduct == handled_device.productid))
+        struct libusb_device_descriptor desc;
+        libusb_get_device_descriptor(list[devno], &desc);
+        for (int i = 0; g15_devices[i].name != NULL && found_dev == -1; i++) {
+            if (desc.idVendor == g15_devices[i].vendorid && desc.idProduct == g15_devices[i].productid)
+             {
+-                int ret=0;
+-                char name_buffer[65535];
+-                name_buffer[0] = 0;
+-                usb_dev_handle *devh = 0;
+-                found_devicetype = device_index;
+-                g15_log(stderr,G15_LOG_INFO,"Found %s, trying to open it\n",handled_device.name);
+-#if 0
+-                devh = usb_open(dev);
+-                usb_reset(devh);
+-                usleep(50*1000);
+-                usb_close(devh);
+-#endif
+-                devh = usb_open(dev);
+-                if (!devh)
+-                {
+-                    g15_log(stderr,G15_LOG_INFO, "Error, could not open the keyboard\n");
+-                    g15_log(stderr,G15_LOG_INFO, "Perhaps you don't have enough permissions to access it\n");
+-                    return 0;
+-                }
+-
+-                usleep(50*1000);
+-
+-                g15_log(stderr, G15_LOG_INFO, "Device has %i possible configurations\n",dev->descriptor.bNumConfigurations);
+-
+-                /* if device is shared with another driver, such as the Z-10 speakers sharing with alsa, we have to disable some calls */
+-                if(g15DeviceCapabilities() & G15_DEVICE_IS_SHARED)
+-                  shared_device = 1;
+-
+-                for (j = 0; j<dev->descriptor.bNumConfigurations;j++){
+-                    struct usb_config_descriptor *cfg = &dev->config[j];
+-
+-                    for (i=0;i<cfg->bNumInterfaces; i++){
+-                        if (g15DeviceCapabilities()&G15_DEVICE_G510){
+-                            if (i==G510_STANDARD_KEYBOARD_INTERFACE) continue;
+-                        }
+-
+-                        struct usb_interface *ifp = &cfg->interface[i];
+-                        /* if endpoints are already known, finish up */
+-                        if(g15_keys_endpoint && g15_lcd_endpoint)
+-                          break;
+-                        g15_log(stderr, G15_LOG_INFO, "Device has %i Alternate Settings\n", ifp->num_altsetting);
+-
+-                        for(k=0;k<ifp->num_altsetting;k++){
+-                            struct usb_interface_descriptor *as = &ifp->altsetting[k];
+-                            /* verify that the interface is for a HID device */
+-                            if(as->bInterfaceClass==USB_CLASS_HID){
+-                                g15_log(stderr, G15_LOG_INFO, "Interface %i has %i Endpoints\n", i, as->bNumEndpoints);
+-                                usleep(50*1000);
+-        			/* libusb functions ending in _np are not portable between OS's
+-                                * Non-linux users will need some way to detach the HID driver from
+-                                * the G15 until we work out how to do this for other OS's automatically.
+-                                * For the moment, we just skip this code..
+-                                */
+-#ifdef LIBUSB_HAS_GET_DRIVER_NP
+-                                ret = usb_get_driver_np(devh, i, name_buffer, 65535);
+-        			/* some kernel versions say that a driver is attached even though there is none
+-                                in this case the name buffer has not been changed
+-                                thanks to RobEngle for pointing this out */
+-                                if (!ret && name_buffer[0])
+-                                {
+-                                    g15_log(stderr,G15_LOG_INFO,"Trying to detach driver currently attached: \"%s\"\n",name_buffer);
+-
+-                                    ret = usb_detach_kernel_driver_np(devh, i);
+-                                    if (!ret)
+-                                    {
+-                                        g15_log(stderr,G15_LOG_INFO,"Success, detached the driver\n");
+-                                    }
+-                                    else
+-                                    {
+-                                        g15_log(stderr,G15_LOG_INFO,"Sorry, I could not detach the driver, giving up\n");
+-                                        return 0;
+-                                    }
+-
+-                                }
+-#endif
+-                                /* don't set configuration if device is shared */
+-                                if(0 == shared_device) {
+-                                  ret = usb_set_configuration(devh, 1);
+-                                  if (ret)
+-                                  {
+-                                    g15_log(stderr,G15_LOG_INFO,"Error setting the configuration, this is fatal\n");
+-                                    return 0;
+-                                  }
+-                                }
+-                                usleep(50*1000);
+-                                while((ret = usb_claim_interface(devh,i)) && retries <10) {
+-                                    usleep(50*1000);
+-                                    retries++;
+-                                    g15_log(stderr,G15_LOG_INFO,"Trying to claim interface\n");
+-                                }
+-
+-                                if (ret)
+-                                {
+-                                    g15_log(stderr,G15_LOG_INFO,"Error claiming interface, good day cruel world\n");
+-                                    return 0;
+-                                }
+-
+-                                for (l=0; l< as->bNumEndpoints;l++){
+-                                    struct usb_endpoint_descriptor *ep=&as->endpoint[l];
+-                                    g15_log(stderr, G15_LOG_INFO, "Found %s endpoint %i with address 0x%X maxtransfersize=%i \n",
+-                                            0x80&ep->bEndpointAddress?"\"Extra Keys\"":"\"LCD\"",
+-                                            ep->bEndpointAddress&0x0f,ep->bEndpointAddress, ep->wMaxPacketSize
+-                                           );
+-
+-                                    if(0x80 & ep->bEndpointAddress) {
+-                                        g15_keys_endpoint = ep->bEndpointAddress;
+-                                    } else {
+-                                        g15_lcd_endpoint = ep->bEndpointAddress;
+-                                    }
+-#if 0
+-                                    usb_resetep(devh,ep->bEndpointAddress);
+-#endif
+-                                }
+-
+-                                if (ret)
+-                                {
+-                                    g15_log(stderr, G15_LOG_INFO, "Error setting Alternate Interface\n");
+-                                }
+-                            }
+-                        }
+-                    }
+-                }
+-
+-
+-                g15_log(stderr,G15_LOG_INFO,"Done opening the keyboard\n");
+-                usleep(500*1000); // sleep a bit for good measure
+-                return devh;
+                found_dev = i;
+                dev = list[devno];
+                g15_log(stderr, G15_LOG_INFO, "Found bus %03u port %03u device %03u ID %04x:%04x %s\n", 
+                    libusb_get_bus_number(list[devno]),
+                    libusb_get_port_number(list[devno]),
+                    libusb_get_device_address(list[devno]),
+                    desc.idVendor,
+                    desc.idProduct,
+                    g15_devices[i].name);
+                g15_log(stderr, G15_LOG_INFO, "Device has %u possible configuration%s\n", desc.bNumConfigurations, desc.bNumConfigurations > 1 ? "s" : "");
+             }
+         }
+     }
+-    return 0;
+-}
+ 
+    if (found_dev == -1) {
+        libusb_free_device_list(list, 1);
+        g15_log(stderr, G15_LOG_INFO, "No supported devices found\n");
+        return 0;
+    }
+ 
+-static usb_dev_handle * findAndOpenG15() {
+-    int i;
+-    for (i=0; g15_devices[i].name !=NULL  ;i++){
+-        g15_log(stderr,G15_LOG_INFO,"Trying to find %s\n",g15_devices[i].name);
+-        if(keyboard_device = findAndOpenDevice(g15_devices[i],i)){
+    pthread_mutex_lock(&libusb_mutex);
+
+    if (found_devicetype != -1)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Error, device is already open\n");
+        goto error;
+    }
+    
+    found_devicetype = found_dev;
+    ret = libusb_open(dev, &devh);
+    libusb_free_device_list(list, 1);
+    list = NULL;
+
+    if (ret || !devh)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Error, could not open the keyboard: %s\n", libusb_strerror(ret));
+        goto error;
+    }
+
+    /* If device is shared with another driver, such as the Z-10 speakers sharing with alsa, we have to disable some calls. */
+    if(g15DeviceCapabilities() & G15_DEVICE_IS_SHARED)
+    {
+        shared_device = 1;
+        ret = libusb_get_configuration(devh, &configuration);
+        if (ret)
+        {
+            g15_log(stderr, G15_LOG_INFO, "Error, could not retrieve current configuration: %s\n", libusb_strerror(ret));
+            goto error;
+        }
+        else if (configuration < 1)
+        {
+            unconfigured = 1;
+            configuration = 1;
+        }
+        else if (configuration != 1)
+        {
+            g15_log(stderr, G15_LOG_INFO, "Warning, using unknown configuration %i for shared device\n", configuration);
+        }
+    }
+
+    ret = libusb_get_config_descriptor_by_value(dev, configuration, &cfg);
+
+    if (ret)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Error, could not retrieve descriptor for configuration %i: %s\n",
+            configuration, libusb_strerror(ret));
+
+        goto error;
+    }
+
+    g15_log(stderr, G15_LOG_INFO, "Device has %u possible interface%s for configuration %i\n",
+        cfg->bNumInterfaces, cfg->bNumInterfaces > 1 ? "s" : "", configuration);
+
+    const struct libusb_interface_descriptor *iface = NULL;
+    for (int i = 0; i < cfg->bNumInterfaces; i++)
+    {
+        /* Always use altsetting 0, others are not supported even if exist. */
+        iface = &cfg->interface[i].altsetting[0];
+        if ((g15DeviceCapabilities() & G15_DEVICE_G510) && iface->bInterfaceNumber == G510_STANDARD_KEYBOARD_INTERFACE) continue;
+        
+        if (iface->bInterfaceClass == LIBUSB_CLASS_HID && iface->bNumEndpoints > 0)
+        {
+            g15_log(stderr, G15_LOG_INFO, "Selecting HID interface %u, it has %u possible altsetting%s\n",
+                iface->bInterfaceNumber, cfg->interface[i].num_altsetting, cfg->interface[i].num_altsetting > 1 ? "s" : "");
+
+            g15_interface_id = iface->bInterfaceNumber;
+             break;
+         }
+    }
+
+    if (g15_interface_id == -1)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Error, could not find suitable HID interface\n");
+        goto error;
+    }
+
+    for (int i = 0; i < iface->bNumEndpoints; i++)
+    {
+        const struct libusb_endpoint_descriptor *ep = &iface->endpoint[i];
+        g15_log(stderr, G15_LOG_INFO, "Found %s endpoint %i with address 0x%X maxtransfersize=%i\n",
+                0x80 & ep->bEndpointAddress ? "\"Extra Keys\"" : "\"LCD\"",
+                ep->bEndpointAddress & 0x0f, ep->bEndpointAddress, ep->wMaxPacketSize);
+
+        if (0x80 & ep->bEndpointAddress)
+        {
+            g15_keys_endpoint = ep->bEndpointAddress;
+        }
+        else
+        {
+            g15_lcd_endpoint = ep->bEndpointAddress;
+        }
+    }    
+
+    if (libusb_kernel_driver_active(devh, g15_interface_id) == 1)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Trying to detach driver currently attached\n");
+
+        ret = libusb_detach_kernel_driver(devh, g15_interface_id);
+        if (!ret)
+        {
+            g15_log(stderr,G15_LOG_INFO,"Success, detached the driver\n");
+        }
+         else
+-            g15_log(stderr,G15_LOG_INFO,"%s not found\n",g15_devices[i].name);
+        {
+            g15_log(stderr,G15_LOG_INFO,"Could not detach the driver, giving up: %s\n", libusb_strerror(ret));
+            goto error;
+        }
+    }
+
+    if(!shared_device || unconfigured)
+    {
+        /* Set configuration, reset state, reset altsetting to 0 */
+        ret = libusb_set_configuration(devh, 1);
+        if (ret)
+        {
+            g15_log(stderr,G15_LOG_INFO,"Error setting the configuration: %s\n", libusb_strerror(ret));
+            goto error;
+        }        
+    }
+
+    ret = 1;
+    for (int i = 0; i < 10 && ret; i++) 
+    {
+        usleep(50 * 1000);
+        g15_log(stderr, G15_LOG_INFO, "Trying to claim interface\n");
+        ret = libusb_claim_interface(devh, g15_interface_id);
+    }
+
+    if (ret)
+    {
+        g15_log(stderr, G15_LOG_INFO, "Error claiming interface, good day cruel world: %s\n", libusb_strerror(ret));
+        goto error;
+    }
+
+    libusb_free_config_descriptor(cfg);
+    
+    g15_log(stderr, G15_LOG_INFO, "Done opening the keyboard\n");
+
+    pthread_mutex_unlock(&libusb_mutex);
+    
+    return devh;
+
+error:
+    if (devh)
+    {
+        libusb_attach_kernel_driver(devh, 0);
+        libusb_close(devh);
+     }
+-    return keyboard_device;
+    if (cfg) libusb_free_config_descriptor(cfg);
+    if (list) libusb_free_device_list(list, 1);
+    shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0;
+    g15_interface_id = found_devicetype = -1;
+    pthread_mutex_unlock(&libusb_mutex);
+
+    return 0;
+ }
+ 
+ 
+-int re_initLibG15()
+/* reset the keyboard, returning it to a known state */
+static int closeKeyboardDevice()
+ {
+    int retval = G15_ERROR_OPENING_USB_DEVICE;
+ 
+-    usb_init();
+    pthread_mutex_lock(&libusb_mutex);
+    if (keyboard_device) {
+        retval = libusb_release_interface(keyboard_device, 0);
+        libusb_attach_kernel_driver(keyboard_device, 0);
+        libusb_close(keyboard_device);
+        keyboard_device = NULL;
+        retval = G15_NO_ERROR;
+    }
+ 
+-  /**
+-     *  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 */
+    shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0;
+    g15_interface_id = found_devicetype = -1;
+    pthread_mutex_unlock(&libusb_mutex);
+ 
+-    if (!usb_find_devices())
+-        return G15_ERROR_OPENING_USB_DEVICE;
+    return retval;
+}
+
+int re_initLibG15()
+{
+    closeKeyboardDevice();
+ 
+     keyboard_device = findAndOpenG15();
+     if (!keyboard_device)
+@@ -306,48 +374,34 @@ int re_initLibG15()
+ 
+ int initLibG15()
+ {
+-    int retval = G15_NO_ERROR;
+-    retval = initLibUsb();
+-    if (retval)
+-        return retval;
+    int retval = initLibUsb();
+ 
+-    g15_log(stderr,G15_LOG_INFO,"%s\n",PACKAGE_STRING);
+    if (retval) return retval;
+ 
+-#ifdef SUN_LIBUSB
+-    g15_log(stderr,G15_LOG_INFO,"Using Sun libusb.\n");
+-#endif
+    g15_log(stderr, G15_LOG_INFO, "%s\n", PACKAGE_STRING);
+ 
+-    g15NumberOfConnectedDevices();
+    if (libg15_debugging_enabled) g15NumberOfConnectedDevices();
+ 
+    pthread_mutex_init(&libusb_mutex, NULL);
+     keyboard_device = findAndOpenG15();
+-    if (!keyboard_device)
+    if (!keyboard_device) 
+    {
+        pthread_mutex_destroy(&libusb_mutex);
+         return G15_ERROR_OPENING_USB_DEVICE;
+    }
+ 
+-    pthread_mutex_init(&libusb_mutex, NULL);
+-    return retval;
+    return G15_NO_ERROR;
+ }
+ 
+-/* 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;
+-}
+    closeKeyboardDevice();
+    if (libg15_libusb_context) libusb_exit(libg15_libusb_context);
+    libg15_libusb_context = NULL;
+ 
+    pthread_mutex_destroy(&libusb_mutex);
+    return G15_NO_ERROR;
+}
+ 
+ static void dumpPixmapIntoLCDFormat(unsigned char *lcd_buffer, unsigned char const *data)
+ {
+@@ -427,36 +481,6 @@ static void dumpPixmapIntoLCDFormat(unsigned char *lcd_buffer, unsigned char con
+     }
+ }
+ 
+-int handle_usb_errors(const char *prefix, int ret) {
+-
+-    switch (ret){
+-        case -ETIMEDOUT:
+-            return G15_ERROR_READING_USB_DEVICE;  /* backward-compatibility */
+-            break;
+-            case -ENOSPC: /* the we don't have enough bandwidth, apparently.. something has to give here.. */
+-                g15_log(stderr,G15_LOG_INFO,"usb error: ENOSPC.. reducing speed\n");
+-                enospc_slowdown = 1;
+-                break;
+-            case -ENODEV: /* the device went away - we probably should attempt to reattach */
+-            case -ENXIO: /* host controller bug */
+-            case -EINVAL: /* invalid request */
+-            case -EAGAIN: /* try again */
+-            case -EFBIG: /* too many frames to handle */
+-            case -EMSGSIZE: /* msgsize is invalid */
+-                 g15_log(stderr,G15_LOG_INFO,"usb error: %s %s (%i)\n",prefix,usb_strerror(),ret);
+-                 break;
+-            case -EPIPE: /* endpoint is stalled */
+-                 g15_log(stderr,G15_LOG_INFO,"usb error: %s EPIPE! clearing...\n",prefix);
+-                 pthread_mutex_lock(&libusb_mutex);
+-                 usb_clear_halt(keyboard_device, 0x81);
+-                 pthread_mutex_unlock(&libusb_mutex);
+-                 break;
+-            default: /* timed out */
+-                 g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i (%s))\n",prefix,ret,usb_strerror());
+-    }
+-    return ret;
+-}
+-
+ int writePixmapToLCD(unsigned char const *data)
+ {
+     int ret = 0;
+@@ -473,43 +497,27 @@ int writePixmapToLCD(unsigned char const *data)
+ 
+     /* the keyboard needs this magic byte */
+     lcd_buffer[0] = 0x03;
+-  /* in an attempt to reduce peak bus utilisation, we break the transfer into 32 byte chunks and sleep a bit in between.
+-    It shouldnt make much difference, but then again, the g15 shouldnt be flooding the bus enough to cause ENOSPC, yet
+-    apparently does on some machines...
+-    I'm not sure how successful this will be in combatting ENOSPC, but we'll give it try in the real-world. */
+-
+-    if(enospc_slowdown != 0){
+-#ifndef LIBUSB_BLOCKS
+-        pthread_mutex_lock(&libusb_mutex);
+-#endif
+-        for(transfercount = 0;transfercount<=31;transfercount++){
+-            ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer+(32*transfercount), 32, 1000);
+-            if (ret != 32)
+-            {
+-                handle_usb_errors ("LCDPixmap Slow Write",ret);
+-                return G15_ERROR_WRITING_PIXMAP;
+-            }
+-            usleep(100);
+
+    /* transfer entire buffer in one hit */
+    int transferred = 0;
+    pthread_mutex_lock(&libusb_mutex);
+    ret = libusb_interrupt_transfer(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, &transferred, 1000);
+    pthread_mutex_unlock(&libusb_mutex);
+    if (ret || transferred != G15_BUFFER_LEN)
+    {
+        if (!ret) {
+            g15_log(stderr,G15_LOG_INFO,"LCDPixmap write error: short write\n");
+        } else {
+            g15_log(stderr,G15_LOG_INFO,"LCDPixmap write error: %s\n", libusb_strerror(ret));
+         }
+-#ifndef LIBUSB_BLOCKS
+-        pthread_mutex_unlock(&libusb_mutex);
+-#endif
+-    }else{
+-        /* transfer entire buffer in one hit */
+-#ifdef LIBUSB_BLOCKS
+-        ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
+-#else
+-        pthread_mutex_lock(&libusb_mutex);
+-        ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
+-        pthread_mutex_unlock(&libusb_mutex);
+-#endif
+-        if (ret != G15_BUFFER_LEN)
+-        {
+-            handle_usb_errors ("LCDPixmap Write",ret);
+-            return G15_ERROR_WRITING_PIXMAP;
+        if (ret == LIBUSB_ERROR_PIPE) {
+            pthread_mutex_lock(&libusb_mutex);
+            libusb_clear_halt(keyboard_device, g15_lcd_endpoint);
+            pthread_mutex_unlock(&libusb_mutex);
+         }
+-        usleep(100);
+        return G15_ERROR_WRITING_PIXMAP;
+     }
+    usleep(100);
+ 
+     return 0;
+ }
+@@ -534,7 +542,9 @@ int setLCDContrast(unsigned int level)
+             usb_data[3] = 18;
+     }
+     pthread_mutex_lock(&libusb_mutex);
+-    retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
+    retval = libusb_control_transfer(keyboard_device,
+         LIBUSB_REQUEST_TYPE_CLASS + LIBUSB_RECIPIENT_INTERFACE + LIBUSB_ENDPOINT_OUT,
+         9, 0x302, 0, (char*)usb_data, 4, 10000);
+     pthread_mutex_unlock(&libusb_mutex);
+     return retval;
+ }
+@@ -552,7 +562,9 @@ int setLEDs(unsigned int leds)
+         return G15_ERROR_UNSUPPORTED;
+ 
+     pthread_mutex_lock(&libusb_mutex);
+-    retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)m_led_buf, 4, 10000);
+    retval = libusb_control_transfer(keyboard_device,
+        LIBUSB_REQUEST_TYPE_CLASS + LIBUSB_RECIPIENT_INTERFACE + LIBUSB_ENDPOINT_OUT,
+        9, 0x302, 0, (char*)m_led_buf, 4, 10000);
+     pthread_mutex_unlock(&libusb_mutex);
+     return retval;
+ }
+@@ -577,7 +589,9 @@ int setLCDBrightness(unsigned int level)
+             usb_data[2] = 0x00;
+     }
+     pthread_mutex_lock(&libusb_mutex);
+-    retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
+    retval = libusb_control_transfer(keyboard_device,
+        LIBUSB_REQUEST_TYPE_CLASS + LIBUSB_RECIPIENT_INTERFACE + LIBUSB_ENDPOINT_OUT,
+        9, 0x302, 0, (char*)usb_data, 4, 10000);
+     pthread_mutex_unlock(&libusb_mutex);
+     return retval;
+ }
+@@ -603,7 +617,9 @@ int setKBBrightness(unsigned int level)
+             usb_data[2] = 0x0;
+     }
+     pthread_mutex_lock(&libusb_mutex);
+-    retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
+    retval = libusb_control_transfer(keyboard_device,
+        LIBUSB_REQUEST_TYPE_CLASS + LIBUSB_RECIPIENT_INTERFACE + LIBUSB_ENDPOINT_OUT,
+        9, 0x302, 0, (char*)usb_data, 4, 10000);
+     pthread_mutex_unlock(&libusb_mutex);
+     return retval;
+ }
+@@ -618,7 +634,9 @@ int setG510LEDColor(unsigned char r, unsigned char g, unsigned char b)
+     usb_data[3] = b;
+ 
+     pthread_mutex_lock(&libusb_mutex);
+-    retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x305, 1, (char*)usb_data, 4, 10000);
+    retval = libusb_control_transfer(keyboard_device,
+        LIBUSB_REQUEST_TYPE_CLASS + LIBUSB_RECIPIENT_INTERFACE + LIBUSB_ENDPOINT_OUT,
+        9, 0x305, 1, (char*)usb_data, 4, 10000);
+     pthread_mutex_unlock(&libusb_mutex);
+     return retval;
+ }
+@@ -1032,38 +1050,54 @@ static void processKeyEvent4Byte(unsigned int *pressed_keys, unsigned char *buff
+ int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
+ {
+     unsigned char buffer[G15_KEY_READ_LENGTH];
+    int transferred = 0;
+     int ret = 0;
+     int caps = 0;
+ 
+-#ifdef LIBUSB_BLOCKS
+-    ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, G15_KEY_READ_LENGTH, timeout);
+-#else
+     pthread_mutex_lock(&libusb_mutex);
+-    ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, G15_KEY_READ_LENGTH, timeout);
+    ret = libusb_interrupt_transfer(keyboard_device, g15_keys_endpoint, (char*)buffer, G15_KEY_READ_LENGTH, &transferred, timeout);
+     pthread_mutex_unlock(&libusb_mutex);
+-#endif
+-    if(ret>0) {
+-      if(buffer[0] == 1)
+
+    switch (ret)
+    {
+        case 0:
+            break;
+        case LIBUSB_ERROR_TIMEOUT:
+            return G15_ERROR_TIMEOUT;
+        case LIBUSB_ERROR_PIPE:
+            pthread_mutex_lock(&libusb_mutex);
+            libusb_clear_halt(keyboard_device, g15_keys_endpoint);
+            pthread_mutex_unlock(&libusb_mutex);
+            //no break
+        default:
+            g15_log(stderr,G15_LOG_INFO,"USB error on keybaord read: %s\n", libusb_strerror(ret));
+            return G15_ERROR_READING_USB_DEVICE;
+    }
+
+    if (transferred > 0 && buffer[0] == 1) {
+         return G15_ERROR_TRY_AGAIN;
+     }
+ 
+     caps = g15DeviceCapabilities();
+-    if((caps & G15_DEVICE_G13) && buffer[0]==0x25){
+-      processKeyEventG13(pressed_keys, buffer);
+-      return G15_NO_ERROR;
+    if ((caps & G15_DEVICE_G13) && buffer[0]==0x25)
+    {
+        processKeyEventG13(pressed_keys, buffer);
+        return G15_NO_ERROR;
+     }
+ 
+-    switch(ret) {
+-      case 4:
+-          processKeyEvent4Byte(pressed_keys, buffer);
+-          return G15_NO_ERROR;
+-      case 5:
+-          processKeyEvent5Byte(pressed_keys, buffer);
+-          return G15_NO_ERROR;
+-      case 9:
+-          processKeyEvent9Byte(pressed_keys, buffer);
+-          return G15_NO_ERROR;
+-      default:
+-          return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
+    switch (transferred)
+    {
+        case 4:
+            processKeyEvent4Byte(pressed_keys, buffer);
+            return G15_NO_ERROR;
+        case 5:
+            processKeyEvent5Byte(pressed_keys, buffer);
+            return G15_NO_ERROR;
+        case 9:
+            processKeyEvent9Byte(pressed_keys, buffer);
+            return G15_NO_ERROR;
+        default:
+            g15_log(stderr, G15_LOG_INFO,"USB error on keybaord read: unsupported packet size\n");
+            return G15_ERROR_READING_USB_DEVICE;
+     }
+ }
@@ -0,0 +1,2 @@
+01-fix-spelling.patch
+02-switch-to-libusb-1.0.patch
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+DH_VERBOSE = 1
+
+%:
+	dh $@
@@ -0,0 +1 @@
+3.0 (quilt)
@@ -12,12 +12,12 @@
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with g15lcd; if not, write to the Free Software
+    along with libg15; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

    (c) 2006-2007 The G15tools Project - g15tools.sf.net

-    $Revision: 260 $ -  $Date: 2007-10-18 12:17:48 +0930 (Thu, 18 Oct 2007) $ $Author: mlampard $
+    $Revision: 324 $ -  $Date: 2011-02-24 03:13:57 +0300 (Thu, 24 Feb 2011) $ $Author: SteelSide $
 */

 #include <pthread.h>
@@ -27,6 +27,7 @@
 #include <usb.h>
 #include <string.h>
 #include <errno.h>
+#include "config.h"

 static usb_dev_handle *keyboard_device = 0;
 static int libg15_debugging_enabled = 0;
@@ -38,14 +39,18 @@ static int g15_keys_endpoint = 0;
 static int g15_lcd_endpoint = 0;
 static pthread_mutex_t libusb_mutex;

-
 /* to add a new device, simply create a new DEVICE() in this list */
 /* Fields are: "Name",VendorID,ProductID,Capabilities */
 const libg15_devices_t g15_devices[] = {
    DEVICE("Logitech G15",0x46d,0xc222,G15_LCD|G15_KEYS),
    DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
    DEVICE("Logitech Z-10",0x46d,0x0a07,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
-    DEVICE("Logitech G15 v2",0x46d,0xc227,G15_LCD|G15_KEYS),
+    DEVICE("Logitech G15 v2",0x46d,0xc227,G15_LCD|G15_KEYS|G15_DEVICE_5BYTE_RETURN),
+    DEVICE("Logitech Gamepanel",0x46d,0xc251,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
+    DEVICE("Logitech G13",0x46d,0xc21c,G15_LCD|G15_KEYS|G15_DEVICE_G13),
+    DEVICE("Logitech G110",0x46d,0xc22b,G15_KEYS),
+    DEVICE("Logitech G510",0x46d,0xc22d,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED|G15_DEVICE_G510), /* without audio activated */
+    DEVICE("Logitech G510",0x46d,0xc22e,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED|G15_DEVICE_G510), /* with audio activated */
    DEVICE(NULL,0,0,0)
 };

@@ -163,6 +168,10 @@ static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device, int d
                    struct usb_config_descriptor *cfg = &dev->config[j];

                    for (i=0;i<cfg->bNumInterfaces; i++){
+                        if (g15DeviceCapabilities()&G15_DEVICE_G510){
+                            if (i==G510_STANDARD_KEYBOARD_INTERFACE) continue;
+                        }
+
                        struct usb_interface *ifp = &cfg->interface[i];
                        /* if endpoints are already known, finish up */
                        if(g15_keys_endpoint && g15_lcd_endpoint)
@@ -196,7 +205,7 @@ static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device, int d
                                    }
                                    else
                                    {
-                                        g15_log(stderr,G15_LOG_INFO,"Sorry, I could not detached the driver, giving up\n");
+                                        g15_log(stderr,G15_LOG_INFO,"Sorry, I could not detach the driver, giving up\n");
                                        return 0;
                                    }

@@ -302,6 +311,12 @@ int initLibG15()
    if (retval)
        return retval;

+    g15_log(stderr,G15_LOG_INFO,"%s\n",PACKAGE_STRING);
+
+#ifdef SUN_LIBUSB
+    g15_log(stderr,G15_LOG_INFO,"Using Sun libusb.\n");
+#endif
+
    g15NumberOfConnectedDevices();

    keyboard_device = findAndOpenG15();
@@ -317,8 +332,10 @@ 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);
@@ -334,36 +351,84 @@ int exitLibG15()

 static void dumpPixmapIntoLCDFormat(unsigned char *lcd_buffer, unsigned char const *data)
 {
-    unsigned int offset_from_start = G15_LCD_OFFSET;
+/*
+
+  For a set of bytes (A, B, C, etc.) the bits representing pixels will appear on the LCD like this:
+
+	A0 B0 C0
+	A1 B1 C1
+	A2 B2 C2
+	A3 B3 C3 ... and across for G15_LCD_WIDTH bytes
+	A4 B4 C4
+	A5 B5 C5
+	A6 B6 C6
+	A7 B7 C7
+
+	A0
+	A1  <- second 8-pixel-high row starts straight after the last byte on
+	A2     the previous row
+	A3
+	A4
+	A5
+	A6
+	A7
+	A8
+
+	A0
+	...
+	A0
+	...
+	A0
+	...
+	A0
+	A1 <- only the first three bits are shown on the bottom row (the last three
+	A2    pixels of the 43-pixel high display.)
+
+
+*/
+
+    unsigned int output_offset = G15_LCD_OFFSET;
+    unsigned int base_offset = 0;
    unsigned int curr_row = 0;
    unsigned int curr_col = 0;

-    for (curr_row=0;curr_row<G15_LCD_HEIGHT;++curr_row)
+    /* Five 8-pixel rows + a little 3-pixel row.  This formula will calculate
+       the minimum number of bytes required to hold a complete column.  (It
+       basically divides by eight and rounds up the result to the nearest byte,
+       but at compile time.
+      */
+
+#define G15_LCD_HEIGHT_IN_BYTES  ((G15_LCD_HEIGHT + ((8 - (G15_LCD_HEIGHT % 8)) % 8)) / 8)
+
+    for (curr_row = 0; curr_row < G15_LCD_HEIGHT_IN_BYTES; ++curr_row)
    {
        for (curr_col = 0; curr_col < G15_LCD_WIDTH; ++curr_col)
        {
-            unsigned int pixel_offset = curr_row*G15_LCD_WIDTH + curr_col;
-            unsigned int byte_offset = pixel_offset / 8;
-            unsigned int bit_offset = pixel_offset % 8;
-            unsigned int val = data[byte_offset] & 1<<(7-bit_offset);
+            unsigned int bit = curr_col % 8;
+		/* Copy a 1x8 column of pixels across from the source image to the LCD buffer. */

-            unsigned int row = curr_row / 8;
-            unsigned int offset = G15_LCD_WIDTH*row + curr_col;
-            unsigned int bit = curr_row % 8;
-    
-/*
-            if (val)
-            printf("Setting pixel at row %d col %d to %d offset %d bit %d\n",curr_row,curr_col, val, offset, bit);
-      */
-            if (val)
-                lcd_buffer[offset_from_start + offset] = lcd_buffer[offset_from_start + offset] | 1 << bit;
-            else
-                lcd_buffer[offset_from_start + offset] = lcd_buffer[offset_from_start + offset]  &  ~(1 << bit);
+            lcd_buffer[output_offset] =
+			(((data[base_offset                        ] << bit) & 0x80) >> 7) |
+			(((data[base_offset +  G15_LCD_WIDTH/8     ] << bit) & 0x80) >> 6) |
+			(((data[base_offset + (G15_LCD_WIDTH/8 * 2)] << bit) & 0x80) >> 5) |
+			(((data[base_offset + (G15_LCD_WIDTH/8 * 3)] << bit) & 0x80) >> 4) |
+			(((data[base_offset + (G15_LCD_WIDTH/8 * 4)] << bit) & 0x80) >> 3) |
+			(((data[base_offset + (G15_LCD_WIDTH/8 * 5)] << bit) & 0x80) >> 2) |
+			(((data[base_offset + (G15_LCD_WIDTH/8 * 6)] << bit) & 0x80) >> 1) |
+			(((data[base_offset + (G15_LCD_WIDTH/8 * 7)] << bit) & 0x80) >> 0);
+            ++output_offset;
+            if (bit == 7)
+              base_offset++;
        }
+	/* Jump down seven pixel-rows in the source image, since we've just
+	   done a row of eight pixels in one pass (and we counted one pixel-row
+  	   while we were going, so now we skip the next seven pixel-rows.) */
+	base_offset += G15_LCD_WIDTH - (G15_LCD_WIDTH / 8);
    }
 }

 int handle_usb_errors(const char *prefix, int ret) {
+
    switch (ret){
        case -ETIMEDOUT:
            return G15_ERROR_READING_USB_DEVICE;  /* backward-compatibility */
@@ -378,7 +443,7 @@ int handle_usb_errors(const char *prefix, int ret) {
            case -EAGAIN: /* try again */
            case -EFBIG: /* too many frames to handle */
            case -EMSGSIZE: /* msgsize is invalid */
-                 g15_log(stderr,G15_LOG_INFO,"usb error: %s (%i)\n",prefix,ret);     
+                 g15_log(stderr,G15_LOG_INFO,"usb error: %s %s (%i)\n",prefix,usb_strerror(),ret);
                 break;
            case -EPIPE: /* endpoint is stalled */
                 g15_log(stderr,G15_LOG_INFO,"usb error: %s EPIPE! clearing...\n",prefix);
@@ -387,7 +452,7 @@ int handle_usb_errors(const char *prefix, int ret) {
                 pthread_mutex_unlock(&libusb_mutex);
                 break;
            default: /* timed out */
-                 g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i)\n",prefix,ret);     
+                 g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i (%s))\n",prefix,ret,usb_strerror());
    }
    return ret;
 }
@@ -397,7 +462,10 @@ int writePixmapToLCD(unsigned char const *data)
    int ret = 0;
    int transfercount=0;
    unsigned char lcd_buffer[G15_BUFFER_LEN];
-    memset(lcd_buffer,0,G15_BUFFER_LEN);
+    /* The pixmap conversion function will overwrite everything after G15_LCD_OFFSET, so we only need to blank
+       the buffer up to this point.  (Even though the keyboard only cares about bytes 0-23.) */
+    memset(lcd_buffer, 0, G15_LCD_OFFSET);  /* G15_BUFFER_LEN); */
+
    dumpPixmapIntoLCDFormat(lcd_buffer, data);

    if(!(g15_devices[found_devicetype].caps & G15_LCD))
@@ -411,7 +479,9 @@ int writePixmapToLCD(unsigned char const *data)
    I'm not sure how successful this will be in combatting ENOSPC, but we'll give it try in the real-world. */

    if(enospc_slowdown != 0){
+#ifndef LIBUSB_BLOCKS
        pthread_mutex_lock(&libusb_mutex);
+#endif
        for(transfercount = 0;transfercount<=31;transfercount++){
            ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer+(32*transfercount), 32, 1000);
            if (ret != 32)
@@ -421,12 +491,18 @@ int writePixmapToLCD(unsigned char const *data)
            }
            usleep(100);
        }
+#ifndef LIBUSB_BLOCKS
        pthread_mutex_unlock(&libusb_mutex);
+#endif
    }else{
        /* transfer entire buffer in one hit */
+#ifdef LIBUSB_BLOCKS
+        ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
+#else
        pthread_mutex_lock(&libusb_mutex);
        ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
        pthread_mutex_unlock(&libusb_mutex);
+#endif
        if (ret != G15_BUFFER_LEN)
        {
            handle_usb_errors ("LCDPixmap Write",ret);
@@ -469,6 +545,9 @@ int setLEDs(unsigned int leds)
    unsigned char m_led_buf[4] = { 2, 4, 0, 0 };
    m_led_buf[2] = ~(unsigned char)leds;

+    if(g15DeviceCapabilities()&G15_DEVICE_G510)
+        setG510LEDColor(0, 255, 0);
+
    if(shared_device>0)
        return G15_ERROR_UNSUPPORTED;

@@ -529,6 +608,21 @@ int setKBBrightness(unsigned int level)
    return retval;
 }

+int setG510LEDColor(unsigned char r, unsigned char g, unsigned char b)
+{
+    int retval = 0;
+    unsigned char usb_data[] = { 4, 0, 0, 0 };
+
+    usb_data[1] = r;
+    usb_data[2] = g;
+    usb_data[3] = b;
+
+    pthread_mutex_lock(&libusb_mutex);
+    retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x305, 1, (char*)usb_data, 4, 10000);
+    pthread_mutex_unlock(&libusb_mutex);
+    return retval;
+}
+
 static unsigned char g15KeyToLogitechKeyCode(int key)
 {
   // first 12 G keys produce F1 - F12, thats 0x3a + key
@@ -543,7 +637,97 @@ static unsigned char g15KeyToLogitechKeyCode(int key)
    }
 }

-static void processKeyEvent(unsigned int *pressed_keys, unsigned char *buffer)
+static void processKeyEventG13(unsigned int *pressed_keys, unsigned char *buffer)
+{
+    int i;
+
+    *pressed_keys = 0;
+
+    g15_log(stderr,G15_LOG_WARN,"Keyboard G13: %x, %x, %x, %x, %x, %x, %x, %x, %x\n",buffer[0],buffer[1],buffer[2],buffer[3],buffer[4],buffer[5],buffer[6],buffer[7],buffer[8]);
+
+    if (buffer[0] == 0x25)
+    {
+        if (buffer[3]&0x01)
+      *pressed_keys |= G15_KEY_G1;
+        if (buffer[3]&0x02)
+      *pressed_keys |= G15_KEY_G2;
+        if (buffer[3]&0x04)
+      *pressed_keys |= G15_KEY_G3;
+        if (buffer[3]&0x08)
+      *pressed_keys |= G15_KEY_G4;
+        if (buffer[3]&0x10)
+      *pressed_keys |= G15_KEY_G5;
+        if (buffer[3]&0x20)
+      *pressed_keys |= G15_KEY_G6;
+        if (buffer[3]&0x40)
+      *pressed_keys |= G15_KEY_G7;
+        if (buffer[3]&0x80)
+      *pressed_keys |= G15_KEY_G8;
+
+        if (buffer[4]&0x01)
+      *pressed_keys |= G15_KEY_G9;
+        if (buffer[4]&0x02)
+      *pressed_keys |= G15_KEY_G10;
+        if (buffer[4]&0x04)
+      *pressed_keys |= G15_KEY_G11;
+        if (buffer[4]&0x08)
+      *pressed_keys |= G15_KEY_G12;
+        if (buffer[4]&0x10)
+      *pressed_keys |= G15_KEY_G13;
+        if (buffer[4]&0x20)
+      *pressed_keys |= G15_KEY_G14;
+        if (buffer[4]&0x40)
+      *pressed_keys |= G15_KEY_G15;
+        if (buffer[4]&0x80)
+      *pressed_keys |= G15_KEY_G16;
+        if (buffer[5]&0x01)
+      *pressed_keys |= G15_KEY_G17;
+        if (buffer[5]&0x02)
+      *pressed_keys |= G15_KEY_G18;
+        if (buffer[5]&0x04)
+      *pressed_keys |= G15_KEY_G19;
+        if (buffer[5]&0x08)
+      *pressed_keys |= G15_KEY_G20;
+        if (buffer[5]&0x10)
+      *pressed_keys |= G15_KEY_G21;
+        if (buffer[5]&0x20)
+      *pressed_keys |= G15_KEY_G22;
+        if (buffer[5]&0x80)
+      *pressed_keys |= G15_KEY_LIGHT;
+
+        if (buffer[6]&0x01)
+      *pressed_keys |= G15_KEY_L1;
+        if (buffer[6]&0x02)
+      *pressed_keys |= G15_KEY_L2;
+        if (buffer[6]&0x04)
+      *pressed_keys |= G15_KEY_L3;
+        if (buffer[6]&0x08)
+      *pressed_keys |= G15_KEY_L4;
+        if (buffer[6]&0x10)
+      *pressed_keys |= G15_KEY_L5;
+
+        if (buffer[6]&0x20)
+      *pressed_keys |= G15_KEY_M1;
+        if (buffer[6]&0x40)
+      *pressed_keys |= G15_KEY_M2;
+        if (buffer[6]&0x80)
+      *pressed_keys |= G15_KEY_M3;
+        if (buffer[7]&0x01)
+      *pressed_keys |= G15_KEY_MR;
+
+      /*
+        if (buffer[7]&0x02)
+      *pressed_keys |= G15_KEY_JOYBL;
+        if (buffer[7]&0x04)
+      *pressed_keys |= G15_KEY_JOYBD;
+        if (buffer[7]&0x08)
+      *pressed_keys |= G15_KEY_JOYBS;
+      */
+    }
+
+}
+
+static void processKeyEvent9Byte(unsigned int *pressed_keys, unsigned char *buffer)
 {
    int i;

@@ -634,22 +818,252 @@ static void processKeyEvent(unsigned int *pressed_keys, unsigned char *buffer)
    }
 }

+static void processKeyEvent5Byte(unsigned int *pressed_keys, unsigned char *buffer)
+{
+    int i;
+
+    *pressed_keys = 0;
+
+    g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x, %x, %x, %x\n",buffer[0],buffer[1],buffer[2],buffer[3],buffer[4]);
+
+    if (buffer[0] == 0x02)
+    {
+        if (buffer[1]&0x01)
+            *pressed_keys |= G15_KEY_G1;
+
+        if (buffer[1]&0x02)
+            *pressed_keys |= G15_KEY_G2;
+
+        if (buffer[1]&0x04)
+            *pressed_keys |= G15_KEY_G3;
+
+        if (buffer[1]&0x08)
+            *pressed_keys |= G15_KEY_G4;
+
+        if (buffer[1]&0x10)
+            *pressed_keys |= G15_KEY_G5;
+
+        if (buffer[1]&0x20)
+            *pressed_keys |= G15_KEY_G6;
+
+        if (buffer[1]&0x40)
+            *pressed_keys |= G15_KEY_M1;
+
+        if (buffer[1]&0x80)
+            *pressed_keys |= G15_KEY_M2;
+
+        if (buffer[2]&0x20)
+            *pressed_keys |= G15_KEY_M3;
+
+        if (buffer[2]&0x40)
+            *pressed_keys |= G15_KEY_MR;
+
+        if (buffer[2]&0x80)
+            *pressed_keys |= G15_KEY_L1;
+
+        if (buffer[2]&0x2)
+            *pressed_keys |= G15_KEY_L2;
+
+        if (buffer[2]&0x4)
+            *pressed_keys |= G15_KEY_L3;
+
+        if (buffer[2]&0x8)
+            *pressed_keys |= G15_KEY_L4;
+
+        if (buffer[2]&0x10)
+            *pressed_keys |= G15_KEY_L5;
+
+        if (buffer[2]&0x1)
+            *pressed_keys |= G15_KEY_LIGHT;
+    }
+
+    // G510
+    if (buffer[0] == 0x03)
+    {
+        if (buffer[1]&0x01)
+            *pressed_keys |= G15_KEY_G1;
+
+        if (buffer[1]&0x02)
+            *pressed_keys |= G15_KEY_G2;
+
+        if (buffer[1]&0x04)
+            *pressed_keys |= G15_KEY_G3;
+
+        if (buffer[1]&0x08)
+            *pressed_keys |= G15_KEY_G4;
+
+        if (buffer[1]&0x10)
+            *pressed_keys |= G15_KEY_G5;
+
+        if (buffer[1]&0x20)
+            *pressed_keys |= G15_KEY_G6;
+
+        if (buffer[1]&0x40)
+            *pressed_keys |= G15_KEY_G7;
+
+        if (buffer[1]&0x80)
+            *pressed_keys |= G15_KEY_G8;
+
+        if (buffer[2]&0x01)
+            *pressed_keys |= G15_KEY_G9;
+
+        if (buffer[2]&0x02)
+            *pressed_keys |= G15_KEY_G10;
+
+        if (buffer[2]&0x04)
+            *pressed_keys |= G15_KEY_G11;
+
+        if (buffer[2]&0x08)
+            *pressed_keys |= G15_KEY_G12;
+
+        if (buffer[2]&0x10)
+            *pressed_keys |= G15_KEY_G13;
+
+        if (buffer[2]&0x20)
+            *pressed_keys |= G15_KEY_G14;
+
+        if (buffer[2]&0x40)
+            *pressed_keys |= G15_KEY_G15;
+
+        if (buffer[2]&0x80)
+            *pressed_keys |= G15_KEY_G16;
+
+        if (buffer[3]&0x01)
+            *pressed_keys |= G15_KEY_G17;
+
+        if (buffer[3]&0x02)
+            *pressed_keys |= G15_KEY_G18;
+
+        if (buffer[3]&0x10)
+            *pressed_keys |= G15_KEY_M1;
+
+        if (buffer[3]&0x20)
+            *pressed_keys |= G15_KEY_M2;
+
+        if (buffer[3]&0x40)
+            *pressed_keys |= G15_KEY_M3;
+
+        if (buffer[3]&0x80)
+            *pressed_keys |= G15_KEY_MR;
+
+        if (buffer[4]&0x1)
+            *pressed_keys |= G15_KEY_L1;
+
+        if (buffer[4]&0x2)
+            *pressed_keys |= G15_KEY_L2;
+
+        if (buffer[4]&0x4)
+            *pressed_keys |= G15_KEY_L3;
+
+        if (buffer[4]&0x8)
+            *pressed_keys |= G15_KEY_L4;
+
+        if (buffer[4]&0x10)
+            *pressed_keys |= G15_KEY_L5;
+
+        if (buffer[3]&0x8)
+            *pressed_keys |= G15_KEY_LIGHT;
+    }
+}
+
+static void processKeyEvent4Byte(unsigned int *pressed_keys, unsigned char *buffer)
+{
+	int i;
+
+	*pressed_keys = 0;
+
+	g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x, %x, %x\n",buffer[0],buffer[1],buffer[2],buffer[3]);
+
+	if (buffer[0] == 0x02)
+	{
+		if (buffer[1]&0x01)
+			*pressed_keys |= G15_KEY_G1;
+
+		if (buffer[1]&0x02)
+			*pressed_keys |= G15_KEY_G2;
+
+		if (buffer[1]&0x04)
+			*pressed_keys |= G15_KEY_G3;
+
+		if (buffer[1]&0x08)
+			*pressed_keys |= G15_KEY_G4;
+
+		if (buffer[1]&0x10)
+			*pressed_keys |= G15_KEY_G5;
+
+		if (buffer[1]&0x20)
+			*pressed_keys |= G15_KEY_G6;
+
+		if (buffer[1]&0x40)
+			*pressed_keys |= G15_KEY_G7;
+
+		if (buffer[1]&0x80)
+			*pressed_keys |= G15_KEY_G8;
+
+		if (buffer[2]&0x01)
+			*pressed_keys |= G15_KEY_G9;
+
+		if (buffer[2]&0x02)
+			*pressed_keys |= G15_KEY_G10;
+
+		if (buffer[2]&0x04)
+			*pressed_keys |= G15_KEY_G11;
+
+		if (buffer[2]&0x08)
+			*pressed_keys |= G15_KEY_G12;
+
+		if (buffer[2]&0x10)
+			*pressed_keys |= G15_KEY_M1;
+
+		if (buffer[2]&0x20)
+			*pressed_keys |= G15_KEY_M2;
+
+		if (buffer[2]&0x40)
+			*pressed_keys |= G15_KEY_M3;
+
+		if (buffer[2]&0x80)
+			*pressed_keys |= G15_KEY_MR;
+
+		if (buffer[3]&0x1)
+			*pressed_keys |= G15_KEY_LIGHT;
+	}
+}
+
 int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
 {
-    unsigned char buffer[9];
+    unsigned char buffer[G15_KEY_READ_LENGTH];
    int ret = 0;
-    pthread_mutex_lock(&libusb_mutex);
-    ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, 9, timeout);
-    pthread_mutex_unlock(&libusb_mutex);
+    int caps = 0;

-    if (ret == 9)
-    {
+#ifdef LIBUSB_BLOCKS
+    ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, G15_KEY_READ_LENGTH, timeout);
+#else
+    pthread_mutex_lock(&libusb_mutex);
+    ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, G15_KEY_READ_LENGTH, timeout);
+    pthread_mutex_unlock(&libusb_mutex);
+#endif
+    if(ret>0) {
      if(buffer[0] == 1)
        return G15_ERROR_TRY_AGAIN;
+    }

-        processKeyEvent(pressed_keys, buffer);
-    
+    caps = g15DeviceCapabilities();
+    if((caps & G15_DEVICE_G13) && buffer[0]==0x25){
+      processKeyEventG13(pressed_keys, buffer);
      return G15_NO_ERROR;
    }
+
+    switch(ret) {
+      case 4:
+          processKeyEvent4Byte(pressed_keys, buffer);
+          return G15_NO_ERROR;
+      case 5:
+          processKeyEvent5Byte(pressed_keys, buffer);
+          return G15_NO_ERROR;
+      case 9:
+          processKeyEvent9Byte(pressed_keys, buffer);
+          return G15_NO_ERROR;
+      default:
          return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
    }
+}
@@ -17,7 +17,7 @@
    
    (c) 2006 - 2007 The G15tools Project - g15tools.sf.net
    
-    $Revision: 263 $ -  $Date: 2007-10-18 12:23:30 +0930 (Thu, 18 Oct 2007) $ $Author: mlampard $
+    $Revision: 324 $ -  $Date: 2011-02-24 03:13:57 +0300 (Thu, 24 Feb 2011) $ $Author: SteelSide $
 */

 #ifndef _LIBG15_H_
@@ -31,6 +31,12 @@ extern "C"
 #define G15_LCD 1
 #define G15_KEYS 2
 #define G15_DEVICE_IS_SHARED 4
+#define G15_DEVICE_5BYTE_RETURN 8
+#define G15_DEVICE_G13 16
+#define G15_DEVICE_G510 32
+
+#define G15_KEY_READ_LENGTH 9
+#define G510_STANDARD_KEYBOARD_INTERFACE	0x0

 typedef struct libg15_devices_t libg15_devices_t;

@@ -123,6 +129,10 @@ struct libg15_devices_t {
    G15_KEY_G16 = 1<<15,
    G15_KEY_G17 = 1<<16,
    G15_KEY_G18 = 1<<17,
+    G15_KEY_G19 = 1<<28,
+    G15_KEY_G20 = 1<<29,
+    G15_KEY_G21 = 1<<30,
+    G15_KEY_G22 = 1<<31,

    G15_KEY_M1  = 1<<18,
    G15_KEY_M2  = 1<<19,
@@ -136,6 +146,11 @@ struct libg15_devices_t {
    G15_KEY_L5  = 1<<26,

    G15_KEY_LIGHT = 1<<27
+
+    //need to add them to the enum but not enough positions left
+    //  G15_KEY_JOYBL = 1<<32,
+    //  G15_KEY_JOYBD = 1<<33,
+    //  G15_KEY_JOYBS = 1<<34
  };


@@ -154,6 +169,7 @@ struct libg15_devices_t {
  int setLEDs(unsigned int leds);
  int setLCDBrightness(unsigned int level);
  int setKBBrightness(unsigned int level);  
+  int setG510LEDColor(unsigned char r, unsigned char g, unsigned char b);  

  /* Please be warned
   * the g15 sends two different usb msgs for each key press
@@ -3,11 +3,11 @@
 %define prefix	/usr
 Summary: library to control logitech G15 keyboards
 Name: libg15
-Version: 1.2.3
+Version: 1.2.7
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Applications/System
-Source: http://prdownloads.sourceforge.net/g15tools/libg15-1.2.3.tar.bz2
+Source: http://prdownloads.sourceforge.net/g15tools/libg15-1.2.7.tar.bz2
 URL: http://sourceforge.net/projects/g15tools
 Distribution: Linux
 Vendor: NONE
Author	SHA1	Message	Date
Andrej Shadura	1cba4225b6	Update the changelog	2019-12-05 14:34:56 +00:00
Andrej Shadura	3bb6ff620e	Drop an explicit libusb-1.0-0 dependency in the binary package This dependency will get generated automatically by dh_shlibdeps.	2019-12-05 14:32:40 +00:00
Andrej Shadura	08b59c86d4	Put some spaces into the dependency specifications for readability	2019-12-05 14:32:14 +00:00
Andrej Shadura	efc707a7bf	Rename the patch: 01-fix-spelling.path -> 01-fix-spelling.patch	2019-12-05 14:31:20 +00:00
Andrej Shadura	4663ed8917	Update the patch name in the series	2019-12-05 14:30:54 +00:00
Andrej Shadura	8ddb076537	Merge the USB backend rework branch into debian/master	2019-12-05 14:23:46 +00:00
Alexander Ponyatykh	02ea3752d0	Remove 00-fix-reinit.patch Initialization and deinitialization functions were rewritten as part of switch to libusb 1.0 path. There is no point in keeping a separate patch that changes them slightly.	2019-11-19 00:33:42 +03:00
Alexander Ponyatykh	3e35fe1061	Use debhelper-compat instead of debian/compat	2019-11-18 02:58:36 +03:00
Alexander Ponyatykh	0408478701	Rewrite of initialization and deinitialization functions Original code iterates through every possible descriptor in nested loops and tries to do initialization every iteration without considered what are those descriptors for nor stopping when interface is finally claimed. It has following problems: 1. It iterates through all configurations, but explicitly resets a device configuration to 1 every iteration. 2. It never configures a possibly shared device even it is currently unconfigured. 3. It treats alternative settings as independent interfaces and iterates through them while implicitly setting alternative setting to 0. 4. It can claim several interfaces but uses only the last one. 5. It doesn't track claimed interfaces' number and always deinitializes interface 0. This in fact works for a device with single configuration, single interface and no alternative settings, like most of the supported devices (except G510), but it is fundamentally incorrect. Therefore as part of migration to libusb 1.0 I've rewritten the initialization procedure in a more linear way. First it selects a configuration, which is 1 in most cases. Next it iterates through descriptors in this configuration to find a single compatible interface. Only after that it resets the device and claims the interface.	2019-11-18 02:50:24 +03:00
Alexander Ponyatykh	bd4495ec01	Fix transfer error handling	2019-11-18 02:50:24 +03:00
Alexander Ponyatykh	80dac3d2d6	Use explict libusb_context	2019-11-18 02:50:24 +03:00
Alexander Ponyatykh	aa2cf02029	Change log level for some error messages Contrary to expectations, G15_LOG_WARN is more verbose level than G15_LOG_INFO.	2019-11-18 02:50:24 +03:00
Alexander Ponyatykh	98449afc5d	Delay calling libusb_set_option() until libusb is initialized G15daemon calls libg15Debug() before initLibG15(). This works well with the legacy library, but the new one requres a context to be initialized before calling any functions. This patch adds tracking of libusb initialization status and never calls libusb_set_option() when library is not initialized.	2019-11-18 02:50:13 +03:00
Alexander Ponyatykh	92e60dd1a4	Migrate from legacy libusb-0.1 to libusb-1.0	2019-11-17 00:21:34 +03:00
Andrej Shadura	2cea8187ec	Update the changelog	2019-11-16 19:16:18 +01:00
Alexander Ponyatykh	9bccbfa208	Removed override for dh_makeshlibs, because this version changes ABI	2019-11-15 01:10:05 +03:00
Alexander Ponyatykh	9c78d63e0c	Fix spelling error in log message	2019-11-14 00:57:22 +03:00
Alexander Ponyatykh	854430b9b8	Update packaging: * Remove watch file. * Сonformant to policy 4.4.1.1. * Remove obsolete variable from debian/rules. * Add Vcs fileds to debian/control	2019-11-14 00:29:44 +03:00
Alexander Ponyatykh	63fce22fd8	Update upstream source from tag 'upstream/1.3.0_svn324' Update to upstream version '1.3.0~svn324' with Debian dir `f7dfa8d20b`	2019-11-13 22:51:35 +03:00
Alexander Ponyatykh	649e30d0a2	New upstream version 1.3.0~svn324	2019-11-13 22:51:35 +03:00
Alexander Ponyatykh	1b84f9ae6d	Update the changelog	2019-05-10 11:46:02 +02:00
Alexander Ponyatykh	f0ab55d7b4	New maintainer	2019-05-10 11:42:52 +02:00
Alexander Ponyatykh	8416e8294e	Update policy version to 4.3.0	2019-05-10 11:42:31 +02:00
Alexander Ponyatykh	1126bcf712	Switch to dh from cdbs, multiarchify, update debian/control	2019-05-10 11:41:39 +02:00
Alexander Ponyatykh	4cf9e13b7e	Use 3.0 (quilt) source format	2019-05-10 11:39:02 +02:00
Alexander Ponyatykh	0c642df5e3	Remove redundant documentation files	2019-05-10 11:36:38 +02:00
Alexander Ponyatykh	dfaff3b01b	Add a patch to fix re_initLibG15() to properly reset the internal state This allows g15daemon to continue working after keyboard was replugged and after suspend or hibernate. LP: #1357556	2019-05-10 11:34:58 +02:00
Giacomo Catenazzi	862c94c485	Import Upstream version 1.2.7	2019-04-29 15:39:29 +02:00
Giacomo Catenazzi	fd6a5d112b	Import Upstream version 1.2.6	2019-04-29 15:39:29 +02:00
Giacomo Catenazzi	7347e0eb26	Import Upstream version 1.2.5	2019-04-29 15:39:28 +02:00
Giacomo Catenazzi	3f84e6db54	Import Upstream version 1.2.4	2019-04-29 15:39:28 +02:00
Daniel Schepler	ef8cd284b9	Import Debian changes 1.2.7-2+libtool libg15 (1.2.7-2+libtool) unreleased; urgency=low * Update libtool at build time using dh-autoreconf, in order to fix a build failure on x32.	2013-03-05 07:23:03 -08:00
Giacomo Catenazzi	2db3a95b79	Import Debian changes 1.2.7-2 libg15 (1.2.7-2) unstable; urgency=low * 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	2009-09-10 08:19:39 +02:00
Giacomo Catenazzi	585875bc07	Import Debian changes 1.2.7-1 libg15 (1.2.7-1) unstable; urgency=low * New upstream release	2009-04-22 07:24:53 +02:00
Giacomo Catenazzi	981e33d1a8	Import Debian changes 1.2.6-1 libg15 (1.2.6-1) unstable; urgency=low * New upstream release	2008-01-28 07:58:11 +01:00
Giacomo Catenazzi	09feb56516	Import Debian changes 1.2.5-1 libg15 (1.2.5-1) unstable; urgency=low * New upstream release	2008-01-09 08:06:33 +01:00
Giacomo Catenazzi	f47538d475	Import Debian changes 1.2.4-1 libg15 (1.2.4-1) unstable; urgency=low * New upstream release	2007-12-18 08:08:43 +01:00
Giacomo Catenazzi	38380e6484	Import Debian changes 1.2.3-1 libg15 (1.2.3-1) unstable; urgency=low * New upstrem version: add support of new g15 keyboards	2007-11-15 07:44:43 +01:00
Giacomo Catenazzi	5d383b32d1	Import Debian changes 1.2.2-1 libg15 (1.2.2-1) unstable; urgency=low * Initial release	2007-08-27 07:56:10 +02:00