From 5a931008297d464c520deab7fb78b619ecca9e11 Mon Sep 17 00:00:00 2001 From: Giacomo Catenazzi Date: Tue, 28 Aug 2007 19:09:53 +0200 Subject: [PATCH] Import Debian changes 1.2-1 libg15render (1.2-1) unstable; urgency=low * Initial release --- debian/changelog | 15 +--- debian/compat | 2 +- debian/control | 36 ++++++---- debian/copyright | 31 +++++++-- debian/dirs | 2 + debian/libg15render-dev.install | 11 ++- debian/libg15render1.install | 1 + debian/libg15render1.manpages | 1 + debian/rules | 117 ++------------------------------ debian/watch | 7 ++ pixel.c | 3 + text.c | 2 +- 12 files changed, 74 insertions(+), 154 deletions(-) create mode 100644 debian/dirs create mode 100644 debian/libg15render1.install create mode 100644 debian/libg15render1.manpages create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index 7cefe46..abb2bbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,6 @@ -libg15render (1.2-1) edgy; urgency=low +libg15render (1.2-1) unstable; urgency=low - * Add WBMP loading and drawing routines - * Add drawBigNum routine - * Add man page - * Enable right justified TTF printing + * Initial release - -- Anthony J. Mirabella Mon, 01 Jan 2007 17:11:31 -0500 - -libg15render (1.1-1) breezy; urgency=low - - * Initial release - - -- Anthony J. Mirabella Sun, 24 Sep 2006 22:57:06 -0400 + -- Giacomo Catenazzi Tue, 28 Aug 2007 19:09:53 +0200 diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 727417b..3d2afa5 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,29 @@ Source: libg15render -Priority: optional -Maintainer: Anthony J. Mirabella -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libg15-dev, libfreetype6-dev -Standards-Version: 3.6.2 Section: libs +Priority: optional +Maintainer: Giacomo Catenazzi +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libg15-1 +Standards-Version: 3.7.2 + +Package: libg15render1 +Section: libs +Architecture: any +Depends: ${shlibs: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 for graphics primitives and + text services for the display of the G15 keyboard. Package: libg15render-dev Section: libdevel Architecture: any -Depends: libg15render (= ${Source-Version}) -Description: Development packages for libg15render - Includes the files needed for developing software that uses libg15render. +Depends: libg15render1 (= ${binary:Version}) +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 of + libg15render. -Package: libg15render -Section: libs -Architecture: any -Depends: ${shlibs:Depends} -Description: Library for rendering displays for the Logitech G15 Keyboard - Provides simple graphics primitives and text services for the display on the - Logitech G15 keyboard. diff --git a/debian/copyright b/debian/copyright index 97407cb..887953c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,29 @@ -This package was debianized by Anthony J. Mirabella on -Sun, 24 Sep 2006 22:57:06 -0400. +This package was debianized by Giacomo A. Catenazzi on +Tue, 28 Aug 2007 19:09:53 +0200. -It was downloaded from sourceforge.net +It was downloaded from http://g15tools.sourceforge.net/ -Copyright Holders: Philip Lawatsch - Alex Ibrado - Autotools support added by Anthony J. Mirabella +Upstream Authors: + Philip Lawatsch + Alex Ibrado + Anthony J. Mirabella + Mike Lampard +Copyright: + + Copyright (C) 2006,2007 Philip Lawatsch + Alex Ibrado + Anthony J. Mirabella + Mike Lampard License: -GPL + g15tools is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +License can be found in the file `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is (C) 2007, Giacomo A. Catenazzi and +is licensed under the GPL v2 (ot later), see `/usr/share/common-licenses/GPL-2'. + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..ca882bb --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/debian/libg15render-dev.install b/debian/libg15render-dev.install index 3c996c8..e4dec96 100644 --- a/debian/libg15render-dev.install +++ b/debian/libg15render-dev.install @@ -1,6 +1,5 @@ -usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/lib/*.la -usr/share/pkgconfig/* +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/ + diff --git a/debian/libg15render1.install b/debian/libg15render1.install new file mode 100644 index 0000000..483b6b5 --- /dev/null +++ b/debian/libg15render1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* usr/lib/ diff --git a/debian/libg15render1.manpages b/debian/libg15render1.manpages new file mode 100644 index 0000000..58d6991 --- /dev/null +++ b/debian/libg15render1.manpages @@ -0,0 +1 @@ +libg15render.3 diff --git a/debian/rules b/debian/rules index 0a3c526..4bee969 100755 --- a/debian/rules +++ b/debian/rules @@ -1,115 +1,6 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# shared library versions, option 1 -version=1.1.0 -major=1 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-ttf - - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs -plibg15 - dh_installdirs -plibg15-dev - - # Add here commands to install the package into debian/tmp - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installchangelogs ChangeLog -a - dh_installdocs -a - dh_installexamples -a - dh_install -a --sourcedir=debian/tmp - dh_installmenu -a - dh_installdebconf -a - dh_installlogrotate -a - dh_installemacsen -a - dh_installpam -a - dh_installmime -a - dh_installinit -a - dh_installcron -a - dh_installinfo -a - dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a -# dh_perl -a -# dh_python -a - dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +# Add here any variable or target overrides you need. diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..615da81 --- /dev/null +++ b/debian/watch @@ -0,0 +1,7 @@ +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://sf.net/g15tools libg15render-(.*)\.tar\.bz2 + diff --git a/pixel.c b/pixel.c index 798d42f..d518cf6 100644 --- a/pixel.c +++ b/pixel.c @@ -16,7 +16,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include #include +#include #include "libg15render.h" void diff --git a/text.c b/text.c index 7565252..c83b07f 100644 --- a/text.c +++ b/text.c @@ -106,7 +106,7 @@ g15r_renderString (g15canvas * canvas, unsigned char stringOut[], int row, { int i = 0; - for (i; stringOut[i] != NULL; ++i) + for (i; stringOut[i] != 0; ++i) { switch (size) {