Add gbp.conf

Fixes lintian: file-contains-trailing-whitespace
See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.

debian/changelog

@@ -1,3 +1,26 @@
+libg15render (1.3.0~svn316-3) unstable; urgency=medium
+
+  [ Alexander Ponyatykh ]
+  * New maintainer (Closes: #945181).
+  * Switch to debhelper.
+  * Remove d/watch file pointing to a dead site.
+  * Don't install .la files.
+  * Multiarchify.
+  * Remove unneeded build dependencies (Closes: #810434).
+  * debian/patches/01-pkg-config-configure-in.patch:
+    - Fix failed cross build from source due to incorrect use of pkg-config
+      (Closes: #945403).
+  * Update debian/copyright.
+
+  [ Andrej Shadura ]
+  * Remove debian/tmp from the install files.
+  * Convert debian/copyright to the machine-readable format.
+  * d/{changelog, control}: Remove trailing whitespaces.
+  * d/control: Add Vcs-* field.
+  * Add gbp.conf.
+
+ -- Andrej Shadura <andrewsh@debian.org>  Sun, 05 Jan 2020 20:40:17 +0100
+
 libg15render (1.3.0~svn316-2.4) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -88,4 +111,3 @@ libg15render (1.2-1) unstable; urgency=low
   * Initial release
 
  -- Giacomo Catenazzi <cate@debian.org>  Tue, 28 Aug 2007 19:09:53 +0200
-

debian/compat

@@ -1 +0,0 @@
-5

debian/control

@@ -1,11 +1,12 @@
 Source: libg15render
 Section: libs
 Priority: optional
-Maintainer: Giacomo Catenazzi <cate@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtool, automake1.11,
- libg15-dev, libusb-dev, libfreetype6-dev, pkg-config, quilt
-Standards-Version: 3.8.2
-Homepage: http://www.g15tools.com
+Maintainer: Alexander Ponyatykh <lazyranma@gmail.com>
+Build-Depends: debhelper-compat (= 12), pkg-config, libfreetype6-dev
+Standards-Version: 4.4.1
+Homepage: https://sourceforge.net/projects/g15tools/
+Vcs-Browser: https://salsa.debian.org/debian/libg15render
+Vcs-Git: https://salsa.debian.org/debian/libg15render.git
 
 Package: libg15render1
 Section: libs
@@ -29,4 +30,3 @@ Description: Library for interfacing with the Logitech G15 keyboards
  .
  This package contains the header files and the static library of
  libg15render.
-

debian/copyright

@@ -1,29 +1,24 @@
-This package was debianized by Giacomo A. Catenazzi <cate@debian.org> on
-Tue, 28 Aug 2007 19:09:53 +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>
-    Mike Lampard <mlampard@users.sf.net>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
+Files: *
 Copyright:
+ 2006, 2007 Philip Lawatsch <philip@lawatsch.at>,
+            Alex Ibrado <alex@ibrado.org>,
+            Anthony J. Mirabella <mirabeaj@gmail.com>,
+            Mike Lampard <mlampard@users.sf.net>
+ 2008—2009 The G15Tools project
+License: GPL-2+
 
-    Copyright (C) 2006,2007	Philip Lawatsch <philip@lawatsch.at>
-				Alex Ibrado <alex@ibrado.org>
-				Anthony J. Mirabella <mirabeaj@gmail.com>
-				Mike Lampard <mlampard@users.sf.net>
-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 (ot later), see `/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright:
+ 2007, 2009 Giacomo A. Catenazzi <cate@debian.org>
+ 2019       Alexander Ponyatykh <lazyranma@gmail.com>
+License: GPL-2+
 
+License: GPL-2+
+ 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'.

debian/gbp.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = debian/master
+upstream-branch = upstream/latest

debian/libg15render-dev.install

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

debian/libg15render1.install

@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib/
-debian/tmp/usr/share/g15tools/fonts/G15/* usr/share/g15tools/fonts/G15/
+/usr/lib/*/lib*.so.*
+/usr/share/g15tools/fonts/G15/*

debian/patches/01-pkg-config-configure-in.patch

@@ -1,11 +1,54 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Subject: Fix cross build from source
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945403
 --- a/configure.in
 +++ b/configure.in
-@@ -17,7 +17,7 @@
- AC_ARG_ENABLE(ttf, [  --enable-ttf		enable FreeType2 support],
- 	if [[[ "$enableval" = "yes" ]]]; then
- 		AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
+@@ -14,17 +14,15 @@
+ 
+ # Checks for --enable args
+ AC_MSG_CHECKING(whether to enable FreeType2 support)
+-AC_ARG_ENABLE(ttf, [  --enable-ttf		enable FreeType2 support],
+-	if [[[ "$enableval" = "yes" ]]]; then
+-		AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
 -		CFLAGS="$CFLAGS `freetype-config --cflags`"
-+		CFLAGS="$CFLAGS `pkg-config --cflags freetype2`"
- 		FTLIB="-lfreetype"
- 		ttf_support="yes"
- 	else
+-		FTLIB="-lfreetype"
+-		ttf_support="yes"
+-	else
+-		ttf_support="no"
+-	fi,
++AC_ARG_ENABLE(ttf, [  --enable-ttf		enable FreeType2 support])
++AS_IF([[[ "$enable_ttf" = "yes" ]]],[
++	AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
++	PKG_CHECK_MODULES([FREETYPE2],[freetype2])
++	CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++	ttf_support="yes"
++],[
+ 	ttf_support="no"
+-)
++])
+ AC_MSG_RESULT($ttf_support)
+ 
+ # Checks for libraries.
+@@ -43,7 +41,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_FUNCS([memset])
+ 
+-AC_SUBST(FTLIB)
+ AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,10 +5,10 @@
+ 
+ lib_LTLIBRARIES = libg15render.la
+ libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c
+-libg15render_la_LIBADD = @FTLIB@
++libg15render_la_LIBADD = @FREETYPE2_LIBS@
+ libg15render_la_LDFLAGS = -version-info 2:0:1
+ include_HEADERS= libg15render.h
+ 
+ bin_PROGRAMS = g15fontconvert
+ g15fontconvert_SOURCES = g15fontconvert.c
+-g15fontconvert_LDADD = libg15render.la @FTLIB@
++g15fontconvert_LDADD = libg15render.la @FREETYPE2_LIBS@

debian/rules

@@ -1,28 +1,12 @@
 #!/usr/bin/make -f
 
-AUTOMAKE_REMOVE := Makefile Makefile.in configure aclocal.m4
-AUTOMAKE_REMOVE += src/*.lo src/*.o src/*.la src/Makefile src/Makefile.in
-AUTOMAKE_REMOVE += config.status config.log config.h config.h.in config/* 
-AUTOMAKE_REMOVE += libtool stamp-h1 .libs src/.libs
+DH_VERBOSE = 1
 
+%:
+	dh $@
 
-UPSTREAM_DEBIANDIR_REMOVE := debian/dirs
-clean::
-	-rm -Rf $(AUTOMAKE_REMOVE)
-	-rm -f $(UPSTREAM_DEBIANDIR_REMOVE)
+override_dh_makeshlibs:
+	dh_makeshlibs --version-info=None
 
-makebuilddir:: Makefile
-
-Makefile:: Makefile.am bootstrap
-	./bootstrap
-
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-ttf
-
-common-install-arch::
-	for file in debian/tmp/usr/lib/*.la; do \
-		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
-	done
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-ttf

debian/watch

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