diff -urN lirc-0.8.1+cvs20070310/debian/changelog lirc-0.8.2/debian/changelog --- lirc-0.8.1+cvs20070310/debian/changelog 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/changelog 2007-07-09 00:09:58.000000000 -0500 @@ -1,3 +1,17 @@ +lirc (0.8.2-0ubuntu1) gutsy; urgency=low + + * New upstream version. (LP: 124842) + * Drop 01_irxevent.dpatch. Most of it is included upstream now. + * Update 12_pvr150_transmit_support.dpatch for new configure script. + * debian/rules: + - Add lirc.hwdb to lirc binary package. + * debian/lirc.postinst. + - Remove all mknods. This is handled when modprobing. + * debian/lirc.init.d + - Add LSB block. + + -- Mario Limonciello Sun, 8 Jul 2007 20:55:36 -0500 + lirc (0.8.1+cvs20070310-0ubuntu2) feisty; urgency=low [ Mario Limonciello ] diff -urN lirc-0.8.1+cvs20070310/debian/lirc.init.d lirc-0.8.2/debian/lirc.init.d --- lirc-0.8.1+cvs20070310/debian/lirc.init.d 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/lirc.init.d 2007-07-09 00:09:58.000000000 -0500 @@ -1,6 +1,17 @@ #! /bin/sh -# -# +### BEGIN INIT INFO +# Provides: lirc +# Required-Start: $syslog +# Required-Stop: $syslog +# Should-Start: $local_fs +# Should-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts LIRC daemon. +# Description: LIRC is used to control different +# infrared receivers and transceivers. +### END INIT INFO + load_modules () { diff -urN lirc-0.8.1+cvs20070310/debian/lirc.postinst lirc-0.8.2/debian/lirc.postinst --- lirc-0.8.1+cvs20070310/debian/lirc.postinst 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/lirc.postinst 2007-07-09 00:09:58.000000000 -0500 @@ -1,24 +1,6 @@ #!/bin/sh set -e -make_devices () -{ - if [ ! -e /dev/lirc ]; then - mknod /dev/lirc c 61 0 - chown root:root /dev/lirc - chmod 660 /dev/lirc - fi - if [ ! -e /dev/lircd ]; then - mknod /dev/lircd p - chown root:root /dev/lircd - chmod 666 /dev/lircd - fi - if [ ! -e /dev/lircm ]; then - mknod /dev/lircm p - chown root:root /dev/lircm - chmod 666 /dev/lircm - fi -} DebconfLoad () { db_get lirc/driver @@ -126,10 +108,6 @@ if [ "$1" = "configure" ]; then [ -x /usr/sbin/update-devfsd ] && /usr/sbin/update-devfsd >&2 - db_get lirc/install_devices - if $RET; then - make_devices - fi db_fget lirc/reconfigure config_changed CONFIG_CHANGED=$RET diff -urN lirc-0.8.1+cvs20070310/debian/patches/00list lirc-0.8.2/debian/patches/00list --- lirc-0.8.1+cvs20070310/debian/patches/00list 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/patches/00list 2007-07-09 00:09:58.000000000 -0500 @@ -1,4 +1,3 @@ -01_irxevent.dpatch 03_extra_files.dpatch 04_man_pages.dpatch 12_pvr150_transmit_support.dpatch diff -urN lirc-0.8.1+cvs20070310/debian/patches/01_irxevent.dpatch lirc-0.8.2/debian/patches/01_irxevent.dpatch --- lirc-0.8.1+cvs20070310/debian/patches/01_irxevent.dpatch 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/patches/01_irxevent.dpatch 1969-12-31 18:00:00.000000000 -0600 @@ -1,242 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_irxevent.dpatch by Amaya Rodrigo Sastre -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad lirc-0.8.1+cvs20070310~/tools/irxevent.c lirc-0.8.1+cvs20070310/tools/irxevent.c ---- lirc-0.8.1+cvs20070310~/tools/irxevent.c 2006-12-11 00:32:55.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/tools/irxevent.c 2007-03-10 13:08:17.267448551 -0800 -@@ -92,16 +92,21 @@ - - #include "lirc_client.h" - -+static int bVerbose = 0; -+static int bInError = 0; -+ - #ifdef DEBUG --void debugprintf(char *format_str, ...) -+ -+static void debugprintf(char *format_str, ...) - { - va_list ap; - va_start(ap,format_str); -- vfprintf(stderr,format_str,ap); -+ if(bVerbose) -+ vfprintf(stderr,format_str,ap); - va_end(ap); - } - #else --void debugprintf(char *format_str, ...) -+static void debugprintf(char *format_str, ...) - { - } - #endif -@@ -123,18 +128,18 @@ - {NULL,0}, - }; - --const char *key_delimiter ="-"; --const char *active_window_name ="CurrentWindow"; --const char *root_window_name ="RootWindow"; -+static const char *key_delimiter ="-"; -+static const char *active_window_name ="CurrentWindow"; -+static const char *root_window_name ="RootWindow"; - - --const char *progname="irxevent"; --Display *dpy; --Window root; --XEvent xev; --Window w,subw; -+static const char *progname="irxevent"; -+static Display *dpy; -+static Window root; -+static XEvent xev; -+static Window w,subw; - --Time fake_timestamp() -+static Time fake_timestamp() - /*seems that xfree86 computes the timestamps like this */ - /*strange but it relies on the *1000-32bit-wrap-around */ - /*if anybody knows exactly how to do it, please contact me */ -@@ -149,7 +154,7 @@ - return (Time)tint; - } - --Window find_window(Window top,char *name) -+static Window find_window(Window top,char *name) - { - char *wname,*iname; - XClassHint xch; -@@ -208,7 +213,7 @@ - return(top); - } - --Window find_sub_sub_window(Window top,int *x, int *y) -+static Window find_sub_sub_window(Window top,int *x, int *y) - { - Window base; - Window *children,foo,target=0; -@@ -252,7 +257,7 @@ - - - --Window find_sub_window(Window top,char *name,int *x, int *y) -+static Window find_sub_window(Window top,char *name,int *x, int *y) - { - Window base; - Window *children,foo,target=0; -@@ -295,7 +300,7 @@ - } - - --Window find_window_focused(Window top,char *name) -+static Window find_window_focused(Window top,char *name) - { - int tmp; - Window w, cur, *children, foo; -@@ -328,7 +333,7 @@ - return(0); - } - --void make_button(int button,int x,int y,XButtonEvent *xev) -+static void make_button(int button,int x,int y,XButtonEvent *xev) - { - xev->type = ButtonPress; - xev->display=dpy; -@@ -344,7 +349,7 @@ - return; - } - --void make_key(char *keyname,int x, int y,XKeyEvent *xev) -+static void make_key(char *keyname,int x, int y,XKeyEvent *xev) - { - char *part, *part2, *sep_part; - struct keymodlist_t *kmlptr; -@@ -414,7 +419,7 @@ - return ; - } - --void sendfocus(Window w,int in_out) -+static void sendfocus(Window w,int in_out) - { - XFocusChangeEvent focev; - -@@ -429,7 +434,7 @@ - return; - } - --void sendpointer_enter_or_leave(Window w,int in_out) -+static void sendpointer_enter_or_leave(Window w,int in_out) - { - XCrossingEvent crossev; - crossev.type=in_out; -@@ -452,7 +457,7 @@ - return; - } - --void sendkey(char *keyname,int x,int y,Window w,Window s) -+static void sendkey(char *keyname,int x,int y,Window w,Window s) - { - make_key(keyname ,x,y,(XKeyEvent*)&xev); - xev.xkey.window=w; -@@ -470,7 +475,7 @@ - return; - } - --void sendbutton(int button, int x, int y, Window w,Window s) -+static void sendbutton(int button, int x, int y, Window w,Window s) - { - make_button(button,x,y,(XButtonEvent*)&xev); - xev.xbutton.window=w; -@@ -492,6 +497,17 @@ - return; - } - -+int errorHandler(Display* di, XErrorEvent* ev) -+{ -+ if(bInError || ev==NULL || di==NULL) return 1; // only 1 msg per key -+ char buff[512]; buff[0] = 0; -+ XGetErrorText(di, ev->error_code, buff, sizeof(buff)-1); -+ if(buff[0]) { -+ fprintf(stderr, "X11 error: %s\n", buff); -+ bInError = 1; -+ } -+ return 1; -+} - - int check(char *s) - { -@@ -528,7 +544,9 @@ - - static struct option long_options[] = - { -- {"help", no_argument, NULL, 'h'}, -+ {"daemon", no_argument, NULL, 'd'}, -+ {"help", no_argument, NULL, 'h'}, -+ {"verbose", no_argument, NULL, 'v'}, - {"version", no_argument, NULL, 'V'}, - {0, 0, 0, 0} - }; -@@ -542,13 +560,20 @@ - char *config_file=NULL; - int c; - int WindowID; -+ int bDaemon = 0; - -- while ((c = getopt_long(argc, argv, "hV", long_options, NULL)) != EOF) { -+ while ((c = getopt_long(argc, argv, "dvhV", long_options, NULL)) != EOF) { - switch (c) { -+ case 'd': -+ bDaemon = 1; continue; -+ case 'v': -+ bVerbose = 1; continue; - case 'h': -- printf("Usage: %s [config file]\n", argv[0]); -- printf("\t -h --help \t\tdisplay usage summary\n"); -- printf("\t -V --version \t\tdisplay version\n"); -+ printf("Usage: %s [option]... [config file]\n" -+ " -d --daemon fork and run in background\n" -+ " -h --help display usage summary\n" -+ " -v --verbose report what happens\n" -+ " -V --version display version\n", progname); - return(EXIT_SUCCESS); - case 'V': - printf("%s %s\n", progname, VERSION); -@@ -575,20 +600,32 @@ - } - root=RootWindow(dpy,DefaultScreen(dpy)); - -+ // windows may get closed at wrong time. Override default error handler... -+ XSetErrorHandler(errorHandler); -+ - if(lirc_init("irxevent",1)==-1) exit(EXIT_FAILURE); - - if(lirc_readconfig(config_file,&config,check)==0) - { -+ -+ if(bDaemon) { -+ if(daemon(1, 0) < 0) { -+ perror("Failed to run as daemon"); -+ exit(2); -+ } -+ } -+ - char *ir; - char *c; - int ret; -- -+ - while(lirc_nextcode(&ir)==0) - { - if(ir==NULL) continue; - while((ret=lirc_code2char(config,ir,&c))==0 && c!=NULL) - { -- debugprintf("Recieved code: %s Sending event: \n",ir); -+ debugprintf("Received code: %s Sending event: \n",ir); -+ bInError = 0; // reset error state, want to see error msg - - *windowname=0; - if(2==sscanf(c,"Key %s Focus WindowID %i",keyname,&WindowID) || diff -urN lirc-0.8.1+cvs20070310/debian/patches/03_extra_files.dpatch lirc-0.8.2/debian/patches/03_extra_files.dpatch --- lirc-0.8.1+cvs20070310/debian/patches/03_extra_files.dpatch 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/patches/03_extra_files.dpatch 2007-07-09 00:09:58.000000000 -0500 @@ -5,9 +5,9 @@ ## DP: No description. @DPATCH@ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/bt848.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/bt848.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/bt848.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/bt848.h 2007-03-10 12:50:56.301864920 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/bt848.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/bt848.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/bt848.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/bt848.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,366 @@ +/* + bt848.h - Bt848 register offsets @@ -375,9 +375,9 @@ +#define BT878_EN_VSFX 0x04 + +#endif -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h 2007-03-10 12:50:56.301864920 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/btcx-risc.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,34 @@ +/* + */ @@ -413,9 +413,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/bttv.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/bttv.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/bttv.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/bttv.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/bttv.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/bttv.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/bttv.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/bttv.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,407 @@ +/* + * @@ -824,9 +824,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/bttvp.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/bttvp.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.16/bttvp.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.16/bttvp.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/bttvp.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/bttvp.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.16/bttvp.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.16/bttvp.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,410 @@ +/* + @@ -1238,9 +1238,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/bt848.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/bt848.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/bt848.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/bt848.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/bt848.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/bt848.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/bt848.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/bt848.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,366 @@ +/* + bt848.h - Bt848 register offsets @@ -1608,9 +1608,9 @@ +#define BT878_EN_VSFX 0x04 + +#endif -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/btcx-risc.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,34 @@ +/* + */ @@ -1646,9 +1646,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/bttv.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/bttv.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/bttv.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/bttv.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/bttv.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/bttv.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/bttv.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/bttv.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,390 @@ +/* + * @@ -2040,9 +2040,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/bttvp.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/bttvp.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.17/bttvp.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.17/bttvp.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/bttvp.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/bttvp.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.17/bttvp.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.17/bttvp.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,413 @@ +/* + @@ -2457,9 +2457,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/bt848.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/bt848.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/bt848.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/bt848.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/bt848.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/bt848.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/bt848.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/bt848.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,366 @@ +/* + bt848.h - Bt848 register offsets @@ -2827,9 +2827,9 @@ +#define BT878_EN_VSFX 0x04 + +#endif -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h 2007-03-10 12:50:56.305865125 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/btcx-risc.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,34 @@ +/* + */ @@ -2865,9 +2865,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/bttv.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/bttv.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/bttv.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/bttv.h 2007-03-10 12:50:56.309865331 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/bttv.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/bttv.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/bttv.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/bttv.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,389 @@ +/* + * @@ -3258,9 +3258,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/bttvp.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/bttvp.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.18/bttvp.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.18/bttvp.h 2007-03-10 12:50:56.309865331 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/bttvp.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/bttvp.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.18/bttvp.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.18/bttvp.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,413 @@ +/* + @@ -3675,9 +3675,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/bt848.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/bt848.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/bt848.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/bt848.h 2007-03-10 12:50:56.309865331 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/bt848.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/bt848.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/bt848.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/bt848.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,366 @@ +/* + bt848.h - Bt848 register offsets @@ -4045,9 +4045,9 @@ +#define BT878_EN_VSFX 0x04 + +#endif -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h 2007-03-10 12:50:56.309865331 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/btcx-risc.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,34 @@ +/* + */ @@ -4083,9 +4083,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/bttv.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/bttv.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/bttv.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/bttv.h 2007-03-10 12:50:56.309865331 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/bttv.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/bttv.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/bttv.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/bttv.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,389 @@ +/* + * @@ -4476,9 +4476,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/bttvp.h lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/bttvp.h ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/extra_2.6.20/bttvp.h 1969-12-31 16:00:00.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/extra_2.6.20/bttvp.h 2007-03-10 12:50:56.309865331 -0800 +diff -urNad lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/bttvp.h lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/bttvp.h +--- lirc-0.8.2~/drivers/lirc_gpio/extra_2.6.20/bttvp.h 1969-12-31 18:00:00.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/extra_2.6.20/bttvp.h 2007-07-08 23:53:14.000000000 -0500 @@ -0,0 +1,413 @@ +/* + @@ -4893,9 +4893,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/lirc_gpio.c lirc-0.8.1+cvs20070310/drivers/lirc_gpio/lirc_gpio.c ---- lirc-0.8.1+cvs20070310~/drivers/lirc_gpio/lirc_gpio.c 2007-02-12 22:45:15.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_gpio/lirc_gpio.c 2007-03-10 12:50:56.309865331 -0800 +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-02-13 00:45:15.000000000 -0600 ++++ lirc-0.8.2/drivers/lirc_gpio/lirc_gpio.c 2007-07-08 23:53:14.000000000 -0500 @@ -48,9 +48,18 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) #include "../drivers/char/bttv.h" diff -urN lirc-0.8.1+cvs20070310/debian/patches/04_man_pages.dpatch lirc-0.8.2/debian/patches/04_man_pages.dpatch --- lirc-0.8.1+cvs20070310/debian/patches/04_man_pages.dpatch 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/patches/04_man_pages.dpatch 2007-07-09 00:09:58.000000000 -0500 @@ -5,9 +5,9 @@ ## DP: No description. @DPATCH@ -diff -urNad lirc-0.8.1+cvs20070310~/doc/man/irexec.1 lirc-0.8.1+cvs20070310/doc/man/irexec.1 ---- lirc-0.8.1+cvs20070310~/doc/man/irexec.1 2007-03-10 12:54:22.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/doc/man/irexec.1 2007-03-10 12:57:40.078654534 -0800 +diff -urNad lirc-0.8.2~/doc/man/irexec.1 lirc-0.8.2/doc/man/irexec.1 +--- lirc-0.8.2~/doc/man/irexec.1 2007-06-09 14:37:46.000000000 -0500 ++++ lirc-0.8.2/doc/man/irexec.1 2007-07-08 23:53:23.000000000 -0500 @@ -29,7 +29,7 @@ \fB\-n\fR \fB\-\-name\fR use this program name @@ -17,9 +17,9 @@ background. That way you can easily start irexec from an init script. In this case you should specify a config file on the command line as irexec won't be able to find your home directory. Potential uses are shutting -diff -urNad lirc-0.8.1+cvs20070310~/doc/man/irrecord.1 lirc-0.8.1+cvs20070310/doc/man/irrecord.1 ---- lirc-0.8.1+cvs20070310~/doc/man/irrecord.1 2007-03-10 12:54:23.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/doc/man/irrecord.1 2007-03-10 12:57:40.078654534 -0800 +diff -urNad lirc-0.8.2~/doc/man/irrecord.1 lirc-0.8.2/doc/man/irrecord.1 +--- lirc-0.8.2~/doc/man/irrecord.1 2007-06-09 14:37:47.000000000 -0500 ++++ lirc-0.8.2/doc/man/irrecord.1 2007-07-08 23:53:23.000000000 -0500 @@ -14,7 +14,7 @@ features of a remote control. @@ -29,10 +29,10 @@ If \fIfile\fR already exists and contains a valid config irrecord will use the protocol description found there and will only try to record the -diff -urNad lirc-0.8.1+cvs20070310~/doc/man/irxevent.1 lirc-0.8.1+cvs20070310/doc/man/irxevent.1 ---- lirc-0.8.1+cvs20070310~/doc/man/irxevent.1 2007-03-10 12:54:23.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/doc/man/irxevent.1 2007-03-10 12:57:40.078654534 -0800 -@@ -162,7 +162,7 @@ +diff -urNad lirc-0.8.2~/doc/man/irxevent.1 lirc-0.8.2/doc/man/irxevent.1 +--- lirc-0.8.2~/doc/man/irxevent.1 2007-06-09 14:37:47.000000000 -0500 ++++ lirc-0.8.2/doc/man/irxevent.1 2007-07-08 23:53:23.000000000 -0500 +@@ -165,7 +165,7 @@ .SH TROUBLESHOOTING If you have problems finding the coordinates for a button click you can try @@ -41,7 +41,7 @@ xwininfo are not part of your distribution you can find them at a FTP server using the search engine at: http:\/\/ftpsearch.ntnu.no/ . xev also reports the names of key symbols like "Control_L" (your left control key) or "KP_Subtract" -@@ -184,7 +184,7 @@ +@@ -187,7 +187,7 @@ Yet another possibility is to start xterm like this: .RS 3 @@ -50,12 +50,12 @@ .RE xemacs will accept events if you set a built-in variable. The following was -diff -urNad lirc-0.8.1+cvs20070310~/doc/man/lircd.8 lirc-0.8.1+cvs20070310/doc/man/lircd.8 ---- lirc-0.8.1+cvs20070310~/doc/man/lircd.8 2007-03-10 12:54:23.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/doc/man/lircd.8 2007-03-10 12:58:54.602492635 -0800 -@@ -46,14 +46,14 @@ - \fB\-L\fR \fB\-\-logfile\fR=\fIfile\fR - daemon log file +diff -urNad lirc-0.8.2~/doc/man/lircd.8 lirc-0.8.2/doc/man/lircd.8 +--- lirc-0.8.2~/doc/man/lircd.8 2007-06-09 14:37:47.000000000 -0500 ++++ lirc-0.8.2/doc/man/lircd.8 2007-07-08 23:53:23.000000000 -0500 +@@ -49,14 +49,14 @@ + \fB\-r\fR \fB\-\-release\fR[=\fIsuffix\fR] + auto-generate release events .SH OPTIONS -The --permission option gives the file permission of /dev/lircd if it +The \-\-permission option gives the file permission of /dev/lircd if it @@ -71,7 +71,7 @@ should read from. The default currently is /dev/lirc but it probably will change in future. -@@ -63,21 +63,21 @@ +@@ -66,21 +66,21 @@ the device name isn't fixed. \fISTRING\fR may contain the '*' and '?' wildcards and '\\' to mark them as literal. @@ -97,10 +97,10 @@ +With the \-\-logfile option you can select the lircd daemon log file. The default currently is /var/log/lircd. Note that this option will only be available if you compiled lircd without syslog support. - .SH FILES -diff -urNad lirc-0.8.1+cvs20070310~/doc/man/lircmd.8 lirc-0.8.1+cvs20070310/doc/man/lircmd.8 ---- lirc-0.8.1+cvs20070310~/doc/man/lircmd.8 2007-03-10 12:54:23.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/doc/man/lircmd.8 2007-03-10 12:57:40.078654534 -0800 + +diff -urNad lirc-0.8.2~/doc/man/lircmd.8 lirc-0.8.2/doc/man/lircmd.8 +--- lirc-0.8.2~/doc/man/lircmd.8 2007-06-09 14:37:47.000000000 -0500 ++++ lirc-0.8.2/doc/man/lircmd.8 2007-07-08 23:53:23.000000000 -0500 @@ -21,7 +21,7 @@ \fB\-n\fR \fB\-\-nodaemon\fR don't fork to background @@ -110,9 +110,9 @@ .SH FILES lircmd will use syslogd to output error messages. It depends on your system configuration where they will show up. -diff -urNad lirc-0.8.1+cvs20070310~/doc/man/lircrcd.1 lirc-0.8.1+cvs20070310/doc/man/lircrcd.1 ---- lirc-0.8.1+cvs20070310~/doc/man/lircrcd.1 2007-03-10 12:54:23.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/doc/man/lircrcd.1 2007-03-10 12:57:40.078654534 -0800 +diff -urNad lirc-0.8.2~/doc/man/lircrcd.1 lirc-0.8.2/doc/man/lircrcd.1 +--- lirc-0.8.2~/doc/man/lircrcd.1 2007-06-09 14:37:47.000000000 -0500 ++++ lirc-0.8.2/doc/man/lircrcd.1 2007-07-08 23:53:23.000000000 -0500 @@ -32,15 +32,15 @@ .SH OPTIONS .TP @@ -132,9 +132,9 @@ lircrcd will create. The default is to append a "d" character to the config filename given. .SH "SEE ALSO" -diff -urNad lirc-0.8.1+cvs20070310~/doc/man/xmode2.1 lirc-0.8.1+cvs20070310/doc/man/xmode2.1 ---- lirc-0.8.1+cvs20070310~/doc/man/xmode2.1 2007-03-10 12:54:23.000000000 -0800 -+++ lirc-0.8.1+cvs20070310/doc/man/xmode2.1 2007-03-10 12:57:40.078654534 -0800 +diff -urNad lirc-0.8.2~/doc/man/xmode2.1 lirc-0.8.2/doc/man/xmode2.1 +--- lirc-0.8.2~/doc/man/xmode2.1 2007-06-09 14:37:47.000000000 -0500 ++++ lirc-0.8.2/doc/man/xmode2.1 2007-07-08 23:53:23.000000000 -0500 @@ -15,7 +15,7 @@ xmode2 is based on smode2 by Sinkovics Zoltan. It is just a conversion diff -urN lirc-0.8.1+cvs20070310/debian/patches/12_pvr150_transmit_support.dpatch lirc-0.8.2/debian/patches/12_pvr150_transmit_support.dpatch --- lirc-0.8.1+cvs20070310/debian/patches/12_pvr150_transmit_support.dpatch 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/patches/12_pvr150_transmit_support.dpatch 2007-07-09 00:09:58.000000000 -0500 @@ -5,27 +5,27 @@ ## DP: No description. @DPATCH@ -diff -urNad lirc-0.8.1+cvs20070310~/configure lirc-0.8.1+cvs20070310/configure ---- lirc-0.8.1+cvs20070310~/configure 2007-03-10 14:08:43.000000000 -0600 -+++ lirc-0.8.1+cvs20070310/configure 2007-03-24 22:30:28.000000000 -0500 -@@ -1537,7 +1537,7 @@ +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-08 23:53:30.000000000 -0500 +@@ -1072,7 +1072,7 @@ chronos, cmdir, comX, cph06x, creative, creative_infracd, devinput, digimatrix, dsp, dvico, ea65, exaudio, flyvideo, gvbctv5pci, - hauppauge, hauppauge_dvb, + hauppauge, hauppauge_dvb, hauppauge_pvr150 hercules_smarttv_stereo, igorplugusb, - iguanaIR, imon, imon_24g_lt, imon_knob, + iguanaIR, imon, imon_24g, imon_knob, imon_pad, imon_rsc, irdeo, irdeo_remote, -@@ -23102,6 +23102,7 @@ +@@ -23040,6 +23040,7 @@ (lirc_dev lirc_cmdir) \ (lirc_dev lirc_gpio) \ (lirc_dev lirc_i2c) \ + (lirc_dev lirc_pvr150) \ (lirc_dev lirc_igorplugusb) \ + (lirc_dev lirc_ttusbir) \ (lirc_dev lirc_imon) \ - (lirc_dev lirc_it87) \ -@@ -24521,6 +24522,9 @@ +@@ -24529,6 +24530,9 @@ lirc_dev-lirc_i2c) #lirc_driver="${lirc_driver} lirc_dev lirc_i2c" ;; @@ -34,8 +34,8 @@ + ;; lirc_dev-lirc_igorplugusb) ;; - lirc_dev-lirc_imon) -@@ -24868,6 +24872,12 @@ + lirc_dev-lirc_ttusbir) +@@ -24888,6 +24892,12 @@ lircmd_conf="hauppauge/lircmd.conf.hauppauge" fi @@ -48,44 +48,44 @@ if test "$driver" = "hauppauge_dvb"; then lirc_driver="lirc_dev" lircd_conf="hauppauge/lircd.conf.hauppauge" -@@ -25355,6 +25365,7 @@ +@@ -25406,6 +25416,7 @@ lirc_cmdir \ lirc_gpio \ lirc_i2c \ + lirc_pvr150 \ lirc_igorplugusb \ + lirc_ttusbir \ lirc_imon \ - lirc_it87 \ -@@ -25678,7 +25689,7 @@ +@@ -25732,7 +25743,7 @@ --ac_config_files="$ac_config_files Makefile drivers/Makefile drivers/lirc_atiusb/Makefile drivers/lirc_bt829/Makefile drivers/lirc_cmdir/Makefile drivers/lirc_dev/Makefile drivers/lirc_gpio/Makefile drivers/lirc_i2c/Makefile drivers/lirc_igorplugusb/Makefile drivers/lirc_imon/Makefile drivers/lirc_it87/Makefile drivers/lirc_mceusb/Makefile drivers/lirc_mceusb2/Makefile drivers/lirc_parallel/Makefile drivers/lirc_sasem/Makefile drivers/lirc_serial/Makefile drivers/lirc_sir/Makefile drivers/lirc_streamzap/Makefile daemons/Makefile tools/Makefile doc/Makefile doc/man/Makefile" -+ac_config_files="$ac_config_files Makefile drivers/Makefile drivers/lirc_atiusb/Makefile drivers/lirc_bt829/Makefile drivers/lirc_cmdir/Makefile drivers/lirc_dev/Makefile drivers/lirc_gpio/Makefile drivers/lirc_i2c/Makefile drivers/lirc_pvr150/Makefile drivers/lirc_igorplugusb/Makefile drivers/lirc_imon/Makefile drivers/lirc_it87/Makefile drivers/lirc_mceusb/Makefile drivers/lirc_mceusb2/Makefile drivers/lirc_parallel/Makefile drivers/lirc_sasem/Makefile drivers/lirc_serial/Makefile drivers/lirc_sir/Makefile drivers/lirc_streamzap/Makefile daemons/Makefile tools/Makefile doc/Makefile doc/man/Makefile" - +- ac_config_files="$ac_config_files Makefile drivers/Makefile drivers/lirc_atiusb/Makefile drivers/lirc_bt829/Makefile drivers/lirc_cmdir/Makefile drivers/lirc_dev/Makefile drivers/lirc_gpio/Makefile drivers/lirc_i2c/Makefile drivers/lirc_igorplugusb/Makefile drivers/lirc_ttusbir/Makefile drivers/lirc_imon/Makefile drivers/lirc_it87/Makefile drivers/lirc_mceusb/Makefile drivers/lirc_mceusb2/Makefile drivers/lirc_parallel/Makefile drivers/lirc_sasem/Makefile drivers/lirc_serial/Makefile drivers/lirc_sir/Makefile drivers/lirc_streamzap/Makefile daemons/Makefile tools/Makefile doc/Makefile doc/man/Makefile" ++ ac_config_files="$ac_config_files Makefile drivers/Makefile drivers/lirc_atiusb/Makefile drivers/lirc_bt829/Makefile drivers/lirc_cmdir/Makefile drivers/lirc_dev/Makefile drivers/lirc_gpio/Makefile drivers/lirc_i2c/Makefile drivers/lirc_pvr150/Makefile drivers/lirc_igorplugusb/Makefile drivers/lirc_ttusbir/Makefile drivers/lirc_imon/Makefile drivers/lirc_it87/Makefile drivers/lirc_mceusb/Makefile drivers/lirc_mceusb2/Makefile drivers/lirc_parallel/Makefile drivers/lirc_sasem/Makefile drivers/lirc_serial/Makefile drivers/lirc_sir/Makefile drivers/lirc_streamzap/Makefile daemons/Makefile tools/Makefile doc/Makefile doc/man/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -diff -urNad lirc-0.8.1+cvs20070310~/configure.in lirc-0.8.1+cvs20070310/configure.in ---- lirc-0.8.1+cvs20070310~/configure.in 2007-03-24 19:21:06.000000000 -0500 -+++ lirc-0.8.1+cvs20070310/configure.in 2007-03-24 22:30:28.000000000 -0500 -@@ -175,6 +175,7 @@ + # 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-08 23:53:30.000000000 -0500 +@@ -169,6 +169,7 @@ (lirc_dev lirc_cmdir) \ (lirc_dev lirc_gpio) \ (lirc_dev lirc_i2c) \ + (lirc_dev lirc_pvr150) \ (lirc_dev lirc_igorplugusb) \ + (lirc_dev lirc_ttusbir) \ (lirc_dev lirc_imon) \ - (lirc_dev lirc_it87) \ -@@ -271,7 +272,7 @@ +@@ -266,7 +267,7 @@ chronos, cmdir, comX, cph06x, creative, creative_infracd, devinput, digimatrix, dsp, dvico, ea65, exaudio, flyvideo, gvbctv5pci, - hauppauge, hauppauge_dvb, + hauppauge, hauppauge_dvb, hauppauge_pvr150 hercules_smarttv_stereo, igorplugusb, - iguanaIR, imon, imon_24g_lt, imon_knob, + iguanaIR, imon, imon_24g, imon_knob, imon_pad, imon_rsc, irdeo, irdeo_remote, -@@ -403,6 +404,9 @@ +@@ -399,6 +400,9 @@ lirc_dev-lirc_i2c) #lirc_driver="${lirc_driver} lirc_dev lirc_i2c" ;; @@ -94,8 +94,8 @@ + ;; lirc_dev-lirc_igorplugusb) ;; - lirc_dev-lirc_imon) -@@ -738,6 +742,12 @@ + lirc_dev-lirc_ttusbir) +@@ -746,6 +750,12 @@ lircmd_conf="hauppauge/lircmd.conf.hauppauge" fi @@ -108,25 +108,25 @@ if test "$driver" = "hauppauge_dvb"; then lirc_driver="lirc_dev" lircd_conf="hauppauge/lircd.conf.hauppauge" -@@ -1172,6 +1182,7 @@ +@@ -1211,6 +1221,7 @@ lirc_cmdir \ lirc_gpio \ lirc_i2c \ + lirc_pvr150 \ lirc_igorplugusb \ + lirc_ttusbir \ lirc_imon \ - lirc_it87 \ -@@ -1382,6 +1393,7 @@ +@@ -1422,6 +1433,7 @@ drivers/lirc_dev/Makefile drivers/lirc_gpio/Makefile drivers/lirc_i2c/Makefile + drivers/lirc_pvr150/Makefile drivers/lirc_igorplugusb/Makefile + drivers/lirc_ttusbir/Makefile drivers/lirc_imon/Makefile - drivers/lirc_it87/Makefile -diff -urNad lirc-0.8.1+cvs20070310~/drivers/Makefile.am lirc-0.8.1+cvs20070310/drivers/Makefile.am ---- lirc-0.8.1+cvs20070310~/drivers/Makefile.am 2005-07-30 15:43:05.000000000 -0500 -+++ lirc-0.8.1+cvs20070310/drivers/Makefile.am 2007-03-24 22:30:28.000000000 -0500 +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-08 23:53:30.000000000 -0500 @@ -19,6 +19,7 @@ lirc_mceusb \ lirc_mceusb2 \ @@ -135,10 +135,10 @@ lirc_sasem \ lirc_serial \ lirc_sir \ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/Makefile.in lirc-0.8.1+cvs20070310/drivers/Makefile.in ---- lirc-0.8.1+cvs20070310~/drivers/Makefile.in 2007-03-10 14:08:40.000000000 -0600 -+++ lirc-0.8.1+cvs20070310/drivers/Makefile.in 2007-03-24 22:30:28.000000000 -0500 -@@ -206,6 +206,7 @@ +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-08 23:53:30.000000000 -0500 +@@ -138,6 +138,7 @@ lirc_mceusb \ lirc_mceusb2 \ lirc_parallel \ @@ -146,9 +146,9 @@ lirc_sasem \ lirc_serial \ lirc_sir \ -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_pvr150/Makefile.am lirc-0.8.1+cvs20070310/drivers/lirc_pvr150/Makefile.am ---- lirc-0.8.1+cvs20070310~/drivers/lirc_pvr150/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_pvr150/Makefile.am 2007-03-24 22:30:28.000000000 -0500 +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-08 23:53:30.000000000 -0500 @@ -0,0 +1,13 @@ +## $Id: Makefile.am,v 1.6 2004/04/25 16:29:26 lirc Exp $ + @@ -163,9 +163,9 @@ +module_DATA = lirc_pvr150.o + +include ../Makefile.common -diff -urNad lirc-0.8.1+cvs20070310~/drivers/lirc_pvr150/Makefile.in lirc-0.8.1+cvs20070310/drivers/lirc_pvr150/Makefile.in ---- lirc-0.8.1+cvs20070310~/drivers/lirc_pvr150/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_pvr150/Makefile.in 2007-03-24 22:30:28.000000000 -0500 +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-08 23:53:30.000000000 -0500 @@ -0,0 +1,526 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ @@ -693,9 +693,9 @@ +# 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.1+cvs20070310~/drivers/lirc_pvr150/lirc_pvr150.c lirc-0.8.1+cvs20070310/drivers/lirc_pvr150/lirc_pvr150.c ---- lirc-0.8.1+cvs20070310~/drivers/lirc_pvr150/lirc_pvr150.c 1969-12-31 18:00:00.000000000 -0600 -+++ lirc-0.8.1+cvs20070310/drivers/lirc_pvr150/lirc_pvr150.c 2007-03-24 22:30:28.000000000 -0500 +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-08 23:53:30.000000000 -0500 @@ -0,0 +1,1481 @@ +/* $Id: $ */ + @@ -2178,9 +2178,9 @@ + * c-basic-offset: 8 + * End: + */ -diff -urNad lirc-0.8.1+cvs20070310~/setup.data lirc-0.8.1+cvs20070310/setup.data ---- lirc-0.8.1+cvs20070310~/setup.data 2007-03-24 19:21:06.000000000 -0500 -+++ lirc-0.8.1+cvs20070310/setup.data 2007-03-24 22:30:28.000000000 -0500 +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-08 23:53:30.000000000 -0500 @@ -68,6 +68,7 @@ flyvideo: "FlyVideo 98/FM /2000S (card=56)" flyvideo: "Flyvideo 98FM (LR50Q) / Typhoon TView TV/FM Tuner (card=36)" @@ -2189,7 +2189,7 @@ hauppauge_dvb: "Hauppauge DVB-s card (ver. 2.1)" hercules_smarttv_stereo: "Hercules Smart TV Stereo (card=100)" gvbctv5pci: "I-O Data Co. GV-BCTV5/PCI (card=81)" -@@ -202,6 +203,7 @@ +@@ -207,6 +208,7 @@ flyvideo \ gvbctv5pci \ hauppauge \ @@ -2197,7 +2197,7 @@ hauppauge_dvb \ hercules_smarttv_stereo \ igorplugusb \ -@@ -265,6 +267,7 @@ +@@ -273,6 +275,7 @@ flyvideo \ gvbctv5pci \ hauppauge \ diff -urN lirc-0.8.1+cvs20070310/debian/rules lirc-0.8.2/debian/rules --- lirc-0.8.1+cvs20070310/debian/rules 2007-07-08 20:52:26.000000000 -0500 +++ lirc-0.8.2/debian/rules 2007-07-09 00:09:58.000000000 -0500 @@ -175,6 +175,7 @@ debian/lirc/usr/share/doc/lirc/ mkdir debian/lirc/usr/share/lirc cp -dpR remotes debian/lirc/usr/share/lirc/remotes + cp -dpR doc/lirc.hwdb debian/lirc/usr/share/lirc dh_installexamples -s dh_install -s --sourcedir=debian/tmp --list-missing dh_installmenu -s