--- g15composer-3.2.orig/g15composer.tab.c +++ g15composer-3.2/g15composer.tab.c @@ -58,8 +58,6 @@ /* Using locations. */ #define YYLSP_NEEDED 0 - - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -220,7 +218,8 @@ # define YYSTYPE_IS_TRIVIAL 1 #endif - +typedef void* yyscan_t; +extern int yylex (YYSTYPE * yylval_param ,yyscan_t yyscanner); /* Copy the second part of user declarations. */ --- g15composer-3.2.orig/g15composer.c +++ g15composer-3.2/g15composer.c @@ -46,6 +46,30 @@ return (0); } +/* extern definition, from the parser */ +typedef void* yyscan_t; + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +{ + int number; + char *string; + struct strList *strList; +} YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + +extern int yylex_init (yyscan_t* scanner); +extern void yyset_in (FILE * in_str ,yyscan_t yyscanner ); +extern int yyparse (void *YYPARSE_PARAM); +extern FILE *yyget_in (yyscan_t yyscanner ); +extern int yylex (YYSTYPE * yylval_param ,yyscan_t yyscanner); +extern int yylex_destroy (yyscan_t yyscanner ); +/* end of missing declaration */ + + void printUsage () { --- g15composer-3.2.orig/debian/rules +++ g15composer-3.2/debian/rules @@ -1,107 +1,14 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# force removal of some upstream files in debian/ , not to confuse +# debian debian/ +clean:: + -rm -f debian/g15composer.init debian/README.Debian + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk -# 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) +DEB_DESTDIR = $(CURDIR)/debian/tmp/ +DEB_CONFIGURE_EXTRA_FLAGS = --enable-ttf --quiet - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -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) - #docbook-to-man debian/g15composer.sgml > g15composer.1 - - 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 - - # Add here commands to install the package into debian/g15composer. - $(MAKE) install DESTDIR=$(CURDIR)/debian/g15composer - - -# 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 - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_install -a -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime - dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python - dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install --- g15composer-3.2.orig/debian/control +++ g15composer-3.2/debian/control @@ -1,13 +1,18 @@ Source: g15composer Section: utils -Priority: optional -Maintainer: Anthony J. Mirabella -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libg15-dev, libg15daemon-client-dev, libg15render-dev (>= 1.2), libfreetype6-dev -Standards-Version: 3.6.2 +Priority: extra +Maintainer: Giacomo Catenazzi +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libfreetype6-dev, + libg15-dev, libg15render-dev (>= 1.2-3), libg15daemon-client-dev +Standards-Version: 3.8.2 +Homepage: http://www.g15tools.com/ Package: g15composer +Section: utils Architecture: any -Depends: ${shlibs:Depends}, g15daemon +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scriptable command interface to libg15render - G15composer provides a scriptable command interface to libg15render that exposes all of the - text and graphics functions of libg15render to shell and other scripts. + G15composer provides a scriptable command interface to libg15render + that exposes all of the text and graphics functions of libg15render + to shell and other scripts. + --- g15composer-3.2.orig/debian/compat +++ g15composer-3.2/debian/compat @@ -1 +1 @@ -4 +5 --- g15composer-3.2.orig/debian/copyright +++ g15composer-3.2/debian/copyright @@ -1,10 +1,30 @@ -This package was debianized by Anthony J. Mirabella on -Thu, 28 Sep 2006 04:46:06 -0400. +This package was debianized by Giacomo A. Catenazzi on +Sat, 15 Sep 2007 08:32:51 +0200. -It was downloaded from +It was downloaded from http://g15tools.sourceforge.net/ -Copyright Holder: +Upstream Author: + Anthony J. Mirabella + +Copyright: + + Copyright (C) 2006,2007 Anthony J. Mirabella 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. + + g15tools 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. + + +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'. + --- g15composer-3.2.orig/debian/changelog +++ g15composer-3.2/debian/changelog @@ -1,55 +1,17 @@ -g15composer (3.2-1) edgy; urgency=low - * Use libg15daemon_client for status commands - fixes MP etc - * Stop sending blank buffers in addition to commands. +g15composer (3.2-2) unstable; urgency=low - -- Mike Lampard Sat, 26 Jan 2008 11:36:04 +1030 + * Update policy, add ${misc:Depends}, add homepage -g15composer (3.1-1) edgy; urgency=low + -- Giacomo Catenazzi Tue, 11 Aug 2009 07:52:08 +0200 - * Add support for new WBMP and bignum routines in libg15render-1.2 - * Improve FIFO handling to recover dangling FIFOs - * Add -u/--user -g/--group command line options to change effective UID/GID - * Add -r command line option to reuse running g15composer instance +g15composer (3.2-1) unstable; urgency=low - -- Anthony J. Mirabella Mon, 01 Jan 2007 17:16:35 -0500 + * New upstream release -g15composer (3.0-1) edgy; urgency=low + -- Giacomo Catenazzi Tue, 29 Jan 2008 07:59:19 +0100 - * Reimplement g15composer using flex and bison - * Text may now be right justified with the TO command - * Some command syntax has changed. See README for details. +g15composer (3.1-1) unstable; urgency=low - -- Anthony J. Mirabella Thu, 26 Oct 2006 17:06:13 -0400 - -g15composer (2.1-1) dapper; urgency=low - - * Move parts of G15Composer to G15Base - * Implement simplified G15Control - * Handle FIFO creation and deletion - * Use simplified control pipe if started with -b - - -- Anthony J. Mirabella Fri, 20 Oct 2006 05:29:31 -0400 - -g15composer (2.0-1) dapper; urgency=low - - * Refactor code into G15Composer class - * Fix font rendering bug - * Add SN and SC commands to create and destry screens - - Remove g15script support (this can be done with shell scripts and/or cat) - - -- Anthony J. Mirabella Wed, 18 Oct 2006 23:18:19 -0400 - -g15composer (1.1-1) dapper; urgency=low - - * Enable control of LCD contrast and backlight - * Enable control of M1-M3 LEDs - * Verify that we are actually given a fifo to read from - - -- Anthony J. Mirabella Sat, 07 Oct 2006 01:51:29 -0400 - -g15composer (1.0.1-1) dapper; urgency=low - - * Initial release - - -- Anthony J. Mirabella Thu, 28 Sep 2006 04:46:06 -0400 + * Initial release + -- Giacomo Catenazzi Sat, 15 Sep 2007 08:34:25 +0200 --- g15composer-3.2.orig/debian/watch +++ g15composer-3.2/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 g15composer-([1-9].*)\.tar\.bz2 + --- g15composer-3.2.orig/debian/g15composer.manpages +++ g15composer-3.2/debian/g15composer.manpages @@ -0,0 +1 @@ +doc/g15composer.1 --- g15composer-3.2.orig/debian/g15composer.install +++ g15composer-3.2/debian/g15composer.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/g15composer usr/bin/