diff -u lirc-0.8.2/debian/changelog lirc-0.8.2/debian/changelog --- lirc-0.8.2/debian/changelog +++ lirc-0.8.2/debian/changelog @@ -1,3 +1,16 @@ +lirc (0.8.2-0ubuntu8) gutsy; urgency=low + + * Add 22_hauppauge_novat_500.dpatch for more complete + novat-500 support. (LP: #145847) + * Update 16_lirc-gpio.dpatch to make all lirc_gpio remotes + use the dev/input interface instead. (LP: #148756) + * Update 21_atiusb.dpatch to make Snapstream remotes + have their own item. (LP: #140060) + * Update 12_pvr150_transmit_support.dpatch to fix a + m-a related FTBFS. (LP: #147440) + + -- Mario Limonciello Mon, 08 Oct 2007 02:35:50 -0500 + lirc (0.8.2-0ubuntu7) gutsy; urgency=low * Be sure to rmmod ati_remote.ko if necessary (LP: #140940) diff -u lirc-0.8.2/debian/patches/00list lirc-0.8.2/debian/patches/00list --- lirc-0.8.2/debian/patches/00list +++ lirc-0.8.2/debian/patches/00list @@ -14,0 +15 @@ +22_hauppauge_novat_500.dpatch diff -u lirc-0.8.2/debian/patches/12_pvr150_transmit_support.dpatch lirc-0.8.2/debian/patches/12_pvr150_transmit_support.dpatch --- lirc-0.8.2/debian/patches/12_pvr150_transmit_support.dpatch +++ lirc-0.8.2/debian/patches/12_pvr150_transmit_support.dpatch @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad lirc-0.8.2~/configure lirc-0.8.2/configure ---- lirc-0.8.2~/configure 2007-06-09 14:36:00.000000000 -0500 -+++ lirc-0.8.2/configure 2007-07-11 19:20:10.000000000 -0500 +--- lirc-0.8.2~/configure 2007-10-08 02:53:05.000000000 -0500 ++++ lirc-0.8.2/configure 2007-10-08 02:53:15.000000000 -0500 @@ -1072,7 +1072,7 @@ chronos, cmdir, comX, cph06x, creative, creative_infracd, devinput, digimatrix, dsp, @@ -66,8 +66,8 @@ # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff -urNad lirc-0.8.2~/configure.in lirc-0.8.2/configure.in ---- lirc-0.8.2~/configure.in 2007-06-09 13:54:09.000000000 -0500 -+++ lirc-0.8.2/configure.in 2007-07-11 19:20:10.000000000 -0500 +--- lirc-0.8.2~/configure.in 2007-10-08 02:53:05.000000000 -0500 ++++ lirc-0.8.2/configure.in 2007-10-08 02:53:15.000000000 -0500 @@ -169,6 +169,7 @@ (lirc_dev lirc_cmdir) \ (lirc_dev lirc_gpio) \ @@ -125,8 +125,8 @@ drivers/lirc_ttusbir/Makefile drivers/lirc_imon/Makefile diff -urNad lirc-0.8.2~/drivers/Makefile.am lirc-0.8.2/drivers/Makefile.am ---- lirc-0.8.2~/drivers/Makefile.am 2007-05-26 08:30:51.000000000 -0500 -+++ lirc-0.8.2/drivers/Makefile.am 2007-07-11 19:20:10.000000000 -0500 +--- lirc-0.8.2~/drivers/Makefile.am 2007-10-08 02:53:05.000000000 -0500 ++++ lirc-0.8.2/drivers/Makefile.am 2007-10-08 02:53:15.000000000 -0500 @@ -19,6 +19,7 @@ lirc_mceusb \ lirc_mceusb2 \ @@ -136,8 +136,8 @@ lirc_serial \ lirc_sir \ diff -urNad lirc-0.8.2~/drivers/Makefile.in lirc-0.8.2/drivers/Makefile.in ---- lirc-0.8.2~/drivers/Makefile.in 2007-06-09 14:35:58.000000000 -0500 -+++ lirc-0.8.2/drivers/Makefile.in 2007-07-11 19:20:10.000000000 -0500 +--- lirc-0.8.2~/drivers/Makefile.in 2007-10-08 02:53:05.000000000 -0500 ++++ lirc-0.8.2/drivers/Makefile.in 2007-10-08 02:53:15.000000000 -0500 @@ -138,6 +138,7 @@ lirc_mceusb \ lirc_mceusb2 \ @@ -148,9 +148,9 @@ lirc_sir \ diff -urNad lirc-0.8.2~/drivers/lirc_pvr150/Makefile.am lirc-0.8.2/drivers/lirc_pvr150/Makefile.am --- lirc-0.8.2~/drivers/lirc_pvr150/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.2/drivers/lirc_pvr150/Makefile.am 2007-07-11 19:20:10.000000000 -0500 ++++ lirc-0.8.2/drivers/lirc_pvr150/Makefile.am 2007-10-08 02:53:57.000000000 -0500 @@ -0,0 +1,13 @@ -+## $Id: Makefile.am,v 1.6 2004/04/25 16:29:26 lirc Exp $ ++## $Id: Makefile.am,v 1.1 2005/07/18 11:18:22 lirc Exp $ + +## Process this file with automake to produce Makefile.in + @@ -165,13 +165,13 @@ +include ../Makefile.common diff -urNad lirc-0.8.2~/drivers/lirc_pvr150/Makefile.in lirc-0.8.2/drivers/lirc_pvr150/Makefile.in --- lirc-0.8.2~/drivers/lirc_pvr150/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.2/drivers/lirc_pvr150/Makefile.in 2007-07-11 19:20:10.000000000 -0500 -@@ -0,0 +1,526 @@ -+# Makefile.in generated by automake 1.10 from Makefile.am. ++++ lirc-0.8.2/drivers/lirc_pvr150/Makefile.in 2007-10-08 02:53:56.000000000 -0500 +@@ -0,0 +1,417 @@ ++# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ + -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ++# 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. @@ -184,518 +184,409 @@ +@SET_MAKE@ + +# $Id: Makefile.common,v 5.4 2007/01/17 08:50:31 lirc Exp $ ++SHELL = @SHELL@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ +VPATH = @srcdir@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++ ++bindir = @bindir@ ++sbindir = @sbindir@ ++libexecdir = @libexecdir@ ++datadir = @datadir@ ++sysconfdir = @sysconfdir@ ++sharedstatedir = @sharedstatedir@ ++localstatedir = @localstatedir@ ++libdir = @libdir@ ++infodir = @infodir@ ++mandir = @mandir@ ++includedir = @includedir@ ++oldincludedir = /usr/include +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = ../.. ++ ++ACLOCAL = @ACLOCAL@ ++AUTOCONF = @AUTOCONF@ ++AUTOMAKE = @AUTOMAKE@ ++AUTOHEADER = @AUTOHEADER@ ++ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) ++transform = @program_transform_name@ +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : -+build_triplet = @build@ ++host_alias = @host_alias@ +host_triplet = @host@ -+EXTRA_PROGRAMS = automake_dummy$(EXEEXT) -+DIST_COMMON = $(srcdir)/../Makefile.common $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in -+subdir = drivers/lirc_pvr150 -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(install_sh) -d -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am_automake_dummy_OBJECTS = lirc_pvr150.$(OBJEXT) -+automake_dummy_OBJECTS = $(am_automake_dummy_OBJECTS) -+automake_dummy_LDADD = $(LDADD) -+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+depcomp = $(SHELL) $(top_srcdir)/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 = $(automake_dummy_SOURCES) -+DIST_SOURCES = $(automake_dummy_SOURCES) -+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)$(moduledir)" -+moduleDATA_INSTALL = $(INSTALL_DATA) -+DATA = $(module_DATA) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ ++ ++EXEEXT = @EXEEXT@ ++OBJEXT = @OBJEXT@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ +AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ ++AS = @AS@ +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@ ++DLLTOOL = @DLLTOOL@ +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@ ++GCJ = @GCJ@ ++GCJFLAGS = @GCJFLAGS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBUSB_CONFIG = @LIBUSB_CONFIG@ +LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+OBJEXT = @OBJEXT@ ++OBJDUMP = @OBJDUMP@ +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@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ ++RC = @RC@ +STRIP = @STRIP@ +VERSION = @VERSION@ -+XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ -+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@ +ac_pkss_mktemp = @ac_pkss_mktemp@ +alsa_lib = @alsa_lib@ +am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ +atilibusb_lib = @atilibusb_lib@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ +caraca_lib = @caraca_lib@ +daemon = @daemon@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ +depmod = @depmod@ +devdir = @devdir@ -+docdir = @docdir@ +driver = @driver@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ +forkpty = @forkpty@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ +hw_module = @hw_module@ +iguanaIR_lib = @iguanaIR_lib@ -+includedir = @includedir@ -+infodir = @infodir@ +install_sh = @install_sh@ +irman_lib = @irman_lib@ +irtty = @irtty@ +kernelcc = @kernelcc@ +kerneldir = @kerneldir@ +kernelext = @kernelext@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ +lirc_driver = @lirc_driver@ +lirc_major = @lirc_major@ +lircd_conf = @lircd_conf@ +lircmd_conf = @lircmd_conf@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ +maintmode_daemons_extra = @maintmode_daemons_extra@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ +mkfifo = @mkfifo@ +mknod = @mknod@ +moduledir = @moduledir@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ +portaudio_lib = @portaudio_lib@ -+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@ +vga_progs = @vga_progs@ +x_progs = @x_progs@ ++ ++EXTRA_PROGRAMS = automake_dummy +automake_dummy_SOURCES = lirc_pvr150.c ++ +module_DATA = lirc_pvr150.o + +# where the kernel sources are located +KERNEL_LOCATION = @kerneldir@ ++ +LIRC_DEVDIR = $(shell pwd) + +# some magic for using linux kernel settings +# when compiling module(s) +KBUILD_VERBOSE = 1 +LIRC_EXTRA_CFLAGS = -DIRCTL_DEV_MAJOR=$(lirc_major) -DEXPORT_SYMTAB $(DEFS) \ -+ $(DEFAULT_INCLUDES) -I$(LIRC_DEVDIR)/../.. \ -+ -I$(KERNEL_LOCATION)/include/ \ -+ -I$(KERNEL_LOCATION)/drivers/media/video/ ++ $(DEFAULT_INCLUDES) -I$(LIRC_DEVDIR)/../.. \ ++ -I$(KERNEL_LOCATION)/include/ \ ++ -I$(KERNEL_LOCATION)/drivers/media/video/ ++ + +CLEANFILES = $(module_DATA) .$(module_DATA).flags $(module_DATA:.o=.mod.c) $(module_DATA:.o=.@kernelext@) *~ ++subdir = drivers/lirc_pvr150 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++EXTRA_PROGRAMS = automake_dummy$(EXEEXT) ++am_automake_dummy_OBJECTS = lirc_pvr150.$(OBJEXT) ++automake_dummy_OBJECTS = $(am_automake_dummy_OBJECTS) ++automake_dummy_LDADD = $(LDADD) ++automake_dummy_DEPENDENCIES = ++automake_dummy_LDFLAGS = ++ ++DEFS = @DEFS@ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++CPPFLAGS = @CPPFLAGS@ ++LDFLAGS = @LDFLAGS@ ++LIBS = @LIBS@ ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/lirc_pvr150.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++CFLAGS = @CFLAGS@ ++DIST_SOURCES = $(automake_dummy_SOURCES) ++DATA = $(module_DATA) ++ ++DIST_COMMON = Makefile.am Makefile.in ++SOURCES = $(automake_dummy_SOURCES) ++ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../Makefile.common $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu drivers/lirc_pvr150/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu drivers/lirc_pvr150/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+automake_dummy$(EXEEXT): $(automake_dummy_OBJECTS) $(automake_dummy_DEPENDENCIES) -+ @rm -f automake_dummy$(EXEEXT) -+ $(LINK) $(automake_dummy_OBJECTS) $(automake_dummy_LDADD) $(LIBS) ++$(srcdir)/Makefile.in: Makefile.am $(srcdir)/../Makefile.common $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu drivers/lirc_pvr150/Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++automake_dummy$(EXEEXT): $(automake_dummy_OBJECTS) $(automake_dummy_DEPENDENCIES) ++ @rm -f automake_dummy$(EXEEXT) ++ $(LINK) $(automake_dummy_LDFLAGS) $(automake_dummy_OBJECTS) $(automake_dummy_LDADD) $(LIBS) + +mostlyclean-compile: -+ -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + +distclean-compile: -+ -rm -f *.tab.c ++ -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lirc_pvr150.Po@am__quote@ + ++distclean-depend: ++ -rm -rf ./$(DEPDIR) ++ +.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 $< ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + +.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) '$<'` ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(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 $@ $< ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++CCDEPMODE = @CCDEPMODE@ + +mostlyclean-libtool: -+ -rm -f *.lo ++ -rm -f *.lo + +clean-libtool: -+ -rm -rf .libs _libs ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++moduleDATA_INSTALL = $(INSTALL_DATA) ++ ++ETAGS = etags ++ETAGSFLAGS = + -+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 + ++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: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ 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; }'`; \ -+ 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) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ 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; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ 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; }'`; \ ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique + +GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here ++ 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 ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) -+ @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 ++ @list='$(DISTFILES)'; for file in $$list; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ ++ if test -d $$d/$$file; then \ ++ 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 +check-am: all-am +check: check-am +all-am: Makefile $(DATA) ++ +installdirs: -+ for dir in "$(DESTDIR)$(moduledir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done ++ $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ +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 ++ @$(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 ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: -+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f Makefile $(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." -+@SANDBOXED_TRUE@uninstall-local: -+@SANDBOXED_TRUE@install-data-local: -+@SANDBOXED_TRUE@install-exec-local: ++ @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-libtool mostlyclean-am + +distclean: distclean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags ++ ++distclean-am: clean-am distclean-compile distclean-depend \ ++ distclean-generic distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + -+html: html-am -+ +info: info-am + +info-am: + +install-data-am: install-data-local install-moduleDATA + -+install-dvi: install-dvi-am -+ +install-exec-am: install-exec-local + -+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 -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: ++ mostlyclean-libtool + -+ps: ps-am ++uninstall-am: uninstall-info-am uninstall-local uninstall-moduleDATA + -+ps-am: -+ -+uninstall-am: uninstall-local uninstall-moduleDATA -+ -+.MAKE: install-am install-strip -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool ctags distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-data-local install-dvi \ -+ install-dvi-am install-exec install-exec-am install-exec-local \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-moduleDATA 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-local \ -+ uninstall-moduleDATA ++.PHONY: GTAGS all all-am check check-am clean clean-generic \ ++ clean-libtool distclean distclean-compile distclean-depend \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-data-local install-exec install-exec-am \ ++ install-exec-local install-info install-info-am install-man \ ++ install-moduleDATA install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool tags uninstall uninstall-am \ ++ uninstall-info-am uninstall-local uninstall-moduleDATA + +export LIRC_EXTRA_CFLAGS KERNEL_LOCATION module_DATA + +$(module_DATA): $(automake_dummy_SOURCES) $(top_srcdir)/config.h ../lirc.h -+ mv Makefile Makefile.automake -+ cp ../Makefile.kernel Makefile -+ $(MAKE) -C $(KERNEL_LOCATION) SUBDIRS=$(LIRC_DEVDIR) modules \ -+ KBUILD_VERBOSE=$(KBUILD_VERBOSE) -+ mv Makefile.automake Makefile ++ mv Makefile Makefile.automake ++ cp ../Makefile.kernel Makefile ++ $(MAKE) -C $(KERNEL_LOCATION) SUBDIRS=$(LIRC_DEVDIR) modules \ ++ KBUILD_VERBOSE=$(KBUILD_VERBOSE) ++ mv Makefile.automake Makefile + +install-moduleDATA: $(module_DATA) -+ $(mkinstalldirs) $(DESTDIR)$(moduledir) -+ @list='$(module_DATA:.o=.@kernelext@)'; for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(moduledir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(moduledir)/$$f; \ -+ done ++ $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ @list='$(module_DATA:.o=.@kernelext@)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(moduledir)/$$f"; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(moduledir)/$$f; \ ++ done + +uninstall-moduleDATA: -+ @list='$(module_DATA:.o=.@kernelext@)'; for p in $$list; do \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(moduledir)/$$f"; \ -+ rm -f $(DESTDIR)$(moduledir)/$$f; \ -+ done ++ @list='$(module_DATA:.o=.@kernelext@)'; for p in $$list; do \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(moduledir)/$$f"; \ ++ rm -f $(DESTDIR)$(moduledir)/$$f; \ ++ done + +@SANDBOXED_FALSE@install-exec-local: mkdev +@SANDBOXED_FALSE@uninstall-local: rmdev + +mkdev: -+ test -e $(DESTDIR)$(devdir)/lirc || ($(mkinstalldirs) $(DESTDIR)$(devdir) && @mknod@ $(DESTDIR)$(devdir)/lirc c @lirc_major@ 0) ++ test -e $(DESTDIR)$(devdir)/lirc || ($(mkinstalldirs) $(DESTDIR)$(devdir) && @mknod@ $(DESTDIR)$(devdir)/lirc c @lirc_major@ 0) + +rmdev: -+ -test -c $(DESTDIR)$(devdir)/lirc && $(RM) $(DESTDIR)$(devdir)/lirc ++ -test -c $(DESTDIR)$(devdir)/lirc && $(RM) $(DESTDIR)$(devdir)/lirc + +@SANDBOXED_FALSE@install-data-local: install-moduleDATA -+@SANDBOXED_FALSE@ -@depmod@ -a ++@SANDBOXED_FALSE@ -@depmod@ -a +# 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: diff -urNad lirc-0.8.2~/drivers/lirc_pvr150/lirc_pvr150.c lirc-0.8.2/drivers/lirc_pvr150/lirc_pvr150.c --- lirc-0.8.2~/drivers/lirc_pvr150/lirc_pvr150.c 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.2/drivers/lirc_pvr150/lirc_pvr150.c 2007-07-11 19:20:10.000000000 -0500 ++++ lirc-0.8.2/drivers/lirc_pvr150/lirc_pvr150.c 2007-10-08 02:53:15.000000000 -0500 @@ -0,0 +1,1481 @@ +/* $Id: $ */ + @@ -2179,8 +2070,8 @@ + * End: + */ diff -urNad lirc-0.8.2~/setup.data lirc-0.8.2/setup.data ---- lirc-0.8.2~/setup.data 2007-05-26 08:30:50.000000000 -0500 -+++ lirc-0.8.2/setup.data 2007-07-11 19:20:10.000000000 -0500 +--- lirc-0.8.2~/setup.data 2007-10-08 02:53:05.000000000 -0500 ++++ lirc-0.8.2/setup.data 2007-10-08 02:53:15.000000000 -0500 @@ -68,6 +68,7 @@ flyvideo: "FlyVideo 98/FM /2000S (card=56)" flyvideo: "Flyvideo 98FM (LR50Q) / Typhoon TView TV/FM Tuner (card=36)" diff -u lirc-0.8.2/debian/patches/21_atiusb.dpatch lirc-0.8.2/debian/patches/21_atiusb.dpatch --- lirc-0.8.2/debian/patches/21_atiusb.dpatch +++ lirc-0.8.2/debian/patches/21_atiusb.dpatch @@ -6,22 +6,23 @@ @DPATCH@ diff -urNad lirc-0.8.2~/doc/lirc.hwdb lirc-0.8.2/doc/lirc.hwdb ---- lirc-0.8.2~/doc/lirc.hwdb 2007-09-17 03:30:06.000000000 -0500 -+++ lirc-0.8.2/doc/lirc.hwdb 2007-09-17 03:30:19.000000000 -0500 -@@ -111,8 +111,8 @@ +--- lirc-0.8.2~/doc/lirc.hwdb 2007-10-08 02:44:30.000000000 -0500 ++++ lirc-0.8.2/doc/lirc.hwdb 2007-10-08 02:46:35.000000000 -0500 +@@ -111,8 +111,9 @@ ADSTech USBX-707 USB IR Blaster;usbx;none;hw_usbx;adstech/lircd.conf.usbx-707; Apple Mac mini USB IR Receiver;macmini;none;hw_macmini;apple/lircd.conf.macmini; Asus DH USB Remote;asusdh;none;hw_asusdh;asus/lircd.conf.asusdh; -ATI/NVidia/X10 I & II RF Remote;atiusb;lirc_dev lirc_atiusb;hw_default;atiusb/lircd.conf.atiusb; -ATI/NVidia/X10 RF Remote (userspace);atilibusb;none;hw_atilibusb;atiusb/lircd.conf.atilibusb; -+ATI/NVidia/Snapstream X10 RF (kernel);atiusb;lirc_dev lirc_atiusb;hw_default;atiusb/lircd.conf.atiusb; -+ATI/NVidia/Snapstream X10 RF (userspace);atilibusb;none;hw_atilibusb;atiusb/lircd.conf.atilibusb; ++ATI/NVidia X10 RF (kernel);atiusb;lirc_dev lirc_atiusb;hw_default;atiusb/lircd.conf.atiusb; ++ATI/NVidia X10 RF (userspace);atilibusb;none;hw_atilibusb;atiusb/lircd.conf.atilibusb; ++Snapstream X10 RF;atiusb;lirc_dev lirc_atiusb;hw_default;atiusb/lircd.conf.atiusb; Creative USB IR Receiver (SB0540);sb0540;none;hw_sb0540;creative/lircd.conf.alsa_usb; COMMANDIR USB Transceiver;cmdir;lirc_dev commandir lirc_cmdir;hw_default;; Dign HV5 HTPC IR/VFD Module;sasem;lirc_dev lirc_sasem;hw_default;sasem/lircd.conf.sasem; diff -urNad lirc-0.8.2~/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.2/remotes/atiusb/lircd.conf.atilibusb --- lirc-0.8.2~/remotes/atiusb/lircd.conf.atilibusb 2007-05-05 07:24:00.000000000 -0500 -+++ lirc-0.8.2/remotes/atiusb/lircd.conf.atilibusb 2007-09-17 03:30:06.000000000 -0500 ++++ lirc-0.8.2/remotes/atiusb/lircd.conf.atilibusb 2007-10-08 02:44:30.000000000 -0500 @@ -85,3 +85,199 @@ end codes @@ -224,7 +225,7 @@ +end remote diff -urNad lirc-0.8.2~/remotes/atiusb/lircd.conf.atiusb lirc-0.8.2/remotes/atiusb/lircd.conf.atiusb --- lirc-0.8.2~/remotes/atiusb/lircd.conf.atiusb 2007-06-08 11:16:34.000000000 -0500 -+++ lirc-0.8.2/remotes/atiusb/lircd.conf.atiusb 2007-09-17 03:30:06.000000000 -0500 ++++ lirc-0.8.2/remotes/atiusb/lircd.conf.atiusb 2007-10-08 02:44:30.000000000 -0500 @@ -191,7 +191,7 @@ # this config file was automatically generated # using lirc-0.7.0-CVS(atiusb) on Sat May 15 10:44:51 2004 diff -u lirc-0.8.2/debian/patches/16_lirc-gpio.dpatch lirc-0.8.2/debian/patches/16_lirc-gpio.dpatch --- lirc-0.8.2/debian/patches/16_lirc-gpio.dpatch +++ lirc-0.8.2/debian/patches/16_lirc-gpio.dpatch @@ -5,9 +5,84 @@ ## DP: No description. @DPATCH@ +diff -urNad lirc-0.8.2~/doc/lirc.hwdb lirc-0.8.2/doc/lirc.hwdb +--- lirc-0.8.2~/doc/lirc.hwdb 2007-10-08 02:38:59.000000000 -0500 ++++ lirc-0.8.2/doc/lirc.hwdb 2007-10-08 02:41:53.000000000 -0500 +@@ -54,45 +54,45 @@ + + [TV card] + Adaptec AVC-2410;adaptec;lirc_dev lirc_i2c;hw_default;adaptec/lircd.conf.AVC-2410; +-Askey Magic TView CPH03x (card=1);cph03x;lirc_dev lirc_gpio;hw_default;cph03x/lircd.conf.cph03x; +-Askey/Typhoon/Anubis Magic TView CPH051/061 (bt878) (card=24);cph06x;lirc_dev lirc_gpio;hw_default;cph03x/lircd.conf.cph03x; ++Askey Magic TView CPH03x (card=1);dev/input;none;hw_default;cph03x/lircd.conf.cph03x; ++Askey/Typhoon/Anubis Magic TView CPH051/061 (bt878) (card=24);dev/input;none;hw_default;cph03x/lircd.conf.cph03x; + Asus TV-Box;tvbox;lirc_dev lirc_i2c;hw_default;asus/lircd.conf.asus; +-AverMedia TV card (TVCapture, TVPhone) (card=6);avermedia;lirc_dev lirc_gpio;hw_default;avermedia/lircd.conf.avermedia; +-AverMedia TV card (TVCapture98, TVPhone98) (card=13/41);avermedia98;lirc_dev lirc_gpio;hw_default;avermedia/lircd.conf.avermedia98; +-AverMedia TV card (VDOMATE) (use card=13);avermedia_vdomate;lirc_dev lirc_gpio;hw_default;avermedia/lircd.conf.vdomate; +-BestBuy Easy TV (BT848) (card=55);bestbuy;lirc_dev lirc_gpio;hw_default;bestbuy/lircd.conf.bestbuy; +-BestBuy Easy TV (BT878) (card=62);bestbuy2;lirc_dev lirc_gpio;hw_default;bestbuy/lircd.conf.bestbuy2; +-Chronos Video Shuttle II (card=35);chronos;lirc_dev lirc_gpio;hw_default;chronos/lircd.conf.chronos; ++AverMedia TV card (TVCapture, TVPhone) (card=6);dev/input;none;hw_default;avermedia/lircd.conf.avermedia; ++AverMedia TV card (TVCapture98, TVPhone98) (card=13/41);dev/input;none;hw_default;avermedia/lircd.conf.avermedia98; ++AverMedia TV card (VDOMATE) (use card=13);dev/input;none;hw_default;avermedia/lircd.conf.vdomate; ++BestBuy Easy TV (BT848) (card=55);dev/ipnut;none;hw_default;bestbuy/lircd.conf.bestbuy; ++BestBuy Easy TV (BT878) (card=62);dev/input;none;hw_default;bestbuy/lircd.conf.bestbuy2; ++Chronos Video Shuttle II (card=35);dev/input;none;hw_default;chronos/lircd.conf.chronos; + Creative BreakOut-Box;breakoutbox;lirc_dev lirc_i2c;hw_default;creative/lircd.conf.breakoutbox; +-Dynalink Magic TView (card=48);cph03x;lirc_dev lirc_gpio;hw_default;cph03x/lircd.conf.cph03x; +-FlyVideo II (card=8);flyvideo;lirc_dev lirc_gpio;hw_default;life-view/lircd.conf.flyvideo; +-FlyVideo 98 (card=30);flyvideo;lirc_dev lirc_gpio;hw_default;life-view/lircd.conf.flyvideo; +-FlyVideo 98/FM /2000S (card=56);flyvideo;lirc_dev lirc_gpio;hw_default;life-view/lircd.conf.flyvideo; +-Flyvideo 98FM (LR50Q) / Typhoon TView TV/FM Tuner (card=36);flyvideo;lirc_dev lirc_gpio;hw_default;life-view/lircd.conf.flyvideo; ++Dynalink Magic TView (card=48);dev/input;none;hw_default;cph03x/lircd.conf.cph03x; ++FlyVideo II (card=8);dev/input;none;hw_default;life-view/lircd.conf.flyvideo; ++FlyVideo 98 (card=30);dev/input;none;hw_default;life-view/lircd.conf.flyvideo; ++FlyVideo 98/FM /2000S (card=56);dev/input;none;hw_default;life-view/lircd.conf.flyvideo; ++Flyvideo 98FM (LR50Q) / Typhoon TView TV/FM Tuner (card=36);dev/input;none;hw_default;life-view/lircd.conf.flyvideo; + Hauppauge TV card;hauppauge;lirc_dev lirc_i2c;hw_default;hauppauge/lircd.conf.hauppauge; + Hauppauge DVB-s card (ver. 2.1);hauppauge_dvb;lirc_dev;hw_default;hauppauge/lircd.conf.hauppauge; + Hercules Smart TV Stereo (card=100);hercules_smarttv_stereo;lirc_dev lirc_i2c;hw_default;hercules/lircd.conf.smarttv_stereo; +-I-O Data Co. GV-BCTV5/PCI (card=81);gvbctv5pci;lirc_dev lirc_gpio;hw_default;iodata/lircd.conf.gvbctv5pci; +-Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF (card=78);kworld;lirc_dev lirc_gpio;hw_default;kworld/lircd.conf.kworld; ++I-O Data Co. GV-BCTV5/PCI (card=81);dev/input;none;hw_default;iodata/lircd.conf.gvbctv5pci; ++Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF (card=78);dev/input;none;hw_default;kworld/lircd.conf.kworld; + KNC ONE TV Station (-/SE/PRO/RDS);knc_one;lirc_dev lirc_i2c;hw_default;knc_one/lircd.conf.knc_one; +-Lenco MXTV-9578 CP (card=50);pixelview_pak;lirc_dev lirc_gpio;hw_default;pixelview/lircd.conf.playtv_pro; ++Lenco MXTV-9578 CP (card=50);dev/input;none;hw_default;pixelview/lircd.conf.playtv_pro; + Miro PCTV serial port receiver;pctv;none;hw_pinsys;pinnacle_systems/lircd.conf.pctv; +-Phoebe Tv Master + FM (card=22);cph06x;lirc_dev lirc_gpio;hw_default;cph03x/lircd.conf.cph03x; ++Phoebe Tv Master + FM (card=22);dev/input;none;hw_default;cph03x/lircd.conf.cph03x; + Pinnacle Systems PCTV Sat receiver;pctv;none;hw_pinsys;pinnacle_systems/lircd.conf.pctv; +-Pixelview PlayTV MPEG2;pixelview_pro;lirc_dev lirc_gpio;hw_default;pixelview/lircd.conf.playtv_pro; +-PixelView PlayTV PAK (card=50);pixelview_pak;lirc_dev lirc_gpio;hw_default;pixelview/lircd.conf.playtv_pro; +-Pixelview PlayTV pro (card=37);pixelview_pro;lirc_dev lirc_gpio;hw_default;pixelview/lircd.conf.playtv_pro; +-Prolink Pixelview PV-BT878P+ (Rev.4C,8E, card=70);pixelview_pro;lirc_dev lirc_gpio;hw_default;pixelview/lircd.conf.playtv_pro; +-Prolink PV-BT878P+4E (card=50);pixelview_pak;lirc_dev lirc_gpio;hw_default;pixelview/lircd.conf.playtv_pro; ++Pixelview PlayTV MPEG2;dev/input;none;hw_default;pixelview/lircd.conf.playtv_pro; ++PixelView PlayTV PAK (card=50);dev/input;none;hw_default;pixelview/lircd.conf.playtv_pro; ++Pixelview PlayTV pro (card=37);dev/input;none;hw_default;pixelview/lircd.conf.playtv_pro; ++Prolink Pixelview PV-BT878P+ (Rev.4C,8E, card=70);pixelview_pro;none;hw_default;pixelview/lircd.conf.playtv_pro; ++Prolink PV-BT878P+4E (card=50);dev/input;none;hw_default;pixelview/lircd.conf.playtv_pro; + ProVideo PV951 (card=42);provideo;lirc_dev lirc_i2c;hw_default;provideo/lircd.conf.pv951; + Technisat MediaFocus I;mediafocusI;none;hw_default;technisat/lircd.conf.mediafocusI; + Tekram M230 Mach64 (and others bt829 based);tekram_bt829;lirc_dev lirc_bt829;hw_default;tekram/lircd.conf.m230; +-TriTan Technology TView95 CPH03x (card=1);cph03x;lirc_dev lirc_gpio;hw_default;cph03x/lircd.conf.cph03x; +-TView99 CPH063 (card=38);cph06x;lirc_dev lirc_gpio;hw_default;cph03x/lircd.conf.cph03x; ++TriTan Technology TView95 CPH03x (card=1);dev/input;none;hw_default;cph03x/lircd.conf.cph03x; ++TView99 CPH063 (card=38);dev/input;none;hw_default;cph03x/lircd.conf.cph03x; + Typhoon TView RDS / FM Stereo (card=53);knc_one;lirc_dev lirc_i2c;hw_default;knc_one/lircd.conf.knc_one; + Winfast PVR2000 (Linux kernel >=2.6.11 required);leadtek_pvr2000;lirc_dev lirc_i2c;hw_default;leadtek/lircd.conf.PVR2000; +-Winfast TV2000/XP (card=34);leadtek_0010;lirc_dev lirc_gpio;hw_default;leadtek/lircd.conf.RM-0010; +-WinView 601 (card=17);leadtek_0007;lirc_dev lirc_gpio;hw_default;leadtek/lircd.conf.RM-0007; ++Winfast TV2000/XP (card=34);dev/input;none;hw_default;leadtek/lircd.conf.RM-0010; ++WinView 601 (card=17);dev/input;none;hw_default;leadtek/lircd.conf.RM-0007; + + [IrDA hardware] + SIR IrDA (built-in IR ports);sir;lirc_dev lirc_sir;hw_default;; diff -urNad lirc-0.8.2~/drivers/lirc_gpio/Makefile.am lirc-0.8.2/drivers/lirc_gpio/Makefile.am ---- lirc-0.8.2~/drivers/lirc_gpio/Makefile.am 2004-04-25 11:29:25.000000000 -0500 -+++ lirc-0.8.2/drivers/lirc_gpio/Makefile.am 2007-07-27 01:16:19.000000000 -0500 +--- lirc-0.8.2~/drivers/lirc_gpio/Makefile.am 2007-09-17 02:19:45.000000000 -0500 ++++ lirc-0.8.2/drivers/lirc_gpio/Makefile.am 2007-10-08 02:38:59.000000000 -0500 @@ -5,9 +5,9 @@ ## this is so that Automake includes the C compiling definitions, and ## includes the source files in the distribution. @@ -22,7 +97,7 @@ include ../Makefile.common diff -urNad lirc-0.8.2~/drivers/lirc_gpio/bttv_deprecated.c lirc-0.8.2/drivers/lirc_gpio/bttv_deprecated.c --- lirc-0.8.2~/drivers/lirc_gpio/bttv_deprecated.c 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.2/drivers/lirc_gpio/bttv_deprecated.c 2007-07-27 01:15:43.000000000 -0500 ++++ lirc-0.8.2/drivers/lirc_gpio/bttv_deprecated.c 2007-10-08 02:38:59.000000000 -0500 @@ -0,0 +1,44 @@ +//Temporarily added until a resolution is reached upstream +//For kernel 2.6.22 @@ -70,7 +145,7 @@ + diff -urNad lirc-0.8.2~/drivers/lirc_gpio/bttv_deprecated.h lirc-0.8.2/drivers/lirc_gpio/bttv_deprecated.h --- lirc-0.8.2~/drivers/lirc_gpio/bttv_deprecated.h 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.2/drivers/lirc_gpio/bttv_deprecated.h 2007-07-27 01:15:43.000000000 -0500 ++++ lirc-0.8.2/drivers/lirc_gpio/bttv_deprecated.h 2007-10-08 02:38:59.000000000 -0500 @@ -0,0 +1,6 @@ +//Temporarily re-added for Ubuntu Kernel 2.6.22 until upstream +//Resolution is reached. @@ -79,8 +154,8 @@ + unsigned int *cardid); + diff -urNad lirc-0.8.2~/drivers/lirc_gpio/lirc_gpio.c lirc-0.8.2/drivers/lirc_gpio/lirc_gpio.c ---- lirc-0.8.2~/drivers/lirc_gpio/lirc_gpio.c 2007-07-27 01:15:42.000000000 -0500 -+++ lirc-0.8.2/drivers/lirc_gpio/lirc_gpio.c 2007-07-27 01:15:43.000000000 -0500 +--- lirc-0.8.2~/drivers/lirc_gpio/lirc_gpio.c 2007-10-08 02:38:59.000000000 -0500 ++++ lirc-0.8.2/drivers/lirc_gpio/lirc_gpio.c 2007-10-08 02:38:59.000000000 -0500 @@ -63,6 +63,7 @@ #elif LINUX_VERSION_CODE == KERNEL_VERSION(2,6,22) #include "extra_2.6.22/bttv.h" only in patch2: unchanged: --- lirc-0.8.2.orig/debian/patches/22_hauppauge_novat_500.dpatch +++ lirc-0.8.2/debian/patches/22_hauppauge_novat_500.dpatch @@ -0,0 +1,93 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22_hauppauge_novat_500.dpatch by Mario Limonciello +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lirc-0.8.2~/doc/lirc.hwdb lirc-0.8.2/doc/lirc.hwdb +--- lirc-0.8.2~/doc/lirc.hwdb 2007-09-17 02:19:46.000000000 -0500 ++++ lirc-0.8.2/doc/lirc.hwdb 2007-10-08 02:34:41.000000000 -0500 +@@ -70,6 +70,7 @@ + FlyVideo 98/FM /2000S (card=56);flyvideo;lirc_dev lirc_gpio;hw_default;life-view/lircd.conf.flyvideo; + Flyvideo 98FM (LR50Q) / Typhoon TView TV/FM Tuner (card=36);flyvideo;lirc_dev lirc_gpio;hw_default;life-view/lircd.conf.flyvideo; + Hauppauge TV card;hauppauge;lirc_dev lirc_i2c;hw_default;hauppauge/lircd.conf.hauppauge; ++Hauppauge Nova-T 500;hauppauge;dev/input;none;hw_devinput;hauppauge/lircd.conf.hauppauge_novat500; + Hauppauge DVB-s card (ver. 2.1);hauppauge_dvb;lirc_dev;hw_default;hauppauge/lircd.conf.hauppauge; + Hercules Smart TV Stereo (card=100);hercules_smarttv_stereo;lirc_dev lirc_i2c;hw_default;hercules/lircd.conf.smarttv_stereo; + I-O Data Co. GV-BCTV5/PCI (card=81);gvbctv5pci;lirc_dev lirc_gpio;hw_default;iodata/lircd.conf.gvbctv5pci; +diff -urNad lirc-0.8.2~/remotes/hauppauge/lircd.conf.hauppauge_novat500 lirc-0.8.2/remotes/hauppauge/lircd.conf.hauppauge_novat500 +--- lirc-0.8.2~/remotes/hauppauge/lircd.conf.hauppauge_novat500 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/remotes/hauppauge/lircd.conf.hauppauge_novat500 2007-10-08 02:35:09.000000000 -0500 +@@ -0,0 +1,71 @@ ++# ++# brand: Hauppauge NOVA-T-500 ++# model no. of remote control: Hauppage Nova-T-500 Snowboard Shape Silver over Black ++# ++ ++begin remote ++ ++ name NOVA-T500 ++ bits 16 ++ eps 30 ++ aeps 100 ++ ++ one 0 0 ++ zero 0 0 ++ pre_data_bits 16 ++ pre_data 0x1 ++ gap 199999 ++ toggle_bit 0 ++ ++ ++ begin codes ++ Go 0x0162 ++ Power 0x0074 ++ TV 0x0179 ++ Videos 0x0189 ++ Music 0x0188 ++ Pictures 0x00E2 ++ Guide 0x016D ++ Radio 0x0181 ++ ArrowUp 0x0067 ++ ArrowLeft 0x0069 ++ OK 0x0160 ++ ArrowRight 0x006A ++ ArrowDown 0x006C ++ BackExit 0x009E ++ Menu 0x008B ++ VolumeUp 0x0073 ++ VolumeDown 0x0072 ++ PrevCh 0x016B ++ Mute 0x0071 ++ ChannelUp 0x0192 ++ ChannelDown 0x0193 ++ Record 0x00A7 ++ Rewind 0x00A8 ++ SkipBack 0x0195 ++ Play 0x00CF ++ Pause 0x0077 ++ Stop 0x0080 ++ Fwdwind 0x00D0 ++ SkipFwd 0x0197 ++ 1 0x0002 ++ 2 0x0003 ++ 3 0x0004 ++ 4 0x0005 ++ 5 0x0006 ++ 6 0x0007 ++ 7 0x0008 ++ 8 0x0009 ++ 9 0x000A ++ * 0x0037 ++ 0 0x000B ++ # 0x0029 ++ Red 0x018E ++ Green 0x018F ++ Yellow 0x0190 ++ Blue 0x0191 ++ end codes ++ ++end remote ++ ++