From 07748b460951f1082ff390321696e54f24209048 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Sat, 29 Aug 2009 17:30:25 +0000
Subject: [PATCH] - Rediff patches so they actually apply still

---
 lirc-0.8.4-cvs-update.patch                   | 1200 -----------------
 ...c-0.8.6-standardized-remote-keycodes.patch |  445 +++---
 lirc.spec                                     |    7 +-
 3 files changed, 198 insertions(+), 1454 deletions(-)
 delete mode 100644 lirc-0.8.4-cvs-update.patch
 rename lirc-0.8.5-standardized-remote-keycodes.patch => lirc-0.8.6-standardized-remote-keycodes.patch (91%)

diff --git a/lirc-0.8.4-cvs-update.patch b/lirc-0.8.4-cvs-update.patch
deleted file mode 100644
index 4c6ddb6..0000000
--- a/lirc-0.8.4-cvs-update.patch
+++ /dev/null
@@ -1,1200 +0,0 @@
-diff -Naurp lirc-0.8.4a.orig/daemons/hw_devinput.c lirc-0.8.4a.upd/daemons/hw_devinput.c
---- lirc-0.8.4a.orig/daemons/hw_devinput.c	2008-03-02 14:16:30.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/hw_devinput.c	2008-12-08 17:10:05.072745094 -0500
-@@ -220,7 +220,7 @@ int devinput_init()
- 	if (ioctl(hw.fd, EVIOCGRAB, 1) == -1)
- 	{
- 		logprintf(LOG_WARNING, "can't get exclusive access to events "
--			  "comming from `%s' interface",
-+			  "coming from `%s' interface",
- 			  hw.device);
- 	}
- #endif
-diff -Naurp lirc-0.8.4a.orig/daemons/input_map.c lirc-0.8.4a.upd/daemons/input_map.c
---- lirc-0.8.4a.orig/daemons/input_map.c	1969-12-31 19:00:00.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/input_map.c	2008-12-08 17:51:33.087443731 -0500
-@@ -0,0 +1,58 @@
-+/*      $Id: input_map.c,v 5.1 2008/10/26 15:10:17 lirc Exp $      */
-+
-+/****************************************************************************
-+ ** input_map.c *************************************************************
-+ ****************************************************************************
-+ *
-+ * input_map.c - button namespace derived from Linux input layer
-+ *
-+ * Copyright (C) 2008 Christoph Bartelmus <lirc@bartelmus.de>
-+ *
-+ */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include "input_map.h"
-+
-+struct
-+{
-+	char *name;
-+	linux_input_code code;
-+
-+} input_map[] = {
-+#include "input_map.inc"
-+	{NULL, 0}
-+};
-+
-+int get_input_code(const char *name, linux_input_code *code)
-+{
-+	int i;
-+	
-+	for(i=0; input_map[i].name != NULL; i++)
-+	{
-+		if(strcasecmp(name, input_map[i].name) == 0)
-+		{
-+			*code = input_map[i].code;
-+			return i;
-+		}
-+	}
-+	return -1;
-+}
-+
-+void fprint_namespace(FILE *f)
-+{
-+	int i;
-+	
-+	for(i=0; input_map[i].name != NULL; i++)
-+	{
-+		fprintf(stdout, "%s\n", input_map[i].name);
-+	}
-+}
-+
-+int is_in_namespace(const char *name)
-+{
-+	linux_input_code dummy;
-+	
-+	return get_input_code(name, &dummy) == -1 ? 0 : 1;
-+}
-diff -Naurp lirc-0.8.4a.orig/daemons/input_map.h lirc-0.8.4a.upd/daemons/input_map.h
---- lirc-0.8.4a.orig/daemons/input_map.h	1969-12-31 19:00:00.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/input_map.h	2008-12-08 17:51:33.106519735 -0500
-@@ -0,0 +1,35 @@
-+/*      $Id: input_map.h,v 5.1 2008/10/26 15:10:17 lirc Exp $      */
-+
-+/****************************************************************************
-+ ** input_map.h *************************************************************
-+ ****************************************************************************
-+ *
-+ * input_map.h - button namespace derived from Linux input layer
-+ *
-+ * Copyright (C) 2008 Christoph Bartelmus <lirc@bartelmus.de>
-+ *
-+ */
-+
-+#ifndef INPUT_MAP_H
-+#define INPUT_MAP_H
-+
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#if defined __linux__
-+#include <linux/input.h>
-+#include <linux/uinput.h>
-+#endif
-+
-+#if defined __linux__
-+typedef __u16 linux_input_code;
-+#else
-+typedef unsigned short linux_input_code;
-+#endif
-+
-+int get_input_code(const char *name, linux_input_code *code);
-+void fprint_namespace(FILE *f);
-+int is_in_namespace(const char *name);
-+
-+#endif /* INPUT_MAP_H */
-diff -Naurp lirc-0.8.4a.orig/daemons/input_map.sh lirc-0.8.4a.upd/daemons/input_map.sh
---- lirc-0.8.4a.orig/daemons/input_map.sh	1969-12-31 19:00:00.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/input_map.sh	2008-12-08 17:51:33.106519735 -0500
-@@ -0,0 +1,11 @@
-+#! /bin/sh
-+
-+TYPES="KEY BTN"
-+file=${1:-/usr/include/linux/input.h}
-+
-+for type in $TYPES; do
-+	grep "^#define ${type}_" < $file|sort|while read; do
-+		sed --expression="s/^#define \([^ 	]*\)\(.*\)/{\"\1\", \2},/"|grep -v "KEY_HANGUEL\|KEY_MIN_INTERESTING"
-+	done
-+done
-+
-diff -Naurp lirc-0.8.4a.orig/daemons/irrecord.c lirc-0.8.4a.upd/daemons/irrecord.c
---- lirc-0.8.4a.orig/daemons/irrecord.c	2008-12-08 16:47:25.358745194 -0500
-+++ lirc-0.8.4a.upd/daemons/irrecord.c	2008-12-08 18:10:06.096432179 -0500
-@@ -52,6 +52,7 @@
- #include "ir_remote.h"
- #include "config_file.h"
- #include "receive.h"
-+#include "input_map.h"
- 
- void flushhw(void);
- int resethw(void);
-@@ -80,7 +81,7 @@ void get_scheme(struct ir_remote *remote
- struct lengths *get_max_length(struct lengths *first,unsigned int *sump);
- void unlink_length(struct lengths **first,struct lengths *remove);
- int get_trail_length(struct ir_remote *remote, int interactive);
--int get_lead_length(struct ir_remote *remote);
-+int get_lead_length(struct ir_remote *remote, int interactive);
- int get_repeat_length(struct ir_remote *remote, int interactive);
- int get_header_length(struct ir_remote *remote, int interactive);
- int get_data_length(struct ir_remote *remote, int interactive);
-@@ -96,7 +97,7 @@ const char *usage="Usage: %s [options] f
- struct ir_remote remote;
- struct ir_ncode ncode;
- 
--#define IRRECORD_VERSION "0.5"
-+#define IRRECORD_VERSION "5.84"
- #define BUTTON 80+1
- #define RETRIES 10
- 
-@@ -120,7 +121,7 @@ lirc_t aeps = 100;
- #define TH_REPEAT      90
- #define TH_TRAIL       90
- #define TH_LEAD        90
--#define TH_IS_BIT      15
-+#define TH_IS_BIT      10
- #define TH_RC6_SIGNAL 550
- 
- #define MIN_GAP  20000
-@@ -314,6 +315,7 @@ int main(int argc,char **argv)
- 	int repeat_flag;
- 	lirc_t min_remaining_gap, max_remaining_gap;
- 	int force;
-+	int disable_namespace = 0;
- 	int retries;
- 	int no_data = 0;
- 	struct ir_remote *remotes=NULL;
-@@ -338,6 +340,8 @@ int main(int argc,char **argv)
- 			{"device",required_argument,NULL,'d'},
- 			{"driver",required_argument,NULL,'H'},
- 			{"force",no_argument,NULL,'f'},
-+			{"disable-namespace",no_argument,NULL,'n'},
-+			{"list-namespace",no_argument,NULL,'l'},
- #ifdef DEBUG
- 			{"pre",no_argument,NULL,'p'},
- 			{"post",no_argument,NULL,'P'},
-@@ -348,9 +352,9 @@ int main(int argc,char **argv)
- 			{0, 0, 0, 0}
- 		};
- #ifdef DEBUG
--		c = getopt_long(argc,argv,"hvad:H:fpPtiT",long_options,NULL);
-+		c = getopt_long(argc,argv,"hvad:H:fnlpPtiT",long_options,NULL);
- #else
--		c = getopt_long(argc,argv,"hvad:H:f",long_options,NULL);
-+		c = getopt_long(argc,argv,"hvad:H:fnl",long_options,NULL);
- #endif
- 		if(c==-1)
- 			break;
-@@ -362,6 +366,8 @@ int main(int argc,char **argv)
- 			printf("\t -v --version\t\tdisplay version\n");
- 			printf("\t -a --analyse\t\tanalyse raw_codes config files\n");
- 			printf("\t -f --force\t\tforce raw mode\n");
-+			printf("\t -n --disable-namespace\t\tdisables namespace checks\n");
-+			printf("\t -l --list-namespace\t\tlist valid button names\n");
- 			printf("\t -H --driver=driver\tuse given driver\n");
- 			printf("\t -d --device=device\tread from given device\n");
- 			exit(EXIT_SUCCESS);
-@@ -385,6 +391,13 @@ int main(int argc,char **argv)
- 		case 'f':
- 			force=1;
- 			break;
-+		case 'n':
-+			disable_namespace = 1;
-+			break;
-+		case 'l':
-+			fprint_namespace(stdout);
-+			exit(EXIT_SUCCESS);
-+			break;
- #ifdef DEBUG
- 		case 'p':
- 			get_pre=1;
-@@ -502,7 +515,7 @@ int main(int argc,char **argv)
- 			exit(EXIT_FAILURE);
- 		}
- 		strcpy(filename_new, filename);
--		strcat(filename_new, ".new");
-+		strcat(filename_new, ".conf");
- 		filename = filename_new;
- 	}
- 	else
-@@ -717,6 +730,17 @@ int main(int argc,char **argv)
- 		{
- 			break;
- 		}
-+		if(!disable_namespace && !is_in_namespace(buffer))
-+		{
-+			printf("'%s' is not in name space (use "
-+			       "--disable-namespace to disable checks)\n",
-+			       buffer);
-+			printf("Use '%s --list-namespace' to see a full list "
-+			       "of valid button names\n",
-+			       progname);
-+			printf("Please try again.\n");
-+			continue;
-+		}
- 		
- 		if(is_raw(&remote))
- 		{
-@@ -1379,7 +1403,8 @@ void analyse_remote(struct ir_remote *ra
- 	ir_code pre, code, post;
- 	int repeat_flag;
- 	lirc_t min_remaining_gap, max_remaining_gap;
--	struct ir_ncode new_codes[100];
-+	struct ir_ncode *new_codes;
-+	size_t new_codes_count = 100;
- 	int new_index = 0;
- 	int ret;
- 
-@@ -1395,18 +1420,27 @@ void analyse_remote(struct ir_remote *ra
- 	next_code = NULL;
- 	current_code = NULL;
- 	current_index = 0;
-+	memset(&remote, 0, sizeof(remote));
- 	get_lengths(&remote, 0, 0 /* not interactive */ );
- 
--	if(is_rc6(&remote))
-+	if(is_rc6(&remote) && remote.bits >= 5)
- 	{
- 		/* have to assume something as it's very difficult to
- 		   extract the rc6_mask from the data that we have */
--		remote.rc6_mask = (ir_code) 0x100000000ll;
-+		remote.rc6_mask = ((ir_code) 0x1ll) << (remote.bits-5);
- 	}
- 
- 	remote.name = raw_data->name;
-+	remote.freq = raw_data->freq;
- 	
--	memset(new_codes, 0, sizeof(new_codes));
-+	new_codes = malloc(new_codes_count * sizeof(*new_codes));
-+	if(new_codes == NULL)
-+	{
-+		fprintf(stderr, "%s: out of memory\n",
-+			progname);
-+		return;
-+	}
-+	memset(new_codes, 0 , new_codes_count * sizeof(*new_codes));
- 	codes = raw_data->codes;
- 	while(codes->name!=NULL)
- 	{
-@@ -1429,6 +1463,25 @@ void analyse_remote(struct ir_remote *ra
- 		}
- 		else
- 		{
-+			if(new_index+1 >= new_codes_count)
-+			{
-+				struct ir_ncode *renew_codes;
-+				
-+				new_codes_count *= 2;
-+				renew_codes = realloc
-+					(new_codes,
-+					 new_codes_count * sizeof(*new_codes));
-+				if(renew_codes == NULL)
-+				{
-+					fprintf(stderr, "%s: out of memory\n",
-+						progname);
-+					free(new_codes);
-+					return;
-+				}
-+				memset(&new_codes[new_codes_count/2], 0 , new_codes_count/2 * sizeof(*new_codes));
-+				new_codes = renew_codes;
-+			}
-+			
- 			new_codes[new_index].name = codes->name;
- 			new_codes[new_index].code = code;
- 			new_index++;
-@@ -1438,6 +1491,8 @@ void analyse_remote(struct ir_remote *ra
- 	new_codes[new_index].name = NULL;
- 	remote.codes = new_codes;
- 	fprint_remotes(stdout, &remote);
-+	remote.codes = NULL;
-+	free(new_codes);
- }
- 
- #ifdef DEBUG
-@@ -1610,7 +1665,7 @@ inline lirc_t calc_signal(struct lengths
- int get_lengths(struct ir_remote *remote, int force, int interactive)
- {
- 	int retval;
--	lirc_t data,average,sum,remaining_gap,header;
-+	lirc_t data,average,maxspace,sum,remaining_gap,header;
- 	enum analyse_mode mode=MODE_GAP;
- 	int first_signal;
- 
-@@ -1628,7 +1683,7 @@ int get_lengths(struct ir_remote *remote
- 		flushhw();
- 	}
- 	retval=1;
--	average=0;sum=0;count=0;count_spaces=0;
-+	average=0;maxspace=0;sum=0;count=0;count_spaces=0;
- 	count_3repeats=0;count_5repeats=0;count_signals=0;
- 	first_signal=-1;header=0;
- 	first_length=0;
-@@ -1657,12 +1712,15 @@ int get_lengths(struct ir_remote *remote
- 					continue;
- 				}
- 				average=data;
-+				maxspace=data;
- 			}
- 			else if(is_space(data))
- 			{
- 				if(data>MIN_GAP || data>100*average ||
- 				   /* this MUST be a gap */
--				   (count_spaces>10 && data>5*average))  
-+				   (count_spaces>10 && data>5*average)
-+				   /* || Echostar
-+				      (count_spaces>20 && data>9*maxspace/10)*/)
- 					/* this should be a gap */
- 				{
- 					struct lengths *scan;
-@@ -1674,7 +1732,7 @@ int get_lengths(struct ir_remote *remote
- 					merge_lengths(first_sum);
- 					add_length(&first_gap,data);
- 					merge_lengths(first_gap);
--					sum=0;count_spaces=0;average=0;
-+					sum=0;count_spaces=0;average=0;maxspace=0;
- 					
- 					maxcount=0;
- 					scan=first_sum;
-@@ -1740,6 +1798,10 @@ int get_lengths(struct ir_remote *remote
- 				average=(average*count_spaces+data)
- 				/(count_spaces+1);
- 				count_spaces++;
-+				if(data>maxspace)
-+				{
-+					maxspace=data;
-+				}
- 			}
- 			if(count>SAMPLES*MAX_SIGNALS*2)
- 			{
-@@ -1773,8 +1835,9 @@ int get_lengths(struct ir_remote *remote
- 			}
- 			sum+=data&PULSE_MASK;
- 
--			if((data&PULSE_MASK)>=remaining_gap*(100-eps)/100
--			   || (data&PULSE_MASK)>=remaining_gap-aeps)
-+			if(count>2 &&
-+			   ((data&PULSE_MASK)>=remaining_gap*(100-eps)/100
-+			    || (data&PULSE_MASK)>=remaining_gap-aeps))
- 			{
- 				if(is_space(data))
- 				{
-@@ -1882,7 +1945,7 @@ int get_lengths(struct ir_remote *remote
- 					get_scheme(remote, interactive);
- 					if(!get_header_length(remote, interactive) ||
- 					   !get_trail_length(remote, interactive) ||
--					   !get_lead_length(remote) ||
-+					   !get_lead_length(remote, interactive) ||
- 					   !get_repeat_length(remote, interactive) ||
- 					   !get_data_length(remote, interactive))
- 					{
-@@ -2173,7 +2236,7 @@ int get_trail_length(struct ir_remote *r
- 	return(1);
- }
- 
--int get_lead_length(struct ir_remote *remote)
-+int get_lead_length(struct ir_remote *remote, int interactive)
- {
- 	unsigned int sum,max_count;
- 	struct lengths *first_lead,*max_length,*max2_length;
-@@ -2190,7 +2253,7 @@ int get_lead_length(struct ir_remote *re
- #       endif
- 	if(max_count>=sum*TH_LEAD/100)
- 	{
--		printf("Found lead pulse: %lu\n",
-+		iprintf(interactive, "Found lead pulse: %lu\n",
- 		       (unsigned long) calc_signal(max_length));
- 		remote->plead=calc_signal(max_length);
- 		return(1);
-@@ -2207,12 +2270,12 @@ int get_lead_length(struct ir_remote *re
- 	}
- 	if(abs(2*a-b)<b*eps/100 || abs(2*a-b)<aeps)
- 	{
--		printf("Found hidden lead pulse: %lu\n",
-+		iprintf(interactive, "Found hidden lead pulse: %lu\n",
- 		       (unsigned long) a);
- 		remote->plead=a;
- 		return(1);
- 	}
--	printf("No lead pulse found.\n");
-+	iprintf(interactive, "No lead pulse found.\n");
- 	return(1);
- }
- 
-diff -Naurp lirc-0.8.4a.orig/daemons/lircd.c lirc-0.8.4a.upd/daemons/lircd.c
---- lirc-0.8.4a.orig/daemons/lircd.c	2008-10-04 17:48:43.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/lircd.c	2008-12-08 17:06:32.108557638 -0500
-@@ -1,4 +1,4 @@
--/*      $Id: lircd.c,v 5.80 2008/10/04 21:48:43 lirc Exp $      */
-+/*       $Id: lircd.c,v 5.82 2008/12/06 20:00:03 lirc Exp $      */
- 
- /****************************************************************************
-  ** lircd.c *****************************************************************
-@@ -57,6 +57,12 @@
- #include <fcntl.h>
- #include <sys/file.h>
- 
-+#if defined(__linux__)
-+#include <linux/input.h>
-+#include <linux/uinput.h>
-+#include "input_map.h"
-+#endif
-+
- #if defined __APPLE__
- #include <sys/ioccom.h>
- #endif
-@@ -151,31 +157,40 @@ FILE *lf=NULL;
- 
- /* quite arbitrary limits */
- #define MAX_PEERS	100
--/* substract one for lirc, sockfd, sockinet, logfile, pidfile */
--#define MAX_CLIENTS     (FD_SETSIZE-5-MAX_PEERS)
-+/* substract one for lirc, sockfd, sockinet, logfile, pidfile, uinput */
-+#define MAX_CLIENTS     (FD_SETSIZE-6-MAX_PEERS)
- 
- int sockfd, sockinet;
-+static int uinputfd = -1;
- int clis[MAX_CLIENTS];
- 
- #define CT_LOCAL  1
- #define CT_REMOTE 2
- 
--int cli_type[MAX_CLIENTS];
--int clin=0;
-+static int cli_type[MAX_CLIENTS];
-+static int clin=0;
- 
- int listen_tcpip=0;
- unsigned short int port=LIRC_INET_PORT;
-+struct in_addr address;
- 
- struct	peer_connection *peers[MAX_PEERS];
- int	peern = 0;
- 
- int debug=0;
--int daemonized=0;
--int allow_simulate=0;
-+static int daemonized=0;
-+static int allow_simulate=0;
-+static int userelease=0;
-+static int useuinput=0;
- 
- static sig_atomic_t term=0,hup=0,alrm=0;
- static int termsig;
- 
-+inline int use_hw()
-+{
-+	return (clin>0 || (useuinput && uinputfd != -1) || repeat_remote != NULL);
-+}
-+
- /* set_transmitters only supports 32 bit int */
- #define MAX_TX (CHAR_BIT*sizeof(unsigned long))
- 
-@@ -303,6 +318,7 @@ void dosigterm(int sig)
- 		free_config(free_remotes);
- 	}
- 	free_config(remotes);
-+	repeat_remote = NULL;
- 	logprintf(LOG_NOTICE,"caught signal");
- 	for (i=0; i<clin; i++)
- 	{
-@@ -311,6 +327,13 @@ void dosigterm(int sig)
- 	};
- 	shutdown(sockfd,2);
- 	close(sockfd);
-+
-+	if(uinputfd != -1)
-+	{
-+		ioctl(uinputfd, UI_DEV_DESTROY);
-+		close(uinputfd);
-+		uinputfd = -1;
-+	}
- 	if(listen_tcpip)
- 	{
- 		shutdown(sockinet,2);
-@@ -318,7 +341,7 @@ void dosigterm(int sig)
- 	}
- 	fclose(pidf);
- 	(void) unlink(pidfile);
--	if(clin>0 && hw.deinit_func) hw.deinit_func();
-+	if(use_hw() && hw.deinit_func) hw.deinit_func();
- #ifdef USE_SYSLOG
- 	closelog();
- #else
-@@ -387,6 +410,52 @@ void dosighup(int sig)
-       }
- }
- 
-+int setup_uinputfd(const char *name)
-+{
-+#if defined(__linux__)
-+	int fd;
-+	int key;
-+	struct uinput_user_dev dev;
-+	
-+	fd = open("/dev/input/uinput", O_RDWR);
-+	if(fd == -1)
-+	{
-+		fprintf(stderr, "could not open %s\n", "uinput");
-+		perror(NULL);
-+		return -1;
-+	}
-+	memset(&dev, 0, sizeof(dev));
-+	strncpy(dev.name, name, sizeof(dev.name));
-+	dev.name[sizeof(dev.name)-1] = 0;
-+	if(write(fd, &dev, sizeof(dev)) != sizeof(dev) ||
-+	   ioctl(fd, UI_SET_EVBIT, EV_KEY) != 0 ||
-+	   ioctl(fd, UI_SET_EVBIT, EV_REP) != 0)
-+	{
-+		goto setup_error;
-+	}
-+
-+        for(key = KEY_RESERVED; key <= KEY_UNKNOWN; key++)
-+	{
-+                if(ioctl(fd, UI_SET_KEYBIT, key) != 0)
-+		{
-+			goto setup_error;
-+                }
-+	}
-+
-+	if(ioctl(fd, UI_DEV_CREATE) != 0)
-+	{
-+		goto setup_error;
-+	}
-+	return fd;
-+	
-+ setup_error:
-+	fprintf(stderr, "could not setup %s\n", "uinput");
-+	perror(NULL);
-+	close(fd);
-+#endif
-+	return -1;
-+}
-+
- void config(void)
- {
- 	FILE *fd;
-@@ -448,9 +517,7 @@ void remove_client(int fd)
- 			logprintf(LOG_INFO,"removed client");
- 			
- 			clin--;
--			if(clin==0 &&
--			   repeat_remote==NULL &&
--			   hw.deinit_func)
-+			if(!use_hw() && hw.deinit_func)
- 			{
- 				hw.deinit_func();
- 			}
-@@ -508,8 +575,8 @@ void add_client(int sock)
- 	{
- 		cli_type[clin]=0; /* what? */
- 	}
--	clis[clin++]=fd;
--	if(clin==1 && repeat_remote==NULL)
-+	clis[clin]=fd;
-+	if(!use_hw())
- 	{
- 		if(hw.init_func)
- 		{
-@@ -525,6 +592,7 @@ void add_client(int sock)
- 			}
- 		}
- 	}
-+	clin++;
- }
- 
- int add_peer_connection(char *server)
-@@ -799,6 +867,10 @@ void start_server(mode_t permission,int 
- 	listen(sockfd,3);
- 	nolinger(sockfd);
- 
-+	if(useuinput)
-+	{
-+		uinputfd = setup_uinputfd(progname);
-+	}
- 	if(listen_tcpip)
- 	{
- 		int enable=1;
-@@ -815,7 +887,7 @@ void start_server(mode_t permission,int 
- 		(void) setsockopt(sockinet,SOL_SOCKET,SO_REUSEADDR,
- 				  &enable,sizeof(enable));
- 		serv_addr_in.sin_family=AF_INET;
--		serv_addr_in.sin_addr.s_addr=htonl(INADDR_ANY);
-+		serv_addr_in.sin_addr=address;
- 		serv_addr_in.sin_port=htons(port);
- 		
- 		if(bind(sockinet,(struct sockaddr *) &serv_addr_in,
-@@ -995,7 +1067,7 @@ void dosigalrm(int sig)
- 			free(repeat_message);
- 			repeat_message=NULL;
- 		}
--		if(clin==0 && repeat_remote==NULL && hw.deinit_func)
-+		if(!use_hw() && hw.deinit_func)
- 		{
- 			hw.deinit_func();
- 		}
-@@ -1025,7 +1097,7 @@ void dosigalrm(int sig)
- 		repeat_message=NULL;
- 		repeat_fd=-1;
- 	}
--	if(clin==0 && repeat_remote==NULL && hw.deinit_func)
-+	if(!use_hw() && hw.deinit_func)
- 	{
- 		hw.deinit_func();
- 	}
-@@ -1645,13 +1717,21 @@ void free_old_remotes()
- 	struct ir_remote *scan_remotes,*found;
- 	struct ir_ncode *code;
- 	const char *release_event;
-+	const char *release_remote_name;
-+	const char *release_button_name;
- 	
- 	if(decoding ==free_remotes) return;
- 	
--	release_event = release_map_remotes(free_remotes, remotes);
-+	release_event = release_map_remotes(free_remotes, remotes,
-+					    &release_remote_name,
-+					    &release_button_name);
- 	if(release_event != NULL)
- 	{
--		broadcast_message(release_event);
-+		input_message(release_event,
-+			      release_remote_name,
-+			      release_button_name,
-+			      0,
-+			      1);
- 	}
- 	if(last_remote!=NULL)
- 	{
-@@ -1741,19 +1821,56 @@ void free_old_remotes()
- 	}
- }
- 
--void broadcast_message(const char *message)
-+void input_message(const char *message, const char *remote_name,
-+		   const char *button_name, int reps, int release)
- {
--	int len,i;
- 	const char *release_message;
-+	const char *release_remote_name;
-+	const char *release_button_name;
- 
--	release_message = check_release_event();
-+	release_message = check_release_event(&release_remote_name,
-+					      &release_button_name);
- 	if(release_message)
- 	{
--		broadcast_message(release_message);
-+		input_message(release_message, release_remote_name,
-+			      release_button_name, 0, 1);
-+	}
-+	
-+	if(!release || userelease)
-+	{
-+		broadcast_message(message);
- 	}
-+	
-+#ifdef __linux__
-+	if(uinputfd != -1)
-+	{
-+		linux_input_code input_code;
-+		
-+		if(reps < 2 &&
-+		   get_input_code(button_name, &input_code) != -1)
-+		{
-+			struct input_event event;
-+			
-+			memset(&event, 0, sizeof(event));
-+			event.type = EV_KEY;
-+			event.code = input_code;
-+			event.value = release ? 0 : (reps>0 ? 2:1);
-+			if(write(uinputfd, &event, sizeof(event)) != sizeof(event))
-+			{
-+				logprintf(LOG_ERR, "writing to uinput failed");
-+				logperror(LOG_ERR, NULL);
-+			}
-+		}
-+	}
-+#endif
-+}
- 
-+void broadcast_message(const char *message)
-+{
-+	int len,i;
-+	
- 	len=strlen(message);
--			
-+	
- 	for (i=0; i<clin; i++)
- 	{
- 		LOGPRINTF(1,"writing to client %d",i);
-@@ -1799,7 +1916,7 @@ int waitfordata(long maxusec)
- 				FD_SET(sockinet,&fds);
- 				maxfd=max(maxfd,sockinet);
- 			}
--			if(clin>0 && hw.rec_mode!=0 && hw.fd!=-1)
-+			if(use_hw() && hw.rec_mode!=0 && hw.fd!=-1)
- 			{
- 				FD_SET(hw.fd,&fds);
- 				maxfd=max(maxfd,hw.fd);
-@@ -1915,10 +2032,19 @@ int waitfordata(long maxusec)
- 			   timercmp(&now, &release_time, >))
- 			{
- 				const char *release_message;
--				release_message = trigger_release_event();
-+				const char *release_remote_name;
-+				const char *release_button_name;
-+				
-+				release_message = trigger_release_event
-+					(&release_remote_name,
-+					 &release_button_name);
- 				if(release_message)
- 				{
--					broadcast_message(release_message);
-+					input_message(release_message,
-+						      release_remote_name,
-+						      release_button_name,
-+						      0,
-+						      1);
- 				}
- 			}
- 			if(free_remotes!=NULL)
-@@ -1948,7 +2074,9 @@ int waitfordata(long maxusec)
- 		}
- 		while(ret==-1 && errno==EINTR);
- 		
--		if(hw.fd == -1 && clin > 0 && hw.init_func)
-+		if(hw.fd == -1 &&
-+		   use_hw() &&
-+		   hw.init_func)
- 		{
- 			log_enable(0);
- 			hw.init_func();
-@@ -1993,7 +2121,7 @@ int waitfordata(long maxusec)
- 			LOGPRINTF(1,"registering inet client");
- 			add_client(sockinet);
- 		}
--                if(clin>0 && hw.rec_mode!=0 && hw.fd!=-1 &&
-+                if(use_hw() && hw.rec_mode!=0 && hw.fd!=-1 &&
- 		   FD_ISSET(hw.fd,&fds))
-                 {
- 			register_input();
-@@ -2016,13 +2144,20 @@ void loop()
- 		
- 		if(message!=NULL)
- 		{
-+			const char *remote_name;
-+			const char *button_name;
-+			int reps;
-+			
- 			if(hw.ioctl_func &&
- 			   (hw.features&LIRC_CAN_NOTIFY_DECODE))
- 			{
- 				hw.ioctl_func(LIRC_NOTIFY_DECODE, NULL);
- 			}
- 			
--			broadcast_message(message);
-+			get_release_data(&remote_name, &button_name, &reps);
-+
-+			input_message(message, remote_name, button_name,
-+				      reps, 0);
- 		}
- 	}
- }
-@@ -2034,6 +2169,7 @@ int main(int argc,char **argv)
- 	mode_t permission=S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
- 	char *device=NULL;
- 
-+	address.s_addr = htonl(INADDR_ANY);
- 	hw_choose_driver(NULL);
- 	while(1)
- 	{
-@@ -2058,9 +2194,15 @@ int main(int argc,char **argv)
- #                       endif
- 			{"release",optional_argument,NULL,'r'},
- 			{"allow-simulate",no_argument,NULL,'a'},
-+#                       if defined(__linux__)
-+			{"uinput",no_argument,NULL,'u'},
-+#                       endif
- 			{0, 0, 0, 0}
- 		};
- 		c = getopt_long(argc,argv,"hvnp:H:d:o:P:l::c:r::a"
-+#                               if defined(__linux__)
-+				"u"
-+#                               endif
- #                               ifndef USE_SYSLOG
- 				"L:"
- #                               endif
-@@ -2080,7 +2222,7 @@ int main(int argc,char **argv)
- 			printf("\t -p --permission=mode\t\tfile permissions for " LIRCD "\n");
- 			printf("\t -H --driver=driver\t\tuse given driver\n");
- 			printf("\t -d --device=device\t\tread from given device\n");
--			printf("\t -l --listen[=port]\t\tlisten for network connections on port\n");
-+			printf("\t -l --listen[=[addresss:]port]\t\tlisten for network connections\n");
- 			printf("\t -c --connect=host[:port]\tconnect to remote lircd server\n");
-                         printf("\t -o --output=socket\t\toutput socket filename\n");
-                         printf("\t -P --pidfile=file\t\tdaemon pid file\n");
-@@ -2092,6 +2234,9 @@ int main(int argc,char **argv)
- #                       endif
- 			printf("\t -r --release[=suffix]\t\tauto-generate release events\n");
- 			printf("\t -a --allow-simulate\t\taccept SIMULATE command\n");
-+#                       if defined(__linux__)
-+			printf("\t -u --uinput\t\tgenerate Linux input events\n");
-+#                       endif
- 			return(EXIT_SUCCESS);
- 		case 'v':
- 			printf("%s %s\n",progname,VERSION);
-@@ -2135,16 +2280,28 @@ int main(int argc,char **argv)
- 			{
- 				long p;
- 				char *endptr;
--				
--				p=strtol(optarg,&endptr,10);
-+				char *sep = strchr(optarg, ':');
-+				char *port_str = sep ? sep + 1 : optarg;
-+				p=strtol(port_str,&endptr,10);
- 				if(!*optarg || *endptr || p<1 || p>USHRT_MAX)
- 				{
- 					fprintf(stderr,
- 						"%s: bad port number \"%s\"\n",
--						progname,optarg);
-+						progname,port_str);
- 					return(EXIT_FAILURE);
- 				}
- 				port=(unsigned short int) p;
-+				if (sep)
-+				{
-+					*sep = 0;
-+					if(!inet_aton(optarg, &address))
-+					{
-+						fprintf(stderr,
-+							"%s: bad address \"%s\"\n",
-+							progname,optarg);
-+						return(EXIT_FAILURE);
-+					}
-+				}
- 			}
- 			else
- 			{
-@@ -2174,10 +2331,16 @@ int main(int argc,char **argv)
- 			{
- 				set_release_suffix(LIRC_RELEASE_SUFFIX);
- 			}
-+			userelease=1;
- 			break;
- 		case 'a':
- 			allow_simulate=1;
- 			break;
-+#               if defined(__linux__)
-+		case 'u':
-+			useuinput=1;
-+			break;
-+#               endif
- 		default:
- 			printf("Usage: %s [options] [config-file]\n",progname);
- 			return(EXIT_FAILURE);
-diff -Naurp lirc-0.8.4a.orig/daemons/lircd.h lirc-0.8.4a.upd/daemons/lircd.h
---- lirc-0.8.4a.orig/daemons/lircd.h	2007-09-29 13:13:14.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/lircd.h	2008-12-08 16:54:04.374682209 -0500
-@@ -32,6 +32,7 @@ void sigterm(int sig);
- void dosigterm(int sig);
- void sighup(int sig);
- void dosighup(int sig);
-+int setup_uinput(const char *name);
- void config(void);
- void nolinger(int sock);
- void remove_client(int fd);
-@@ -76,6 +77,8 @@ int send_core(int fd,char *message,char 
- int version(int fd,char *message,char *arguments);
- int get_pid(int fd,char *message,char *arguments);
- int get_command(int fd);
-+void input_message(const char *message, const char *remote_name,
-+		   const char *button_name, int reps, int release);
- void broadcast_message(const char *message);
- int waitfordata(long maxusec);
- void loop(void);
-diff -Naurp lirc-0.8.4a.orig/daemons/Makefile.am lirc-0.8.4a.upd/daemons/Makefile.am
---- lirc-0.8.4a.orig/daemons/Makefile.am	2008-09-21 14:33:19.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/Makefile.am	2008-12-08 17:58:11.557500930 -0500
-@@ -7,6 +7,8 @@
- 
- INCLUDES = -I$(top_srcdir)
- 
-+BUILT_SOURCES = input_map.inc
-+
- noinst_LIBRARIES = libhw_module.a
- libhw_module_a_SOURCES = \
- 			hw-types.c hw-types.h hardware.h \
-@@ -59,7 +61,8 @@ libhw_module_a_DEPENDENCIES = @hw_module
- sbin_PROGRAMS = lircd lircmd
- 
- lircd_SOURCES = lircd.c lircd.h \
--		config_file.c config_file.h
-+		config_file.c config_file.h \
-+		input_map.c input_map.h
- lircd_LDADD = @daemon@ libhw_module.a @hw_module_libs@
- 
- lircmd_SOURCES = lircmd.c
-@@ -69,7 +72,8 @@ bin_PROGRAMS = irrecord
- 
- irrecord_SOURCES = irrecord.c \
- 		config_file.c config_file.h \
--		dump_config.c dump_config.h
-+		dump_config.c dump_config.h \
-+		input_map.c input_map.h
- 
- irrecord_LDADD = libhw_module.a @hw_module_libs@ @receive@
- irrecord_DEPENDENCIES = @receive@
-@@ -79,6 +83,7 @@ EXTRA_PROGRAMS = lircd.simsend lircd.sim
- noinst_PROGRAMS = @maintmode_daemons_extra@
- lircd_simsend_SOURCES = lircd.c ir_remote.c config_file.c \
- 		lircd.h ir_remote.h ir_remote_types.h config_file.h \
-+		input_map.c input_map.h \
- 		hw-types.c hw-types.h hardware.h \
- 		hw_default.c hw_default.h \
- 		receive.c receive.h \
-@@ -87,6 +92,7 @@ lircd_simsend_SOURCES = lircd.c ir_remot
- lircd_simsend_CFLAGS = -DSIM_SEND
- lircd_simrec_SOURCES = lircd.c ir_remote.c config_file.c \
- 		lircd.h ir_remote.h ir_remote_types.h config_file.h \
-+		input_map.c input_map.h \
- 		hw-types.c hw-types.h hardware.h \
- 		hw_default.c hw_default.h \
- 		receive.c receive.h \
-@@ -125,4 +131,10 @@ rmfifo:
- 	-$(RM) $(DESTDIR)$(devdir)/lircd
- 	-$(RM) $(DESTDIR)$(devdir)/lircm
- 
-+input_map.inc:
-+	$(srcdir)/input_map.sh >$@
-+
-+DISTCLEANFILES = input_map.inc
-+EXTRA_DIST = input_map.inc input_map.sh
-+
- CLEANFILES = *~
-diff -Naurp lirc-0.8.4a.orig/daemons/release.c lirc-0.8.4a.upd/daemons/release.c
---- lirc-0.8.4a.orig/daemons/release.c	2008-02-06 08:43:07.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/release.c	2008-12-08 16:59:03.799472804 -0500
-@@ -1,4 +1,4 @@
--/*      $Id: release.c,v 1.3 2008/02/06 13:43:07 lirc Exp $      */
-+/*      $Id: release.c,v 1.4 2008/12/06 20:00:03 lirc Exp $      */
- 
- /****************************************************************************
-  ** release.c ***************************************************************
-@@ -25,24 +25,23 @@ static struct timeval release_time;
- static struct ir_remote *release_remote;
- static struct ir_ncode *release_ncode;
- static ir_code release_code;
-+static int release_reps;
- static lirc_t release_gap;
- 
- static struct ir_remote *release_remote2;
- static struct ir_ncode *release_ncode2;
- static ir_code release_code2;
--static const char *release_suffix = NULL;
-+static const char *release_suffix = LIRC_RELEASE_SUFFIX;
- static char message[PACKET_SIZE+1];
- 
- void register_input(void)
- {
- 	struct timeval gap;
- 	
--	if(release_suffix == NULL) return;
--	
- 	if(release_remote == NULL) return;
- 	
- 	timerclear(&gap);
--	gap.tv_usec = 2*release_gap;
-+	gap.tv_usec = 3*release_gap;
- 	
- 	gettimeofday(&release_time,NULL);
- 	timeradd(&release_time, &gap, &release_time);
-@@ -51,8 +50,6 @@ void register_input(void)
- void register_button_press(struct ir_remote *remote, struct ir_ncode *ncode,
- 			   ir_code code, int reps)
- {
--	if(release_suffix == NULL) return;
--	
- 	if(reps == 0 && release_remote != NULL)
- 	{
- 		release_remote2 = release_remote;
-@@ -63,11 +60,21 @@ void register_button_press(struct ir_rem
- 	release_remote = remote;
- 	release_ncode = ncode;
- 	release_code = code;
-+	release_reps = reps;
- 	release_gap = remote->max_remaining_gap;
- 	
- 	register_input();
- }
- 
-+void get_release_data(const char **remote_name,
-+		      const char **button_name,
-+		      int *reps)
-+{
-+	*remote_name = release_remote->name;
-+	*button_name = release_ncode->name;
-+	*reps = release_reps;
-+}
-+
- void set_release_suffix(const char *s)
- {
- 	release_suffix = s;
-@@ -78,12 +85,15 @@ void get_release_time(struct timeval *tv
- 	*tv = release_time;
- }
- 
--const char *check_release_event(void)
-+const char *check_release_event(const char **remote_name,
-+				const char **button_name)
- {
- 	int len = 0;
- 	
- 	if(release_remote2 != NULL)
- 	{
-+		*remote_name = release_remote2->name;
-+		*button_name = release_ncode2->name;
- 		len = write_message(message, PACKET_SIZE+1,
- 				    release_remote2->name,
- 				    release_ncode2->name, release_suffix,
-@@ -98,18 +108,21 @@ const char *check_release_event(void)
- 			return(NULL);
- 		}
- 
--		logprintf(LOG_INFO, "check");
-+		LOGPRINTF(3, "check");
- 		return message;
- 	}
- 	return NULL;
- }
- 
--const char *trigger_release_event(void)
-+const char *trigger_release_event(const char **remote_name,
-+				  const char **button_name)
- {
- 	int len = 0;
- 	
- 	if(release_remote != NULL)
- 	{
-+		*remote_name = release_remote->name;
-+		*button_name = release_ncode->name;
- 		len = write_message(message, PACKET_SIZE+1,
- 				    release_remote->name, release_ncode->name,
- 				    release_suffix, release_code, 0);
-@@ -123,13 +136,15 @@ const char *trigger_release_event(void)
- 			logprintf(LOG_ERR,"message buffer overflow");
- 			return(NULL);
- 		}
--		logprintf(LOG_INFO, "trigger");
-+		LOGPRINTF(3, "trigger");
- 		return message;
- 	}
- 	return NULL;
- }
- 
--const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new)
-+const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new,
-+				const char **remote_name,
-+				const char **button_name)
- {
- 	struct ir_remote *remote;
- 	struct ir_ncode *ncode;
-@@ -150,7 +165,7 @@ const char *release_map_remotes(struct i
- 		}
- 		else
- 		{
--			return trigger_release_event();
-+			return trigger_release_event(remote_name, button_name);
- 		}
- 	}
- 	return NULL;
-diff -Naurp lirc-0.8.4a.orig/daemons/release.h lirc-0.8.4a.upd/daemons/release.h
---- lirc-0.8.4a.orig/daemons/release.h	2007-05-06 07:54:02.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/release.h	2008-12-08 17:48:55.251581644 -0500
-@@ -1,4 +1,4 @@
--/*      $Id: release.h,v 1.1 2007/05/06 11:54:02 lirc Exp $      */
-+/*      $Id: release.h,v 1.2 2008/12/06 20:00:03 lirc Exp $      */
- 
- /****************************************************************************
-  ** release.h ***************************************************************
-@@ -18,10 +18,17 @@
- void register_input(void);
- void register_button_press(struct ir_remote *remote, struct ir_ncode *ncode,
- 			   ir_code code, int reps);
-+void get_release_data(const char **remote_name,
-+		      const char **button_name,
-+		      int *reps);
- void set_release_suffix(const char *s);
- void get_release_time(struct timeval *tv);
--const char *check_release_event(void);
--const char *trigger_release_event(void);
--const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new);
-+const char *check_release_event(const char **remote_name,
-+				const char **button_name);
-+const char *trigger_release_event(const char **remote_name,
-+				  const char **button_name);
-+const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new,
-+				const char **remote_name,
-+				const char **button_name);
- 
- #endif /* RELEASE_H */
-diff -Naurp lirc-0.8.4a.orig/doc/man/lircd.8 lirc-0.8.4a.upd/doc/man/lircd.8
---- lirc-0.8.4a.orig/doc/man/lircd.8	2008-10-26 10:15:37.000000000 -0400
-+++ lirc-0.8.4a.upd/doc/man/lircd.8	2008-12-08 17:14:44.574433177 -0500
-@@ -70,8 +70,9 @@ the device name isn't fixed. \fISTRING\f
- wildcards and '\\' to mark them as literal.
- 
- With the --listen option you can let lircd listen for network
--connections on the given port. The default port is 8765. No security
--checks are currently implemented.
-+connections on the given address/port. The default address is 0.0.0.0,
-+which means that connections on all network interfaces will be accepted.
-+The default port is 8765. No security checks are currently implemented.
- 
- The --connect option allows you to connect to other lircd servers that
- provide a network socket at the given host and port number. The number
-@@ -99,6 +100,14 @@ users with access to the lircd socket wi
- E.g. if you have configured your system to shut down by a button press
- on your remote control, everybody will be able to shut down
- your system from the command line.
-+
-+On Linux systems the --uinput option will enable automatic generation
-+of Linux input events. lircd will open /dev/input/uinput and inject
-+key events to the Linux kernel. The key code depends on the name that
-+was given a button in the lircd config file, e.g. if the button is
-+named KEY_1, the '1' key code will be generated. You will find a
-+complete list of possible button names in /usr/include/linux/input.h.
-+
- .SH FILES
- 
- The config file for lircd is located in /etc/lircd.conf. lircd
-diff -Naurp lirc-0.8.4a.orig/NEWS lirc-0.8.4a.upd/NEWS
---- lirc-0.8.4a.orig/NEWS	2008-12-08 16:47:25.391622403 -0500
-+++ lirc-0.8.4a.upd/NEWS	2008-12-08 17:40:05.345432825 -0500
-@@ -1,3 +1,7 @@
-+0.8.5-CVS: future
-+  * Linux input event generation using uinput
-+  * standardised namespace following Linux input conventions
-+
- 0.8.4a: 10/26/08
-   * fixed show-stopper bug in irrecord for drivers using MODE2
- 
-diff -Naurp lirc-0.8.4a.orig/TODO lirc-0.8.4a.upd/TODO
---- lirc-0.8.4a.orig/TODO	2008-07-31 07:17:53.000000000 -0400
-+++ lirc-0.8.4a.upd/TODO	2008-12-08 17:40:51.546432812 -0500
-@@ -2,8 +2,6 @@
- 
- * __init, __exit
- 
--* uinput
--
- * namespace
- 
- * GUI for irrecord
diff --git a/lirc-0.8.5-standardized-remote-keycodes.patch b/lirc-0.8.6-standardized-remote-keycodes.patch
similarity index 91%
rename from lirc-0.8.5-standardized-remote-keycodes.patch
rename to lirc-0.8.6-standardized-remote-keycodes.patch
index bbde924..9b00e5a 100644
--- a/lirc-0.8.5-standardized-remote-keycodes.patch
+++ b/lirc-0.8.6-standardized-remote-keycodes.patch
@@ -1,6 +1,6 @@
-diff -Naurp lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.5pre1/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707	2009-02-26 09:16:49.248659658 -0500
-+++ lirc-0.8.5pre1/remotes/adstech/lircd.conf.usbx-707	2009-02-26 09:19:05.211666497 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:31.000000000 -0400
 @@ -26,50 +26,50 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -90,9 +90,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.5pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.5pre1/remotes/animax/lircd.conf.animax
---- lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/animax/lircd.conf.animax	2009-02-26 09:18:45.387673492 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax lirc-0.8.6pre2/remotes/animax/lircd.conf.animax
+--- lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
++++ lirc-0.8.6pre2/remotes/animax/lircd.conf.animax	2009-08-29 13:23:31.000000000 -0400
 @@ -38,79 +38,79 @@ begin remote
  
        begin codes
@@ -206,9 +206,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.5pre1/remotes/apple/lircd.conf.macmini
---- lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/apple/lircd.conf.macmini	2009-02-26 09:19:05.212664695 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
++++ lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini	2009-08-29 13:23:31.000000000 -0400
 @@ -26,12 +26,12 @@ begin remote
    ignore_mask 0x0000ff01
  
@@ -228,9 +228,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.5pre1/remotes/asus/lircd.conf.asus
---- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/asus/lircd.conf.asus	2009-02-26 09:18:45.389659539 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus lirc-0.8.6pre2/remotes/asus/lircd.conf.asus
+--- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
++++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asus	2009-08-29 13:23:31.000000000 -0400
 @@ -19,38 +19,38 @@ begin remote
    toggle_bit	0
  
@@ -298,9 +298,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.5pre1/remo
          end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.5pre1/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/asus/lircd.conf.asusdh	2009-02-26 09:19:05.212664695 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
++++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh	2009-08-29 13:23:31.000000000 -0400
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
@@ -325,9 +325,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.5pre1/re
          end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.5pre1/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/asus/lircd.conf.digimatrix	2009-02-26 09:18:45.390666641 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
++++ lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix	2009-08-29 13:23:31.000000000 -0400
 @@ -28,43 +28,43 @@ begin remote
  
  
@@ -404,9 +404,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.5pre
            dvd_audio                0x00000000000050AF
            ui_size                  0x0000000000008877
            ui_on_off                0x00000000000028D7
-diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atilibusb	2009-02-26 09:19:05.213664473 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
++++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb	2009-08-29 13:23:31.000000000 -0400
 @@ -30,58 +30,58 @@ begin remote
  
  
@@ -518,9 +518,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.5pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb	2009-02-26 09:16:49.268661874 -0500
-+++ lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atiusb	2009-02-26 09:18:45.393659913 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:31.000000000 -0400
 @@ -37,54 +37,54 @@ begin remote
  
  
@@ -618,9 +618,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia	2009-02-26 09:18:45.394723700 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
++++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia	2009-08-29 13:23:31.000000000 -0400
 @@ -34,37 +34,37 @@ begin remote
  
  
@@ -683,9 +683,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia98	2009-02-26 09:18:45.394723700 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
++++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98	2009-08-29 13:23:31.000000000 -0400
 @@ -29,49 +29,49 @@ begin remote
  
        begin codes
@@ -765,9 +765,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.5pre1/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.vdomate	2009-02-26 09:18:45.395703904 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
++++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate	2009-08-29 13:23:31.000000000 -0400
 @@ -27,33 +27,33 @@ begin remote
  
  
@@ -820,9 +820,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.5p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy	2009-02-26 09:18:45.395703904 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
++++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy	2009-08-29 13:23:31.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -885,9 +885,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy2	2009-02-26 09:18:45.397726143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
++++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2	2009-08-29 13:23:31.000000000 -0400
 @@ -27,29 +27,29 @@ begin remote
        begin codes
            TV/FM                    0x0000000000000043
@@ -937,9 +937,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.5pr
            RESET                    0x000000000000004D
            FREEZE                   0x000000000000004F
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.5pre1/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/caraca/lircd.conf.caraca	2009-02-26 09:18:45.397726143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
++++ lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca	2009-08-29 13:23:31.000000000 -0400
 @@ -17,29 +17,29 @@ begin remote
    bits           16
  
@@ -991,9 +991,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.5pre1/
            TV/FM                    0x3fe3
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.5pre1/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos	2009-02-26 09:16:49.254660025 -0500
-+++ lirc-0.8.5pre1/remotes/chronos/lircd.conf.chronos	2009-02-26 09:18:45.398725143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:31.000000000 -0400
 @@ -20,37 +20,37 @@ begin remote
    toggle_bit      0
  
@@ -1057,9 +1057,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.5pre
 +          KEY_RIGHT         0x0000000000000007
        end codes
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.5pre1/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/cph03x/lircd.conf.cph03x	2009-02-26 09:18:45.398725143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
++++ lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x	2009-08-29 13:23:31.000000000 -0400
 @@ -32,39 +32,39 @@ begin remote
    repeat_bit      0
  
@@ -1123,9 +1123,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.5pre1/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.alsa_usb	2009-02-26 09:18:45.399664458 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb	2009-08-29 13:23:31.000000000 -0400
 @@ -34,38 +34,38 @@ begin remote
  
  
@@ -1192,9 +1192,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.5p
            Step                     0x0000000000007E81
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.5pre1/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.breakoutbox	2009-02-26 09:18:45.400730201 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox	2009-08-29 13:23:31.000000000 -0400
 @@ -19,37 +19,37 @@ begin remote
        begin codes
            DVD/CD                   0x0000000000000001
@@ -1259,9 +1259,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.5pre1/remotes/creative/lircd.conf.creative
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.creative	2009-02-26 09:18:45.400730201 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative lirc-0.8.6pre2/remotes/creative/lircd.conf.creative
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.creative	2009-08-29 13:23:31.000000000 -0400
 @@ -23,30 +23,30 @@ begin remote
    toggle_bit      0
  
@@ -1312,65 +1312,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.5p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.infracd lirc-0.8.5pre1/remotes/creative/lircd.conf.infracd
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.infracd	2003-05-07 13:30:41.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.infracd	2009-02-26 09:18:45.401665716 -0500
-@@ -30,30 +30,30 @@ begin remote
- 
- 
-       begin codes
--          PAUSE                    0x00000000000001FE
--          PLAY                     0x00000000000002FD
--          STOP                     0x00000000000003FC
--          REW                      0x00000000000005FA
--          PREV                     0x00000000000006F9
--          FF                       0x00000000000007F8
--          MENU                     0x00000000000004FB
-+          KEY_PAUSE                    0x00000000000001FE
-+          KEY_PLAY                     0x00000000000002FD
-+          KEY_STOP                     0x00000000000003FC
-+          KEY_REWIND                      0x00000000000005FA
-+          KEY_PREVIOUS                     0x00000000000006F9
-+          KEY_FASTFORWARD                       0x00000000000007F8
-+          KEY_MENU                     0x00000000000004FB
-           MOUSE                    0x00000000000008F7
--          1                        0x00000000000009F6
--          2                        0x0000000000000AF5
--          3                        0x0000000000000BF4
--          4                        0x0000000000000DF2
--          5                        0x0000000000000EF1
--          6                        0x0000000000000FF0
--          7                        0x00000000000011EE
--          8                        0x00000000000012ED
--          9                        0x00000000000013EC
--          0                        0x00000000000016E9
--          MUTE                     0x0000000000000CF3
--          VOL_UP                   0x00000000000010EF
--          VOL_DOWN                 0x00000000000014EB
-+          KEY_1                        0x00000000000009F6
-+          KEY_2                        0x0000000000000AF5
-+          KEY_3                        0x0000000000000BF4
-+          KEY_4                        0x0000000000000DF2
-+          KEY_5                        0x0000000000000EF1
-+          KEY_6                        0x0000000000000FF0
-+          KEY_7                        0x00000000000011EE
-+          KEY_8                        0x00000000000012ED
-+          KEY_9                        0x00000000000013EC
-+          KEY_0                        0x00000000000016E9
-+          KEY_MUTE                     0x0000000000000CF3
-+          KEY_VOLUMEUP                   0x00000000000010EF
-+          KEY_VOLUMEDOWN                 0x00000000000014EB
-           SHIFT                    0x00000000000015EA
--          ENTER                    0x00000000000017E8
--          ZOOM                     0x00000000000018E7
-+          KEY_ENTER                    0x00000000000017E8
-+          KEY_ZOOM                     0x00000000000018E7
-       end codes
- 
- end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.5pre1/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive	2009-02-26 09:16:49.262661298 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.livedrive	2009-02-26 09:18:45.401665716 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:31.000000000 -0400
 @@ -29,40 +29,40 @@ begin remote
  
  
@@ -1440,9 +1384,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.5
  	  
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.5pre1/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/dvico/lircd.conf.fusionHDTV	2009-02-26 09:18:45.402663084 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
++++ lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV	2009-08-29 13:23:31.000000000 -0400
 @@ -22,42 +22,42 @@ begin remote
    toggle_bit     0
  
@@ -1517,9 +1461,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.5pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.5pre1/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/ea65/lircd.conf.ea65	2009-02-26 09:18:45.403726860 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
++++ lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65	2009-08-29 13:23:31.000000000 -0400
 @@ -18,53 +18,53 @@ begin remote
          htpc        0x0011811b
          dvd/vcd     0x00128100
@@ -1608,9 +1552,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.5pre1/remo
          stop-eject  0x00238107
          mode-       0x00ff1080
          mode+       0x00ff1180
-diff -Naurp lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.5pre1/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/ericsson/lircd.conf.bte	2009-02-26 09:19:05.214660138 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
++++ lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte	2009-08-29 13:23:31.000000000 -0400
 @@ -11,29 +11,29 @@
  
  begin remote
@@ -1672,9 +1616,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.5pre1/r
          WAP             0x3a4f  # ':O'
  
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.5pre1/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/hauppauge/lircd.conf.hauppauge	2009-02-26 09:18:45.404660569 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
++++ lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge	2009-08-29 13:23:31.000000000 -0400
 @@ -27,25 +27,25 @@ begin remote
    repeat_bit      2
  
@@ -1718,9 +1662,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.
            RESERVED                 0x000000000000101E
            MINIMIZE                 0x0000000000001026
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.5pre1/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo	2009-02-26 09:16:49.247660098 -0500
-+++ lirc-0.8.5pre1/remotes/hercules/lircd.conf.smarttv_stereo	2009-02-26 09:18:45.405723158 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:31.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -1781,9 +1725,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.5pre1/remotes/imon/lircd.conf.imon
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon	2009-02-26 09:18:45.405723158 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon lirc-0.8.6pre2/remotes/imon/lircd.conf.imon
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon	2009-08-29 13:23:31.000000000 -0400
 @@ -29,48 +29,48 @@ begin remote
    duty_cycle   33
  
@@ -1869,9 +1813,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.5pre1/remo
            DVD.Caption              0x00000000000052AD
            DVD.Language             0x000000000000D22D
            Full.Screen              0x00000000000032CD
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-knob	2009-02-26 09:18:45.406732241 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob	2009-08-29 13:23:31.000000000 -0400
 @@ -23,74 +23,67 @@ begin remote
  
  
@@ -1996,9 +1940,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.5pre1
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad	2009-02-07 15:25:47.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-pad	2009-02-26 09:27:57.169660371 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad	2009-06-03 15:13:42.000000000 -0400
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad	2009-08-29 13:23:31.000000000 -0400
 @@ -24,96 +24,96 @@ begin remote
  
  
@@ -2160,9 +2104,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.5pre1/
  
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-rsc	2009-02-26 09:18:45.407723093 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc	2009-08-29 13:23:31.000000000 -0400
 @@ -27,48 +27,48 @@ begin remote
    gap          100000
  
@@ -2244,9 +2188,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.5pre1/
            Full.Screen        0x000000000000916e
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.5pre1/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/iodata/lircd.conf.gvbctv5pci	2009-02-26 09:18:45.408659730 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
++++ lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci	2009-08-29 13:23:31.000000000 -0400
 @@ -26,41 +26,41 @@ begin remote
  
  
@@ -2316,9 +2260,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.5p
            SYNC                     0x0000000000000003
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.5pre1/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/kanam_accent/lircd.conf.IR-100	2009-02-26 09:19:05.214660138 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
++++ lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100	2009-08-29 13:23:31.000000000 -0400
 @@ -29,47 +29,47 @@ begin remote
  
  
@@ -2408,9 +2352,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.5pre1/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/knc_one/lircd.conf.knc_one	2009-02-26 09:18:45.408659730 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
++++ lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one	2009-08-29 13:23:31.000000000 -0400
 @@ -26,37 +26,37 @@ begin remote
  
        begin codes
@@ -2475,9 +2419,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.5pre1/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/kworld/lircd.conf.kworld	2009-02-26 09:18:45.408659730 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
++++ lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld	2009-08-29 13:23:31.000000000 -0400
 @@ -29,36 +29,36 @@ begin remote
  
  
@@ -2536,9 +2480,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.5pre1/
            snapshot                 0x00000000000058A7
            mts                      0x000000000000B04F
            function-                0x00000000000020DF
-diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.PVR2000	2009-02-26 09:18:45.409722124 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
++++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000	2009-08-29 13:23:31.000000000 -0400
 @@ -18,54 +18,54 @@ begin remote
    gap       120000
  
@@ -2631,9 +2575,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.5pre
            TIMESHIFT                0x0000000000000035
  
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0007	2009-02-26 09:18:45.409722124 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
++++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007	2009-08-29 13:23:31.000000000 -0400
 @@ -44,43 +44,43 @@ begin remote
  
        begin codes
@@ -2703,9 +2647,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0010	2009-02-26 09:18:45.409722124 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
++++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010	2009-08-29 13:23:31.000000000 -0400
 @@ -43,69 +43,69 @@ begin remote
    duty_cycle   33
  
@@ -2815,9 +2759,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.5pre1/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/life-view/lircd.conf.flyvideo	2009-02-26 09:18:45.410725873 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
++++ lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo	2009-08-29 13:23:31.000000000 -0400
 @@ -35,50 +35,50 @@ begin remote
    duty_cycle   33
  
@@ -2898,9 +2842,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.5
   
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.5pre1/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/logitech/lircd.conf.logitech	2009-02-26 09:18:45.410725873 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
++++ lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech	2009-08-29 13:23:31.000000000 -0400
 @@ -23,41 +23,41 @@ begin remote
    repeat_bit      0
  
@@ -2970,9 +2914,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.5p
            MOUSE_N		   0x0000000000000040
            MOUSE_NNE		   0x0000000000000041
            MOUSE_NE		   0x0000000000000042
-diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 09:08:33.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/mceusb/lircd.conf.mceusb	2009-02-26 09:19:05.215660078 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb	2009-07-16 16:44:45.000000000 -0400
++++ lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb	2009-08-29 13:23:31.000000000 -0400
 @@ -1,7 +1,8 @@
  #
 -# brand:                        HP 
@@ -2983,9 +2927,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 +# devices being controlled by this remote: HP Slimline S3100y and a
 +# myriad of devices with Media Center Edition receivers
  #
- # Derived from MCEUSB2 lircd.conf file (lircd.conf.mceusb) found at:
- # https://help.ubuntu.com/community/Install_Lirc_Feisty
-@@ -58,10 +59,10 @@ begin remote
+ # RC-6 config file
+ #
+@@ -54,10 +55,10 @@ begin remote
        begin codes
  
  #unused by HP remote
@@ -3000,7 +2944,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
  	Teletext      0x00007ba5
  
  #ba6 - bae unused 
-@@ -75,7 +76,7 @@ begin remote
+@@ -71,7 +72,7 @@ begin remote
          BAD           0x00007bad
          BAE           0x00007bae
  
@@ -3009,7 +2953,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
          Print         0x00007bb1
  
  #bb2 - bb4 unused  
-@@ -83,11 +84,11 @@ begin remote
+@@ -79,11 +80,11 @@ begin remote
          BB3           0x00007bb3
          BB4           0x00007bb4
  
@@ -3024,7 +2968,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
  
  #bba - bbf unused 
          BBA           0x00007bba
-@@ -108,7 +109,7 @@ begin remote
+@@ -104,7 +105,7 @@ begin remote
          BC9           0x00007bc9
          BCA           0x00007bca
  
@@ -3033,7 +2977,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
          SlideShow     0x00007bcc
          Visualization 0x00007bcd
  
-@@ -127,50 +128,50 @@ begin remote
+@@ -123,50 +124,50 @@ begin remote
          Aspect        0x00007bd8
          Guide         0x00007bd9
          LiveTV        0x00007bda
@@ -3064,11 +3008,6 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 -        Play          0x00007be9
 -        Rewind        0x00007bea
 -        Forward       0x00007beb
--#NoGap
--        ChanDown      0x00007bec
--        ChanUp        0x00007bed
--        VolDown       0x00007bee
--        VolUp         0x00007bef
 +        KEY_AGAIN        0x00007be4
 +        KEY_NEXT          0x00007be5
 +        KEY_STOP          0x00007be6
@@ -3077,7 +3016,11 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 +        KEY_PLAY          0x00007be9
 +        KEY_REWIND        0x00007bea
 +        KEY_FORWARD       0x00007beb
-+#NoGap
+ #NoGap
+-        ChanDown      0x00007bec
+-        ChanUp        0x00007bed
+-        VolDown       0x00007bee
+-        VolUp         0x00007bef
 +        KEY_CHANNELDOWN      0x00007bec
 +        KEY_CHANNELUP        0x00007bed
 +        KEY_VOLUMEDOWN       0x00007bee
@@ -3087,10 +3030,15 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 -        Mute          0x00007bf1
 -        Home          0x00007bf2
 -        Power         0x00007bf3
--#NoGap
++        KEY_MUTE          0x00007bf1
++        KEY_HOME          0x00007bf2
++        KEY_POWER         0x00007bf3
+ #NoGap
 -        Enter         0x00007bf4
 -        Clear         0x00007bf5
--#NoGap
++        KEY_ENTER         0x00007bf4
++        KEY_CLEAR         0x00007bf5
+ #NoGap
 -        Nine          0x00007bf6
 -        Eight         0x00007bf7
 -        Seven         0x00007bf8
@@ -3101,13 +3049,6 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 -        Two           0x00007bfd
 -        One           0x00007bfe
 -        Zero          0x00007bff
-+        KEY_MUTE          0x00007bf1
-+        KEY_HOME          0x00007bf2
-+        KEY_POWER         0x00007bf3
-+#NoGap
-+        KEY_ENTER         0x00007bf4
-+        KEY_CLEAR         0x00007bf5
-+#NoGap
 +        KEY_9          0x00007bf6
 +        KEY_8         0x00007bf7
 +        KEY_7         0x00007bf8
@@ -3121,9 +3062,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.5pre1/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/packard_bell/lircd.conf.packard_bell	2009-02-26 09:18:45.411659928 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
++++ lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell	2009-08-29 13:23:31.000000000 -0400
 @@ -53,38 +53,38 @@ begin remote
    repeat          9050 2250
   
@@ -3188,9 +3129,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lir
            Star                     0x0000000000007F80
            Hash                     0x0000000000006B94
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.5pre1/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pcmak/lircd.conf.pcmak	2009-02-26 09:18:45.411659928 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak	2009-08-29 13:23:31.000000000 -0400
 @@ -23,18 +23,18 @@ begin remote
    repeat_bit      0
  
@@ -3334,9 +3275,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.5pre1/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.5pre1/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pinnacle_systems/lircd.conf.pctv	2009-02-26 09:18:45.412722130 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv	2009-08-29 13:23:31.000000000 -0400
 @@ -24,30 +24,30 @@ begin remote
    toggle_bit         0
  
@@ -3436,9 +3377,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.
            middle                   0x0000000000000014
  
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv	2009-02-26 09:18:45.412722130 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv	2009-08-29 13:23:31.000000000 -0400
 @@ -13,22 +13,22 @@ begin remote
    begin codes
      TV/FM                    0x00000000000000e7
@@ -3477,9 +3418,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.5pr
    end codes
  end remote
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_bt878	2009-02-26 09:18:45.412722130 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878	2009-08-29 13:23:31.000000000 -0400
 @@ -16,39 +16,39 @@ begin remote
    repeat_bit 0
  
@@ -3546,9 +3487,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0
    end codes
  end remote
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_pro	2009-02-26 09:18:45.413667488 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro	2009-08-29 13:23:31.000000000 -0400
 @@ -31,15 +31,15 @@ begin remote
  
        begin codes
@@ -3599,9 +3540,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8
  
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.5pre1/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.remotemaster	2009-02-26 09:18:45.413667488 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster	2009-08-29 13:23:31.000000000 -0400
 @@ -25,39 +25,39 @@ begin remote
    gap          189264
  
@@ -3669,9 +3610,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.5pre1/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/provideo/lircd.conf.pv951	2009-02-26 09:18:45.413667488 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
++++ lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951	2009-08-29 13:23:31.000000000 -0400
 @@ -31,28 +31,28 @@ begin remote
    repeat_bit      0
  
@@ -3717,9 +3658,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.5pre1
            func                     0x0000000000009867
            ttx                      0x000000000000B04F
            pg+                      0x000000000000708F
-diff -Naurp lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.5pre1/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/remotec/lircd.conf.BW6130	2009-02-26 09:18:45.414659744 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
++++ lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130	2009-08-29 13:23:31.000000000 -0400
 @@ -20,20 +20,20 @@ begin remote
    toggle_bit     0
  
@@ -3755,9 +3696,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.5pre1
  	MOUSE_SLOW_N		0x95
  	MOUSE_SLOW_NNE		0xd1
  	MOUSE_SLOW_NE		0xcd
-diff -Naurp lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.5pre1/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/samsung/lircd.conf.samsung	2009-02-26 09:19:05.215660078 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
++++ lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung	2009-08-29 13:23:31.000000000 -0400
 @@ -28,60 +28,60 @@ begin remote
  
        begin codes
@@ -3868,9 +3809,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.5pre1/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/sasem/lircd.conf.sasem	2009-02-26 09:18:45.414659744 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
++++ lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem	2009-08-29 13:23:31.000000000 -0400
 @@ -33,47 +33,47 @@ begin remote
  
  
@@ -3951,9 +3892,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.5pre1/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.5pre1/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/sigma_designs/lircd.conf.realmagic	2009-02-26 09:18:45.415660059 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
++++ lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic	2009-08-29 13:23:31.000000000 -0400
 @@ -30,43 +30,43 @@ begin remote
  
        begin codes
@@ -4030,9 +3971,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.5pre1/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/silitek/lircd.conf.silitek	2009-02-26 09:18:45.415660059 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
++++ lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek	2009-08-29 13:23:31.000000000 -0400
 @@ -30,68 +30,68 @@ begin remote
      MOUSE_SSE                0x0000000000aa0004
      MOUSE_SE                 0x0000000000aa0003
@@ -4150,9 +4091,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.5pre
 +    KEY_CLOSE                 0x0000000000cc5d62
    end codes
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.5pre1/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/streamzap/lircd.conf.streamzap	2009-02-26 09:19:05.237856913 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
++++ lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap	2009-08-29 13:23:31.000000000 -0400
 @@ -27,41 +27,41 @@ begin remote
  
  
@@ -4230,9 +4171,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.5pre1/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/technisat/lircd.conf.mediafocusI	2009-02-26 09:18:45.415660059 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
++++ lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI	2009-08-29 13:23:31.000000000 -0400
 @@ -30,11 +30,11 @@ begin remote
    duty_cycle   33
  
@@ -4250,9 +4191,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.5pre1/remotes/tekram/lircd.conf.m230
---- lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/tekram/lircd.conf.m230	2009-02-26 09:18:45.416659738 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
++++ lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230	2009-08-29 13:23:31.000000000 -0400
 @@ -13,36 +13,36 @@ begin remote
    name  M230
    bits  8
@@ -4313,9 +4254,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.5pre1/re
 +	KEY_KPMINUS		0x0C
       end codes
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.5pre1/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/vlsystem/lircd.conf.mplay	2009-02-26 09:19:05.217660199 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
++++ lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay	2009-08-29 13:23:31.000000000 -0400
 @@ -22,49 +22,49 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -4409,9 +4350,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.5pre1
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.5pre1/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/x10/lircd.conf.mouseremote	2009-02-26 09:18:45.419659649 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
++++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote	2009-08-29 13:23:31.000000000 -0400
 @@ -24,42 +24,42 @@ begin remote
    gap		140000
  
@@ -4494,9 +4435,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.5pre
  	end codes	
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.5pre1/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/x10/lircd.conf.mp3anywhere	2009-02-26 09:18:45.419659649 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
++++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere	2009-08-29 13:23:31.000000000 -0400
 @@ -22,43 +22,43 @@ begin remote
    gap		140000
  
diff --git a/lirc.spec b/lirc.spec
index 2fdd7de..b44b08b 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.5%{?pre:.%{pre}}%{?dist}
+Release:        0.6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -31,7 +31,7 @@ Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1:		lirc-0.8.5-standardized-remote-keycodes.patch
+Patch1:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -273,6 +273,9 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.6.pre2
+- Rediff patches so they actually apply still
+
 * Sat Aug 29 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.5.pre2
 - Update to lirc 0.8.6pre2