- Update to 0.8.4pre1

- Drop upstream patches - Adds support for the CommandIR II userspace driver
17 years ago · 17c5bcd5c9
parent 46db3b83c3
commit 17c5bcd5c9
8 changed files with 457 additions and 813 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1,2 @@
 lirc-0.8.3.tar.bz2
+lirc-0.8.4pre1.tar.bz2
--- a/hw_commandir.h
+++ b/hw_commandir.h
@ -0,0 +1,175 @@
+ 
+/****************************************************************************
+ ** hw_commandir.h **********************************************************
+ ****************************************************************************
+ * 
+ * Copyright (C) 1999 Christoph Bartelmus <lirc@bartelmus.de>
+ * -- Original hw_default.h
+ * Modified for CommandIR Transceivers, April-June 2008, Matthew Bodkin 
+ *
+ */
+
+#ifndef HW_COMMANDIR_H
+#define HW_COMMANDIR_H
+
+#define RX_BUFFER_SIZE 1024
+#define TX_BUFFER_SIZE 1024
+#define TX_QUEUE 1
+#define RX_QUEUE 0
+#define MAX_COMMANDIRS 4
+#define MAX_COMMAND 8192
+
+/* transmitter channel control */
+#define MAX_DEVICES		4
+#define MAX_CHANNELS    16
+#define DEVICE_CHANNELS	4
+#define MAX_MASK 		0xffff
+#define MAX_SIGNALQ		100
+
+/* CommandIR control codes */
+#define CHANNEL_EN_MASK	1
+#define FREQ_HEADER     2
+#define MCU_CTRL_SIZE   3
+#define TX_HEADER       7
+#define TX_HEADER_NEW	8
+/* New for CommandIR II  */
+
+#define READ_INPUTS		10
+#define PROC_SET		11
+#define INIT_FUNCTION	12
+#define RX_SELECT		13
+#define TX_COMMANDIR_II 14
+/* Internal to driver */
+#define TX_LIRC_T	    15
+#define FREQ_HEADER_LIRC 16
+#define RXDECODE_HEADER_LIRC 17
+#define INIT_HEADER_LIRC 18
+#define DEINIT_HEADER_LIRC 19
+#define GET_VERSION 	20
+
+#define COMMANDIR_2_PULSE_MASK 0x8000
+#define COMMANDIR_2_OVERFLOW_MASK 0x4000
+
+#define DEFAULT_PULSE_WIDTH 13
+
+#define USB_CMDIR_VENDOR_ID		0x10c4
+#define USB_CMDIR_PRODUCT_ID	0x0003
+#define USB_CMDIR_MINOR_BASE	192
+
+#define HW_COMMANDIR_MINI 	1
+#define HW_COMMANDIR_2		2
+#define HW_COMMANDIR_UNKNOWN 127
+
+#define MAX_HW_MINI_PACKET 64
+
+// CommandIR has lots of buffer room, we don't need to poll constantly
+#define USB_TIMEOUT_MS 5000
+#define USB_TIMEOUT_US 1000
+#define WAIT_BETWEEN_READS_US 10000
+#define MAX_WAIT_BETWEEN_READS_US 5000000
+#define MIN_WAIT_BETWEEN_READS_US 5000
+
+#define USB_MAX_BUSES	8
+#define USB_MAX_BUSDEV	127
+
+#define RX_HEADER_DATA 		0x01
+#define RX_HEADER_EVENTS 	0x02
+#define RX_HEADER_TXAVAIL 	0x03
+
+
+// We keep CommandIR's OPEN even on -deinit for speed and to monitor 
+// Other non-LIRC events (plugin, suspend, etc)
+#define USB_KEEP_WARM 1
+
+// CommandIR lircd.conf event driven code definitions
+#define LIRCCODE_GAP  125000
+#define JACK_PLUG_1		0x01
+#define JACK_PLUG_2		0x02
+#define JACK_PLUG_3		0x03
+#define JACK_PLUG_4		0x04
+#define JACK_PLUG_5		0x11
+#define JACK_PLUG_6		0x12
+#define JACK_PLUG_7		0x13
+#define JACK_PLUG_8		0x14
+#define JACK_PLUG_9		0x21
+#define JACK_PLUG_10	0x22
+#define JACK_PLUG_11	0x23
+#define JACK_PLUG_12	0x24
+#define JACK_PLUG_13	0x31
+#define JACK_PLUG_14	0x32
+#define JACK_PLUG_15	0x33
+#define JACK_PLUG_16	0x34
+
+#define JACK_UNPLUG_1	0x05
+#define JACK_UNPLUG_2	0x06
+#define JACK_UNPLUG_3	0x07
+#define JACK_UNPLUG_4	0x08
+#define JACK_UNPLUG_5	0x15
+#define JACK_UNPLUG_6	0x16
+#define JACK_UNPLUG_7	0x17
+#define JACK_UNPLUG_8	0x18
+#define JACK_UNPLUG_9	0x25
+#define JACK_UNPLUG_10	0x26
+#define JACK_UNPLUG_11	0x27
+#define JACK_UNPLUG_12	0x28
+#define JACK_UNPLUG_13	0x35
+#define JACK_UNPLUG_14	0x36
+#define JACK_UNPLUG_15	0x37
+#define JACK_UNPLUG_16	0x38
+
+#define SELECT_TX_INTERNAL	0x09
+#define SELECT_TX_ExTERNAL	0x0A
+
+#define SELECT_TX_ON_1		0x0D
+#define SELECT_TX_ON_2		0x1D
+#define SELECT_TX_ON_3		0x2D
+#define SELECT_TX_ON_4		0x3D
+
+#define JACK_PLUG_RX_1		0x0B
+#define JACK_UNPLUG_RX_1	0x0C
+#define JACK_PLUG_RX_2		0x1B
+#define JACK_UNPLUG_RX_2	0x1C
+#define JACK_PLUG_RX_3		0x2B
+#define JACK_UNPLUG_RX_3	0x2C
+#define JACK_PLUG_RX_4		0x3B
+#define JACK_UNPLUG_RX_4	0x3C
+
+#define COMMANDIR_PLUG_1	0x41
+#define COMMANDIR_PLUG_2	0x42
+#define COMMANDIR_PLUG_3	0x43
+#define COMMANDIR_PLUG_4	0x44
+
+#define COMMANDIR_UNPLUG_1	0x45
+#define COMMANDIR_UNPLUG_2	0x46
+#define COMMANDIR_UNPLUG_3	0x47
+#define COMMANDIR_UNPLUG_4	0x48
+
+#define COMMANDIR_REORDERED	0x50
+#define COMMANDIR_READY		0x51
+#define COMMANDIR_STOPPED	0x52
+#define COMMANDIR_POLL_FASTER	0x53
+#define COMMANDIR_POLL_SLOWER	0x54
+
+#define SETTRANSMITTERS_1	0xf0
+#define SETTRANSMITTERS_2	0xf1
+#define SETTRANSMITTERS_3	0xf2
+#define SETTRANSMITTERS_4	0xf3
+#define SETTRANSMITTERS_5	0xf4
+#define SETTRANSMITTERS_6	0xf5
+#define SETTRANSMITTERS_7	0xf6
+#define SETTRANSMITTERS_8	0xf7
+#define SETTRANSMITTERS_9	0xf8
+#define SETTRANSMITTERS_10	0xf9
+#define SETTRANSMITTERS_11	0xfa
+#define SETTRANSMITTERS_12	0xfb
+#define SETTRANSMITTERS_13	0xfc
+#define SETTRANSMITTERS_14	0xfd
+#define SETTRANSMITTERS_15	0xfe
+#define SETTRANSMITTERS_16	0xff
+
+// What's in a returning data packet
+#define COMMANDIR_RX_EVENTS 		0x02
+#define COMMANDIR_RX_DATA			0x01
+
+
+#endif
--- a/lirc-0.8.3-remote-includes-directive.patch
+++ b/lirc-0.8.3-remote-includes-directive.patch
@ -1,341 +0,0 @@
-diff -Naurp lirc-0.8.3.orig/daemons/config_file.c lirc-0.8.3/daemons/config_file.c
--- lirc-0.8.3.orig/daemons/config_file.c	2007-07-29 14:20:06.000000000 -0400
-+++ lirc-0.8.3/daemons/config_file.c	2008-05-12 18:02:32.000000000 -0400
-@@ -1,4 +1,4 @@
-/*      $Id: config_file.c,v 5.27 2007/07/29 18:20:06 lirc Exp $      */
-+/*      $Id: config_file.c,v 5.28 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** config_file.c ***********************************************************
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <libgen.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/stat.h>
-@@ -32,9 +33,14 @@
- #include "config_file.h"
- 
- #define LINE_LEN 1024
-+#define MAX_INCLUDES 10
- 
-int line;
-int parse_error;
-+const char *whitespace = " \t";
-+
-+static int line;
-+static int parse_error;
-+
-+static struct ir_remote * read_config_recursive(FILE *f, const char *name, int depth);
- 
- void **init_void_array(struct void_array *ar,size_t chunk_size, size_t item_size)
- {
-@@ -643,7 +649,84 @@ struct ir_remote *sort_by_bit_count(stru
- 	return top;
- }
- 
-struct ir_remote * read_config(FILE *f)
-+static const char *lirc_parse_include(char *s)
-+{
-+	char *last;
-+	size_t len;
-+	
-+	len=strlen(s);
-+	if(len<2)
-+	{
-+		return NULL;
-+	}
-+	last = s+len-1;
-+	while(last >  s && strchr(whitespace, *last) != NULL)
-+	{
-+		last--;
-+	}
-+	if(last <= s)
-+	{
-+		return NULL;
-+	}
-+	if(*s!='"' && *s!='<')
-+	{
-+		return NULL;
-+	}
-+	if(*s=='"' && *last!='"')
-+	{
-+		return NULL;
-+	}
-+	else if(*s=='<' && *last!='>')
-+	{
-+		return NULL;
-+	}
-+	*last = 0;
-+	memmove(s, s+1, len-2+1); /* terminating 0 is copied, and
-+				     maybe more, but we don't care */
-+	return s;
-+}
-+
-+static const char *lirc_parse_relative(char *dst, size_t dst_size,
-+				 const char *child, const char *current)
-+{
-+	char *dir;
-+	size_t dirlen;
-+
-+	if (!current)
-+		return child;
-+
-+	/* Not a relative path */
-+	if (*child == '/')
-+		return child;
-+
-+	if(strlen(current) >= dst_size)
-+	{
-+		return NULL;
-+	}
-+	strcpy(dst, current);
-+	dir = dirname(dst);
-+	dirlen = strlen(dir);
-+	if(dir != dst)
-+	{
-+		memmove(dst, dir, dirlen + 1);
-+	}
-+
-+	if(dirlen + 1 + strlen(child) + 1 > dst_size)
-+	{
-+		return NULL;
-+	}
-+	strcat(dst, "/");
-+	strcat(dst, child);
-+	
-+	return dst;
-+}
-+
-+struct ir_remote * read_config(FILE *f, const char *name)
-+{
-+	return read_config_recursive(f, name, 0);
-+}
-+
-+static struct ir_remote * read_config_recursive(FILE *f, const char *name, int depth)
- {
- 	char buf[LINE_LEN+1], *key, *val, *val2;
-         int len,argc;
-@@ -656,6 +739,7 @@ struct ir_remote * read_config(FILE *f)
- 
- 	line=0;
- 	parse_error=0;
-+	LOGPRINTF(2, "parsing '%s'", name);
- 
- 	while(fgets(buf,LINE_LEN,f)!=NULL)
- 	{
-@@ -683,14 +767,74 @@ struct ir_remote * read_config(FILE *f)
-                 if(buf[0]=='#'){
- 			continue;
-                 }
-		key=strtok(buf," \t");
-+		key=strtok(buf, whitespace);
- 		/* ignore empty lines */
- 		if(key==NULL) continue;
-		val=strtok(NULL, " \t");
-+		val=strtok(NULL, whitespace);
- 		if(val!=NULL){
-			val2=strtok(NULL, " \t");
-+			val2=strtok(NULL, whitespace);
- 			LOGPRINTF(3,"\"%s\" \"%s\"",key,val);
-                        if (strcasecmp("begin",key)==0){
-+			if (strcasecmp("include",key)==0){
-+                                FILE* childFile;
-+				const char *childName;
-+				const char *fullPath;
-+				char result[FILENAME_MAX+1];
-+
-+
-+				if (depth > MAX_INCLUDES) {
-+					logprintf(LOG_ERR,"error opening child file defined at %s:%d",name,line);
-+					logprintf(LOG_ERR,"too many files included");
-+					parse_error=-1;
-+					break;
-+				}
-+
-+				childName = lirc_parse_include(val);
-+				if (!childName){
-+					logprintf(LOG_ERR,"error parsing child file value defined at line %d:",line);
-+					logprintf(LOG_ERR,"invalid quoting");
-+					parse_error=-1;
-+					break;
-+				}
-+
-+				fullPath = lirc_parse_relative(result, sizeof(result), childName, name);
-+				if (!fullPath) {
-+					logprintf(LOG_ERR,"error composing relative file path defined at line %d:",line);
-+					logprintf(LOG_ERR,"resulting path too long");
-+					parse_error=-1;
-+					break;
-+				}
-+
-+				childFile = fopen(fullPath, "r");
-+				if (childFile == NULL){
-+					logprintf(LOG_ERR,"error opening child file '%s' defined at line %d:",fullPath, line);
-+					logprintf(LOG_ERR,"ignoring this child file for now.");
-+				}
-+				else{
-+					int save_line = line;
-+					
-+					if (!top_rem){
-+						/* create first remote */
-+						LOGPRINTF(2,"creating first remote");
-+						rem = read_config_recursive(childFile, fullPath, depth + 1);
-+						if(rem != (void *) -1 && rem != NULL) {
-+							top_rem = rem;
-+						} else {
-+							rem = NULL;
-+						}
-+					}else{
-+						/* create new remote */
-+						LOGPRINTF(2,"creating next remote");
-+						rem->next=read_config_recursive(childFile, fullPath, depth + 1);
-+						if(rem->next != (void *) -1 && rem->next != NULL) {
-+							rem=rem->next;
-+						} else {
-+							rem->next = NULL;
-+						}
-+					}
-+					fclose(childFile);
-+					line = save_line;
-+				}
-+			}else if (strcasecmp("begin",key)==0){
- 				if (strcasecmp("codes", val)==0){
-                                         /* init codes mode */
- 					LOGPRINTF(2,"    begin codes");
-@@ -744,7 +888,7 @@ struct ir_remote * read_config(FILE *f)
- 						
- 						if(val2[0]=='#') break; /* comment */
- 						node=defineNode(code, val2);
-						val2=strtok(NULL, " \t");
-+						val2=strtok(NULL, whitespace);
- 					}
- 					code->current=NULL;
- 					add_void_array(&codes_list, code);
-@@ -822,7 +966,7 @@ struct ir_remote * read_config(FILE *f)
- 						
- 						if(val2[0]=='#') break; /* comment */
- 						node=defineNode(code, val2);
-						val2=strtok(NULL, " \t");
-+						val2=strtok(NULL, whitespace);
- 					}
- 					code->current=NULL;
- 					add_void_array(&codes_list, code);
-@@ -842,7 +986,7 @@ struct ir_remote * read_config(FILE *f)
- 				case ID_remote:
- 					argc=defineRemote(key, val, val2, rem);
- 					if(!parse_error && ((argc==1 && val2!=NULL) || 
-					   (argc==2 && val2!=NULL && strtok(NULL," \t")!=NULL)))
-+					   (argc==2 && val2!=NULL && strtok(NULL, whitespace)!=NULL)))
- 					{
- 						logprintf(LOG_WARNING,"garbage after '%s'"
- 							  " token in line %d ignored",
-@@ -857,7 +1001,7 @@ struct ir_remote * read_config(FILE *f)
- 						
- 						if(val2[0]=='#') break; /* comment */
- 						node=defineNode(code, val2);
-						val2=strtok(NULL, " \t");
-+						val2=strtok(NULL, whitespace);
- 					}
- 					code->current=NULL;
- 					add_void_array(&codes_list, code);
-@@ -905,7 +1049,7 @@ struct ir_remote * read_config(FILE *f)
- 								break;
- 							}
- 						}
-						while ((val=strtok(NULL," \t"))){
-+						while ((val=strtok(NULL, whitespace))){
- 							if (!addSignal(&signals, val)) break;
- 						}
- 					}
-@@ -950,7 +1094,15 @@ struct ir_remote * read_config(FILE *f)
- 		}
- 	}
-         if (parse_error){
-+		static int print_error = 1;
-+		
-+		if(print_error) {
-+			logprintf(LOG_ERR, "reading of file '%s' failed",
-+				  name);
-+			print_error = 0;
-+		}
- 		free_config(top_rem);
-+		if(depth == 0) print_error = 1;
-                 return((void *) -1);
-         }
- 	/* kick reverse flag */
-diff -Naurp lirc-0.8.3.orig/daemons/config_file.h lirc-0.8.3/daemons/config_file.h
--- lirc-0.8.3.orig/daemons/config_file.h	2006-01-28 13:36:44.000000000 -0500
-+++ lirc-0.8.3/daemons/config_file.h	2008-05-12 18:02:22.000000000 -0400
-@@ -1,4 +1,4 @@
-/*      $Id: config_file.h,v 5.10 2006/01/28 18:36:44 lirc Exp $      */
-+/*      $Id: config_file.h,v 5.11 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** config_file.h ***********************************************************
-@@ -86,7 +86,7 @@ int addSignal(struct void_array *signals
- struct ir_ncode * defineCode(char *key, char *val, struct ir_ncode *code);
- struct ir_code_node *defineNode(struct ir_ncode *code, const char *val);
- int defineRemote(char * key, char * val, char *val2, struct ir_remote *rem);
-struct ir_remote *read_config(FILE *f);
-+struct ir_remote *read_config(FILE *f, const char *name);
- void free_config(struct ir_remote *remotes);
- 
- #endif
-diff -Naurp lirc-0.8.3.orig/daemons/irrecord.c lirc-0.8.3/daemons/irrecord.c
--- lirc-0.8.3.orig/daemons/irrecord.c	2008-02-14 15:42:56.000000000 -0500
-+++ lirc-0.8.3/daemons/irrecord.c	2008-05-12 18:03:51.000000000 -0400
-@@ -1,4 +1,4 @@
-/*      $Id: irrecord.c,v 5.69 2008/02/14 20:42:56 lirc Exp $      */
-+/*      $Id: irrecord.c,v 5.71 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** irrecord.c **************************************************************
-@@ -311,7 +311,7 @@ int main(int argc,char **argv)
- 				progname, filename, progname);
- 			exit(EXIT_FAILURE);
- 		}
-		remotes=read_config(fin);
-+		remotes=read_config(fin, filename);
- 		fclose(fin);
- 		if(remotes==(void *) -1 || remotes==NULL)
- 		{
-@@ -748,7 +748,7 @@ int main(int argc,char **argv)
- 		if(hw.deinit_func) hw.deinit_func();
- 		exit(EXIT_FAILURE);
- 	}
-	remotes=read_config(fin);
-+	remotes=read_config(fin,filename);
- 	fclose(fin);
- 	if(remotes==NULL)
- 	{
-diff -Naurp lirc-0.8.3.orig/daemons/lircd.c lirc-0.8.3/daemons/lircd.c
--- lirc-0.8.3.orig/daemons/lircd.c	2008-03-30 10:53:06.000000000 -0400
-+++ lirc-0.8.3/daemons/lircd.c	2008-05-12 18:02:12.000000000 -0400
-@@ -1,4 +1,4 @@
-/*      $Id: lircd.c,v 5.76 2008/03/30 14:53:06 lirc Exp $      */
-+/*      $Id: lircd.c,v 5.77 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** lircd.c *****************************************************************
-@@ -406,7 +406,7 @@ void config(void)
- 		logperror(LOG_ERR,NULL);
- 		return;
- 	}
-	config_remotes=read_config(fd);
-+	config_remotes=read_config(fd, configfile);
- 	fclose(fd);
- 	if(config_remotes==(void *) -1)
- 	{
-diff -Naurp lirc-0.8.3.orig/NEWS lirc-0.8.3/NEWS
--- lirc-0.8.3.orig/NEWS	2008-05-12 17:59:40.000000000 -0400
-+++ lirc-0.8.3/NEWS	2008-05-12 18:05:04.000000000 -0400
-@@ -1,3 +1,6 @@
-+0.8.4-CVS: future
-+  * support for include directive in lircd.conf
-+
- 0.8.3: 05/04/08
-   * added support for Samsung USB IR Receiver (Robert Schedel)
-   * added support for Soundgraph iMON IR/LCD (Dean Harding)
--- a/lirc-0.8.3-validate-transmit-buffer.patch
+++ b/lirc-0.8.3-validate-transmit-buffer.patch
@ -1,58 +0,0 @@
--- lirc/daemons/transmit.c	2007/07/29 18:20:13	5.27
-+++ lirc/daemons/transmit.c	2008/05/11 13:29:47	5.28
-@@ -1,4 +1,4 @@
-/*      $Id: transmit.c,v 5.27 2007/07/29 18:20:13 lirc Exp $      */
-+/*      $Id: transmit.c,v 5.28 2008/05/11 13:29:47 lirc Exp $      */
- 
- /****************************************************************************
-  ** transmit.c **************************************************************
-@@ -116,6 +116,34 @@
- 	return(0);
- }
- 
-+static int check_send_buffer(void)
-+{
-+	int i;
-+
-+	if (send_buffer.wptr == 0) 
-+	{
-+		LOGPRINTF(1, "nothing to send");
-+		return(0);
-+	}
-+	for (i = 0; i < send_buffer.wptr; i++)
-+	{
-+		if(send_buffer.data[i] == 0)
-+		{
-+			if(i%2)
-+			{
-+				LOGPRINTF(1, "invalid space: %d", i);
-+			}
-+			else
-+			{
-+				LOGPRINTF(1, "invalid pulse: %d", i);
-+			}
-+			return 0;
-+		}
-+	}
-+	
-+	return 1;
-+}
-+
- static inline void flush_send_buffer(void)
- {
- 	if(send_buffer.pendingp>0)
-@@ -500,5 +528,13 @@
- 		goto init_send_loop;
- 	}
- 	LOGPRINTF(3, "transmit buffer ready");
-	return(1);
-+	if(!check_send_buffer())
-+	{
-+		logprintf(LOG_ERR, "invalid send buffer");
-+		logprintf(LOG_ERR,
-+			  "this remote configuration cannot be used "
-+			  "to transmit");
-+		return 0;
-+	}
-+	return 1;
- }
--- a/lirc-0.8.4-standardize-remote-keycodes.patch
+++ b/lirc-0.8.4-standardize-remote-keycodes.patch
@ -1,6 +1,6 @@
-diff -upr lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.3/remotes/adaptec/lircd.conf.AVC-2410
--- lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 10:25:36.000000000 +0100
-+++ lirc-0.8.3/remotes/adaptec/lircd.conf.AVC-2410	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410
+--- lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
+++ lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410	2008-09-24 17:06:37.000000000 -0400
@@ -29,30 +29,30 @@ begin remote
           Live                     0x00000000000025DA
           Timeshift                0x00000000000017E8
@ -55,9 +55,9 @@ diff -upr lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.3/remotes
           OSD                      0x00000000000032CD
           cc                       0x00000000000016E9
       end codes
-diff -upr lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.3/remotes/adstech/lircd.conf.usbx-707
--- lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/adstech/lircd.conf.usbx-707	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:05:54.000000000 -0400
+++ lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:06:37.000000000 -0400
@@ -26,50 +26,50 @@ begin remote
   toggle_bit_mask 0x0
 
@ -147,9 +147,9 @@ diff -upr lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.3/remotes
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/animax/lircd.conf.animax lirc-0.8.3/remotes/animax/lircd.conf.animax
--- lirc-0.8.3.orig/remotes/animax/lircd.conf.animax	1999-04-29 22:30:59.000000000 +0100
-+++ lirc-0.8.3/remotes/animax/lircd.conf.animax	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.4pre1/remotes/animax/lircd.conf.animax
+--- lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
+++ lirc-0.8.4pre1/remotes/animax/lircd.conf.animax	2008-09-24 17:06:37.000000000 -0400
@@ -38,79 +38,79 @@ begin remote
 
       begin codes
@ -263,31 +263,31 @@ diff -upr lirc-0.8.3.orig/remotes/animax/lircd.conf.animax lirc-0.8.3/remotes/an
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/apple/lircd.conf.macmini lirc-0.8.3/remotes/apple/lircd.conf.macmini
--- lirc-0.8.3.orig/remotes/apple/lircd.conf.macmini	2007-12-13 12:30:38.000000000 +0000
-+++ lirc-0.8.3/remotes/apple/lircd.conf.macmini	2008-08-12 16:14:39.000000000 +0100
-@@ -23,12 +23,12 @@ begin remote
-   gap          211995
+diff -Naurp lirc-0.8.4pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4pre1/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.4pre1.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
+++ lirc-0.8.4pre1/remotes/apple/lircd.conf.macmini	2008-09-24 17:10:31.000000000 -0400
+@@ -26,12 +26,12 @@ begin remote
+   ignore_mask 0x0000ff01
 
       begin codes
-          1                        0x09
-          2                        0x06
-          3                        0x0A
-          4                        0x0C
-          5                        0x05
-          6                        0x03
-+          KEY_1                        0x09
-+          KEY_2                        0x06
-+          KEY_3                        0x0A
-+          KEY_4                        0x0C
-+          KEY_5                        0x05
-+          KEY_6                        0x03
+-          VOLUP                    0x0B
+-          VOLDOWN                  0x0D
+-          BACKWARD                 0x08
+-          FORWARD                  0x07
+-          PLAY                     0x04
+-          MENU                     0x02
+          KEY_VOLUMEUP		0x0B
+          KEY_VOLUMEDOWN	0x0D
+          KEY_REWIND		0x08
+          KEY_FORWARD		0x07
+          KEY_PLAY		0x04
+          KEY_MENU		0x02
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asus lirc-0.8.3/remotes/asus/lircd.conf.asus
--- lirc-0.8.3.orig/remotes/asus/lircd.conf.asus	2007-02-20 04:09:47.000000000 +0000
-+++ lirc-0.8.3/remotes/asus/lircd.conf.asus	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.4pre1/remotes/asus/lircd.conf.asus
+--- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
+++ lirc-0.8.4pre1/remotes/asus/lircd.conf.asus	2008-09-24 17:06:37.000000000 -0400
@@ -19,38 +19,38 @@ begin remote
   toggle_bit	0
 
@ -355,9 +355,9 @@ diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asus lirc-0.8.3/remotes/asus/l
         end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.3/remotes/asus/lircd.conf.asusdh
--- lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 15:01:27.000000000 +0100
-+++ lirc-0.8.3/remotes/asus/lircd.conf.asusdh	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4pre1/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
+++ lirc-0.8.4pre1/remotes/asus/lircd.conf.asusdh	2008-09-24 17:06:37.000000000 -0400
@@ -14,17 +14,17 @@ begin remote
   post_data_bits  0
 
@ -382,9 +382,9 @@ diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.3/remotes/asus
         end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.3/remotes/asus/lircd.conf.digimatrix
--- lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 18:12:17.000000000 +0100
-+++ lirc-0.8.3/remotes/asus/lircd.conf.digimatrix	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.4pre1/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
+++ lirc-0.8.4pre1/remotes/asus/lircd.conf.digimatrix	2008-09-24 17:06:37.000000000 -0400
@@ -28,43 +28,43 @@ begin remote
 
 
@ -461,9 +461,9 @@ diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.3/remotes/
           dvd_audio                0x00000000000050AF
           ui_size                  0x0000000000008877
           ui_on_off                0x00000000000028D7
-diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.3/remotes/atiusb/lircd.conf.atilibusb
--- lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb	2007-09-14 20:45:18.000000000 +0100
-+++ lirc-0.8.3/remotes/atiusb/lircd.conf.atilibusb	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb	2008-06-17 02:47:55.000000000 -0400
+++ lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atilibusb	2008-09-24 17:06:37.000000000 -0400
@@ -30,58 +30,58 @@ begin remote
 
 
@ -564,9 +564,9 @@ diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.3/remotes
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.3/remotes/atiusb/lircd.conf.atiusb
--- lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/atiusb/lircd.conf.atiusb	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atiusb	2008-09-24 17:05:54.000000000 -0400
+++ lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atiusb	2008-09-24 17:06:37.000000000 -0400
@@ -37,54 +37,54 @@ begin remote
 
 
@ -664,9 +664,9 @@ diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.3/remotes/at
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia
--- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 07:54:25.000000000 +0000
-+++ lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
+++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia	2008-09-24 17:06:37.000000000 -0400
@@ -34,37 +34,37 @@ begin remote
 
 
@ -729,9 +729,9 @@ diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.3/remo
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia98
--- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 22:08:00.000000000 +0000
-+++ lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia98	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
+++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia98	2008-09-24 17:06:37.000000000 -0400
@@ -29,49 +29,49 @@ begin remote
 
       begin codes
@ -811,9 +811,9 @@ diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.3/re
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.3/remotes/avermedia/lircd.conf.vdomate
--- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 21:42:55.000000000 +0100
-+++ lirc-0.8.3/remotes/avermedia/lircd.conf.vdomate	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.4pre1/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
+++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.vdomate	2008-09-24 17:06:37.000000000 -0400
@@ -27,33 +27,33 @@ begin remote
 
 
@ -866,9 +866,9 @@ diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.3/remote
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy
--- lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 21:07:50.000000000 +0100
-+++ lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
+++ lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy	2008-09-24 17:06:37.000000000 -0400
@@ -26,36 +26,36 @@ begin remote
 
 
@ -931,9 +931,9 @@ diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.3/remotes/
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy2
--- lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 21:10:15.000000000 +0100
-+++ lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy2	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
+++ lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy2	2008-09-24 17:06:37.000000000 -0400
@@ -27,29 +27,29 @@ begin remote
       begin codes
           TV/FM                    0x0000000000000043
@ -983,9 +983,9 @@ diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.3/remotes
           RESET                    0x000000000000004D
           FREEZE                   0x000000000000004F
       end codes
-diff -upr lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.3/remotes/caraca/lircd.conf.caraca
--- lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 20:21:17.000000000 +0100
-+++ lirc-0.8.3/remotes/caraca/lircd.conf.caraca	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.4pre1/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.4pre1.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
+++ lirc-0.8.4pre1/remotes/caraca/lircd.conf.caraca	2008-09-24 17:06:37.000000000 -0400
@@ -17,29 +17,29 @@ begin remote
   bits           16
 
@ -1037,9 +1037,9 @@ diff -upr lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.3/remotes/ca
           TV/FM                    0x3fe3
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.3/remotes/chronos/lircd.conf.chronos
--- lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/chronos/lircd.conf.chronos	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.4pre1/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.4pre1.orig/remotes/chronos/lircd.conf.chronos	2008-09-24 17:05:54.000000000 -0400
+++ lirc-0.8.4pre1/remotes/chronos/lircd.conf.chronos	2008-09-24 17:06:37.000000000 -0400
@@ -20,37 +20,37 @@ begin remote
   toggle_bit      0
 
@ -1103,9 +1103,9 @@ diff -upr lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.3/remotes/
 +          KEY_RIGHT         0x0000000000000007
       end codes
 end remote
-diff -upr lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.3/remotes/cph03x/lircd.conf.cph03x
--- lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 16:49:16.000000000 +0100
-+++ lirc-0.8.3/remotes/cph03x/lircd.conf.cph03x	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.4pre1/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.4pre1.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
+++ lirc-0.8.4pre1/remotes/cph03x/lircd.conf.cph03x	2008-09-24 17:06:37.000000000 -0400
@@ -32,39 +32,39 @@ begin remote
   repeat_bit      0
 
@ -1169,9 +1169,9 @@ diff -upr lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.3/remotes/cp
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.3/remotes/creative/lircd.conf.alsa_usb
--- lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 09:01:16.000000000 +0000
-+++ lirc-0.8.3/remotes/creative/lircd.conf.alsa_usb	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.4pre1/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.alsa_usb	2008-09-24 17:06:37.000000000 -0400
@@ -34,38 +34,38 @@ begin remote
 
 
@ -1238,9 +1238,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.3/remote
           Step                     0x0000000000007E81
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.3/remotes/creative/lircd.conf.breakoutbox
--- lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-20 04:08:04.000000000 +0000
-+++ lirc-0.8.3/remotes/creative/lircd.conf.breakoutbox	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.4pre1/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.breakoutbox	2008-09-24 17:06:37.000000000 -0400
@@ -19,37 +19,37 @@ begin remote
       begin codes
           DVD/CD                   0x0000000000000001
@ -1305,9 +1305,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.3/rem
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.creative lirc-0.8.3/remotes/creative/lircd.conf.creative
--- lirc-0.8.3.orig/remotes/creative/lircd.conf.creative	2007-03-10 20:15:49.000000000 +0000
-+++ lirc-0.8.3/remotes/creative/lircd.conf.creative	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.4pre1/remotes/creative/lircd.conf.creative
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.creative	2008-09-24 17:06:37.000000000 -0400
@@ -23,30 +23,30 @@ begin remote
   toggle_bit      0
 
@ -1358,9 +1358,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.creative lirc-0.8.3/remote
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd lirc-0.8.3/remotes/creative/lircd.conf.infracd
--- lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd	2003-05-07 18:30:41.000000000 +0100
-+++ lirc-0.8.3/remotes/creative/lircd.conf.infracd	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.infracd lirc-0.8.4pre1/remotes/creative/lircd.conf.infracd
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.infracd	2003-05-07 13:30:41.000000000 -0400
+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.infracd	2008-09-24 17:06:37.000000000 -0400
@@ -30,30 +30,30 @@ begin remote
 
 
@ -1414,9 +1414,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd lirc-0.8.3/remotes
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.3/remotes/creative/lircd.conf.livedrive
--- lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/creative/lircd.conf.livedrive	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.4pre1/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.livedrive	2008-09-24 17:05:54.000000000 -0400
+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.livedrive	2008-09-24 17:06:37.000000000 -0400
@@ -29,40 +29,40 @@ begin remote
 
 
@ -1486,9 +1486,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.3/remot
 	  
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.3/remotes/dvico/lircd.conf.fusionHDTV
--- lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 05:38:39.000000000 +0100
-+++ lirc-0.8.3/remotes/dvico/lircd.conf.fusionHDTV	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4pre1/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.4pre1.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
+++ lirc-0.8.4pre1/remotes/dvico/lircd.conf.fusionHDTV	2008-09-24 17:06:37.000000000 -0400
@@ -22,42 +22,42 @@ begin remote
   toggle_bit     0
 
@ -1563,9 +1563,9 @@ diff -upr lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.3/remotes
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.3/remotes/ea65/lircd.conf.ea65
--- lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 13:43:48.000000000 +0000
-+++ lirc-0.8.3/remotes/ea65/lircd.conf.ea65	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.4pre1/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.4pre1.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
+++ lirc-0.8.4pre1/remotes/ea65/lircd.conf.ea65	2008-09-24 17:06:37.000000000 -0400
@@ -18,53 +18,53 @@ begin remote
         htpc        0x0011811b
         dvd/vcd     0x00128100
@ -1654,9 +1654,9 @@ diff -upr lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.3/remotes/ea65/l
         stop-eject  0x00238107
         mode-       0x00ff1080
         mode+       0x00ff1180
-diff -upr lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.3/remotes/ericsson/lircd.conf.bte
--- lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 20:40:25.000000000 +0000
-+++ lirc-0.8.3/remotes/ericsson/lircd.conf.bte	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4pre1/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.4pre1.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
+++ lirc-0.8.4pre1/remotes/ericsson/lircd.conf.bte	2008-09-24 17:06:37.000000000 -0400
@@ -15,38 +15,38 @@ begin remote
     bits    16
 
@ -1719,9 +1719,9 @@ diff -upr lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.3/remotes/eri
         WAP             0x3a4f  # ':O'
 
       end codes
-diff -upr lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.3/remotes/hauppauge/lircd.conf.hauppauge
--- lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge	2005-10-05 21:28:15.000000000 +0100
-+++ lirc-0.8.3/remotes/hauppauge/lircd.conf.hauppauge	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4pre1/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.4pre1.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
+++ lirc-0.8.4pre1/remotes/hauppauge/lircd.conf.hauppauge	2008-09-24 17:06:37.000000000 -0400
@@ -27,25 +27,25 @@ begin remote
   repeat_bit      2
 
@ -1765,9 +1765,9 @@ diff -upr lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.3/remo
           RESERVED                 0x000000000000101E
           MINIMIZE                 0x0000000000001026
       end codes
-diff -upr lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.3/remotes/hercules/lircd.conf.smarttv_stereo
--- lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/hercules/lircd.conf.smarttv_stereo	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.4pre1/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.4pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo	2008-09-24 17:05:54.000000000 -0400
+++ lirc-0.8.4pre1/remotes/hercules/lircd.conf.smarttv_stereo	2008-09-24 17:06:37.000000000 -0400
@@ -26,36 +26,36 @@ begin remote
 
 
@ -1828,9 +1828,9 @@ diff -upr lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.3/
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon lirc-0.8.3/remotes/imon/lircd.conf.imon
--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon	2005-04-16 18:05:49.000000000 +0100
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.4pre1/remotes/imon/lircd.conf.imon
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon	2008-09-24 17:06:37.000000000 -0400
@@ -29,48 +29,48 @@ begin remote
   duty_cycle   33
 
@ -1916,144 +1916,10 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon lirc-0.8.3/remotes/imon/l
           DVD.Caption              0x00000000000052AD
           DVD.Language             0x000000000000D22D
           Full.Screen              0x00000000000032CD
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-2.4g lirc-0.8.3/remotes/imon/lircd.conf.imon-2.4g
--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-2.4g	2007-03-18 10:23:34.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-2.4g	2008-08-12 16:14:39.000000000 +0100
-@@ -20,69 +20,69 @@ begin remote
- 
- 
-       begin codes
-          Power                    0xBB4403FC
-+          KEY_POWER                    0xBB4403FC
- 
-          RAppExit                 0xBB4431CE
-          REject                   0xBB4432CD
-          RAppLauncher             0xBB4437C8
-          RTaskSwitcher            0xBB4439C6
-          RBack                    0xBB443DC2
-          RSelect                  0xBB443FC0
-          RChannelUp               0xBB443EC1
-          RChannelDown             0xBB4443BC
-          RVolumeUp                0xBB4445BA
-          RVolumeDown              0xBB4444BB
-          RNext                    0xBB444CB3
-          RPrev                    0xBB444DB2
-          RFf                      0xBB444FB0
-          RRew                     0xBB444EB1
-          RI                       0xBB4450AF
-          RMute                    0xBB4449B6
-          RTv                      0xBB444AB5
-          RMenu                    0xBB444BB4
-          R1                       0xBB4434CB
-          R2                       0xBB4435CA
-          R3                       0xBB4436C9
-          R4                       0xBB443AC5
-          R5                       0xBB443BC4
-          R6                       0xBB443CC3
-          R7                       0xBB4440BF
-          R8                       0xBB4441BE
-          R9                       0xBB4442BD
-          RSkipBack                0xBB4446B9
-          R0                       0xBB4447B8
-          RSkipFwd                 0xBB4448B7
-+                           0xBB4431CE
-+                             0xBB4432CD
-+                       0xBB4437C8
-+                      0xBB4439C6
-+                              0xBB443DC2
-+                            0xBB443FC0
-+                         0xBB443EC1
-+                       0xBB4443BC
-+                          0xBB4445BA
-+                        0xBB4444BB
-+                              0xBB444CB3
-+                              0xBB444DB2
-+                                0xBB444FB0
-+                               0xBB444EB1
-+                                 0xBB4450AF
-+                              0xBB4449B6
-+                                0xBB444AB5
-+                              0xBB444BB4
-+                                 0xBB4434CB
-+                                 0xBB4435CA
-+                                 0xBB4436C9
-+                                 0xBB443AC5
-+                                 0xBB443BC4
-+                                 0xBB443CC3
-+                                 0xBB4440BF
-+                                 0xBB4441BE
-+                                 0xBB4442BD
-+                          0xBB4446B9
-+                                 0xBB4447B8
-+                           0xBB4448B7
- 
-          GAppExit                 0xBB4401FE
-          GEject                   0xBB4402FD
-          GAppLauncher             0xBB4407F8
-          GTaskSwitcher            0xBB4409F6
-          GBack                    0xBB440DF2
-          GSelect                  0xBB440FF0
-          GChannelUp               0xBB440EF1
-          GChannelDown             0xBB4413EC
-          GVolumeUp                0xBB4415EA
-          GVolumeDown              0xBB4414EB
-          GNext                    0xBB441CE3
-          GPrev                    0xBB441DE2
-          GFf                      0xBB441FE0
-          GRew                     0xBB441EE1
-          GI                       0xBB4420DF
-          GMute                    0xBB4419E6
-          GTv                      0xBB441AE5
-          GMenu                    0xBB441BE4
-          G1                       0xBB4404FB
-          G2                       0xBB4405FA
-          G3                       0xBB4406F9
-          G4                       0xBB440AF5
-          G5                       0xBB440BF4
-          G6                       0xBB440CF3
-          G7                       0xBB4410EF
-          G8                       0xBB4411EE
-          G9                       0xBB4412ED
-          GSkipBack                0xBB4416E9
-          G0                       0xBB4417E8
-          GSkipFwd                 0xBB4418E7
-+                           0xBB4401FE
-+                             0xBB4402FD
-+                       0xBB4407F8
-+                      0xBB4409F6
-+                              0xBB440DF2
-+                            0xBB440FF0
-+                         0xBB440EF1
-+                       0xBB4413EC
-+                          0xBB4415EA
-+                        0xBB4414EB
-+                              0xBB441CE3
-+                              0xBB441DE2
-+                                0xBB441FE0
-+                               0xBB441EE1
-+                                 0xBB4420DF
-+                              0xBB4419E6
-+                                0xBB441AE5
-+                              0xBB441BE4
-+                                 0xBB4404FB
-+                                 0xBB4405FA
-+                                 0xBB4406F9
-+                                 0xBB440AF5
-+                                 0xBB440BF4
-+                                 0xBB440CF3
-+                                 0xBB4410EF
-+                                 0xBB4411EE
-+                                 0xBB4412ED
-+                          0xBB4416E9
-+                                 0xBB4417E8
-+                           0xBB4418E7
-       end codes
- 
- end remote
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/imon/lircd.conf.imon-knob
--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob	2006-12-29 13:03:50.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-knob	2008-08-12 16:14:39.000000000 +0100
-@@ -23,67 +23,67 @@ begin remote
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-knob	2008-09-24 17:41:09.000000000 -0400
+@@ -23,74 +23,67 @@ begin remote
 
 
       begin codes
@ -2070,7 +1936,7 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/i
 -          FastForward              0x2B8115B7
 -          PrevChapter              0x2B9115B7
 -          Stop                     0x2B9715B7
-          NextChapter              0x298195BF
+-          NextChapter              0x298195B7
 +          KEY_EXIT                 0x288195B7
 +          KEY_POWER                0x289115B7
 +          KEY_RECORD               0x298115B7
@ -2084,12 +1950,13 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/i
 +          KEY_FASTFORWARD          0x2B8115B7
 +          KEY_PREVIOUS             0x2B9115B7
 +          KEY_STOP                 0x2B9715B7
-+          KEY_NEXT              0x298195BF
+          KEY_NEXT                 0x298195B7
           WindowsKey               0x2B8195B7
 -          Backspace                0x28A115B7
 +          KEY_BACKSPACE            0x28A115B7
           MouseKeyboard            0x299115B7
-           SelectSpace              0x2A9315B7
+-          SelectSpace              0x2A9315B7
+          KEY_SELECT               0x2A9315B7
           MouseMenu                0x28B715B7
 -          MouseRightClick          0x688481B7
 -          Enter                    0x28A195B7
@ -2142,35 +2009,43 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/i
 +          KEY_8                    0x2A8515B7
 +          KEY_9                    0x2AA115B7
           ShiftTab                 0x28B515B7
-          0                        0x2BA595BF
+-          0                        0x2BA595B7
 -          Tab                      0x29A115B7
 -          MyMovie                  0x2B8515B7
 -          MyMusic                  0x299195B7
-+          KEY_0                        0x2BA595BF
+-          MyPhoto                  0x2BA115B7
+-          MyTV                     0x28A515B7
+-          Bookmark                 0x288515B7
+          KEY_0                    0x2BA595B7
 +          KEY_TAB                  0x29A115B7
 +          KEY_VIDEO                0x2B8515B7
 +          KEY_AUDIO                0x299195B7
-           MyPhoto                  0x2BA115B7
-          MyTV                     0x28A515B7
-          Bookmark                 0x288515B7
+          KEY_PHOTO                0x2BA115B7
 +          KEY_TV                   0x28A515B7
 +          KEY_BOOKMARKS            0x288515B7
-           Thumbnail                0x2AB715BF
+           Thumbnail                0x2AB715B7
           AspectRatio              0x29A595B7
-           FullScreen               0x2AA395BF
+           FullScreen               0x2AA395B7
 -          MyDVD                    0x29A295B7
 -          Menu                     0x2BA385B7
 +          KEY_DVD                  0x29A295B7
 +          KEY_MENU                 0x2BA385B7
           Caption                  0x298595B7
 -          Language                 0x2B8595B7
+-# these codes may be wrong, but they were included in the first version of
+-# this config file
+-          0                        0x2BA595BF
+-          NextChapter              0x298195BF
+-          Thumbnail                0x2AB715BF
+-          FullScreen               0x2AA395BF
+-
 +          KEY_LANGUAGE             0x2B8595B7
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.3/remotes/imon/lircd.conf.imon-pad
--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad	2006-11-28 03:18:23.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-pad	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad	2006-11-27 22:18:23.000000000 -0500
+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-pad	2008-09-24 17:06:37.000000000 -0400
@@ -24,65 +24,65 @@ begin remote
 
 
@ -2280,9 +2155,9 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.3/remotes/im
 
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.3/remotes/imon/lircd.conf.imon-rsc
--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 08:36:27.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-rsc	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-rsc	2008-09-24 17:06:37.000000000 -0400
@@ -27,48 +27,48 @@ begin remote
   gap          100000
 
@ -2364,9 +2239,9 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.3/remotes/im
           Full.Screen        0x000000000000916e
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.3/remotes/iodata/lircd.conf.gvbctv5pci
--- lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 23:00:12.000000000 +0100
-+++ lirc-0.8.3/remotes/iodata/lircd.conf.gvbctv5pci	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.4pre1/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.4pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
+++ lirc-0.8.4pre1/remotes/iodata/lircd.conf.gvbctv5pci	2008-09-24 17:06:37.000000000 -0400
@@ -26,41 +26,41 @@ begin remote
 
 
@ -2436,9 +2311,9 @@ diff -upr lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.3/remote
           SYNC                     0x0000000000000003
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.3/remotes/kanam_accent/lircd.conf.IR-100
--- lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-13 04:18:53.000000000 +0000
-+++ lirc-0.8.3/remotes/kanam_accent/lircd.conf.IR-100	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4pre1/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
+++ lirc-0.8.4pre1/remotes/kanam_accent/lircd.conf.IR-100	2008-09-24 17:06:37.000000000 -0400
@@ -29,47 +29,47 @@ begin remote
 
 
@ -2523,9 +2398,9 @@ diff -upr lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.3/remo
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.3/remotes/knc_one/lircd.conf.knc_one
--- lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 22:20:41.000000000 +0100
-+++ lirc-0.8.3/remotes/knc_one/lircd.conf.knc_one	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.4pre1/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.4pre1.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
+++ lirc-0.8.4pre1/remotes/knc_one/lircd.conf.knc_one	2008-09-24 17:06:37.000000000 -0400
@@ -26,37 +26,37 @@ begin remote
 
       begin codes
@ -2590,9 +2465,9 @@ diff -upr lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.3/remotes/
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.3/remotes/kworld/lircd.conf.kworld
--- lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 21:28:05.000000000 +0100
-+++ lirc-0.8.3/remotes/kworld/lircd.conf.kworld	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.4pre1/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.4pre1.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
+++ lirc-0.8.4pre1/remotes/kworld/lircd.conf.kworld	2008-09-24 17:06:37.000000000 -0400
@@ -29,36 +29,36 @@ begin remote
 
 
@ -2651,9 +2526,9 @@ diff -upr lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.3/remotes/kw
           snapshot                 0x00000000000058A7
           mts                      0x000000000000B04F
           function-                0x00000000000020DF
-diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.3/remotes/leadtek/lircd.conf.PVR2000
--- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 06:02:58.000000000 +0000
-+++ lirc-0.8.3/remotes/leadtek/lircd.conf.PVR2000	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
+++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.PVR2000	2008-09-24 17:06:37.000000000 -0400
@@ -18,54 +18,54 @@ begin remote
   gap       120000
 
@ -2746,9 +2621,9 @@ diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.3/remotes/
           TIMESHIFT                0x0000000000000035
 
       end codes
-diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0007
--- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 22:34:23.000000000 +0000
-+++ lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0007	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
+++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0007	2008-09-24 17:06:37.000000000 -0400
@@ -44,43 +44,43 @@ begin remote
 
       begin codes
@ -2818,9 +2693,9 @@ diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.3/remotes/
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0010
--- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 07:11:14.000000000 +0000
-+++ lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0010	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
+++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0010	2008-09-24 17:06:37.000000000 -0400
@@ -43,69 +43,69 @@ begin remote
   duty_cycle   33
 
@ -2930,9 +2805,9 @@ diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.3/remotes/
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.3/remotes/life-view/lircd.conf.flyvideo
--- lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 22:31:38.000000000 +0000
-+++ lirc-0.8.3/remotes/life-view/lircd.conf.flyvideo	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.4pre1/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.4pre1.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
+++ lirc-0.8.4pre1/remotes/life-view/lircd.conf.flyvideo	2008-09-24 17:06:37.000000000 -0400
@@ -35,50 +35,50 @@ begin remote
   duty_cycle   33
 
@ -3013,9 +2888,9 @@ diff -upr lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.3/remot
  
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.3/remotes/logitech/lircd.conf.logitech
--- lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 19:10:08.000000000 +0000
-+++ lirc-0.8.3/remotes/logitech/lircd.conf.logitech	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.4pre1/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.4pre1.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
+++ lirc-0.8.4pre1/remotes/logitech/lircd.conf.logitech	2008-09-24 17:06:37.000000000 -0400
@@ -23,41 +23,41 @@ begin remote
   repeat_bit      0
 
@ -3085,9 +2960,9 @@ diff -upr lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.3/remote
           MOUSE_N		   0x0000000000000040
           MOUSE_NNE		   0x0000000000000041
           MOUSE_NE		   0x0000000000000042
-diff -upr lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.3/remotes/mceusb/lircd.conf.mceusb
--- lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 13:08:33.000000000 +0000
-+++ lirc-0.8.3/remotes/mceusb/lircd.conf.mceusb	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 09:08:33.000000000 -0400
+++ lirc-0.8.4pre1/remotes/mceusb/lircd.conf.mceusb	2008-09-24 17:06:37.000000000 -0400
@@ -58,10 +58,10 @@ begin remote
       begin codes
 
@ -3232,9 +3107,9 @@ diff -upr lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.3/remotes/mc
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.3/remotes/packard_bell/lircd.conf.packard_bell
--- lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 20:26:56.000000000 +0100
-+++ lirc-0.8.3/remotes/packard_bell/lircd.conf.packard_bell	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.4pre1/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.4pre1.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
+++ lirc-0.8.4pre1/remotes/packard_bell/lircd.conf.packard_bell	2008-09-24 17:06:37.000000000 -0400
@@ -53,38 +53,38 @@ begin remote
   repeat          9050 2250
  
@ -3299,9 +3174,9 @@ diff -upr lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.
           Star                     0x0000000000007F80
           Hash                     0x0000000000006B94
       end codes
-diff -upr lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.3/remotes/pcmak/lircd.conf.pcmak
--- lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 16:36:15.000000000 +0100
-+++ lirc-0.8.3/remotes/pcmak/lircd.conf.pcmak	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.4pre1/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.4pre1.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
+++ lirc-0.8.4pre1/remotes/pcmak/lircd.conf.pcmak	2008-09-24 17:06:37.000000000 -0400
@@ -23,18 +23,18 @@ begin remote
   repeat_bit      0
 
@ -3445,9 +3320,9 @@ diff -upr lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.3/remotes/pcma
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.3/remotes/pinnacle_systems/lircd.conf.pctv
--- lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 16:40:53.000000000 +0100
-+++ lirc-0.8.3/remotes/pinnacle_systems/lircd.conf.pctv	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.4pre1/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.4pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
+++ lirc-0.8.4pre1/remotes/pinnacle_systems/lircd.conf.pctv	2008-09-24 17:06:37.000000000 -0400
@@ -24,30 +24,30 @@ begin remote
   toggle_bit         0
 
@ -3547,9 +3422,9 @@ diff -upr lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.3/re
           middle                   0x0000000000000014
 
 
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.3/remotes/pixelview/lircd.conf.playtv
--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 20:18:27.000000000 +0100
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv	2008-09-24 17:06:37.000000000 -0400
@@ -13,22 +13,22 @@ begin remote
   begin codes
     TV/FM                    0x00000000000000e7
@ -3588,9 +3463,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.3/remotes
   end codes
 end remote
 
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_bt878
--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 20:32:40.000000000 +0100
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_bt878	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_bt878	2008-09-24 17:06:37.000000000 -0400
@@ -16,39 +16,39 @@ begin remote
   repeat_bit 0
 
@ -3657,9 +3532,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.3/r
   end codes
 end remote
 
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_pro
--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 13:09:13.000000000 +0000
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_pro	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_pro	2008-09-24 17:06:37.000000000 -0400
@@ -31,15 +31,15 @@ begin remote
 
       begin codes
@ -3710,9 +3585,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.3/rem
 
       end codes
 
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.3/remotes/pixelview/lircd.conf.remotemaster
--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 11:03:20.000000000 +0000
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.remotemaster	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.4pre1/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.remotemaster	2008-09-24 17:06:37.000000000 -0400
@@ -25,39 +25,39 @@ begin remote
   gap          189264
 
@ -3780,9 +3655,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.3/r
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.3/remotes/provideo/lircd.conf.pv951
--- lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 13:32:00.000000000 +0000
-+++ lirc-0.8.3/remotes/provideo/lircd.conf.pv951	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.4pre1/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.4pre1.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
+++ lirc-0.8.4pre1/remotes/provideo/lircd.conf.pv951	2008-09-24 17:06:37.000000000 -0400
@@ -31,28 +31,28 @@ begin remote
   repeat_bit      0
 
@ -3828,9 +3703,9 @@ diff -upr lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.3/remotes/p
           func                     0x0000000000009867
           ttx                      0x000000000000B04F
           pg+                      0x000000000000708F
-diff -upr lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.3/remotes/remotec/lircd.conf.BW6130
--- lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 15:29:27.000000000 +0100
-+++ lirc-0.8.3/remotes/remotec/lircd.conf.BW6130	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.4pre1/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.4pre1.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
+++ lirc-0.8.4pre1/remotes/remotec/lircd.conf.BW6130	2008-09-24 17:06:37.000000000 -0400
@@ -20,20 +20,20 @@ begin remote
   toggle_bit     0
 
@ -3866,9 +3741,9 @@ diff -upr lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.3/remotes/r
 	MOUSE_SLOW_N		0x95
 	MOUSE_SLOW_NNE		0xd1
 	MOUSE_SLOW_NE		0xcd
-diff -upr lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.3/remotes/samsung/lircd.conf.samsung
--- lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung	2008-03-02 19:18:40.000000000 +0000
-+++ lirc-0.8.3/remotes/samsung/lircd.conf.samsung	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4pre1/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung	2008-03-02 14:18:40.000000000 -0500
+++ lirc-0.8.4pre1/remotes/samsung/lircd.conf.samsung	2008-09-24 17:06:37.000000000 -0400
@@ -28,60 +28,60 @@ begin remote
 
       begin codes
@ -3974,9 +3849,9 @@ diff -upr lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.3/remotes/
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.3/remotes/sasem/lircd.conf.sasem
--- lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 12:24:55.000000000 +0100
-+++ lirc-0.8.3/remotes/sasem/lircd.conf.sasem	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.4pre1/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.4pre1.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
+++ lirc-0.8.4pre1/remotes/sasem/lircd.conf.sasem	2008-09-24 17:06:37.000000000 -0400
@@ -33,47 +33,47 @@ begin remote
 
 
@ -4057,9 +3932,9 @@ diff -upr lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.3/remotes/sase
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.3/remotes/sigma_designs/lircd.conf.realmagic
--- lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 12:01:50.000000000 +0100
-+++ lirc-0.8.3/remotes/sigma_designs/lircd.conf.realmagic	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.4pre1/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.4pre1.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
+++ lirc-0.8.4pre1/remotes/sigma_designs/lircd.conf.realmagic	2008-09-24 17:06:37.000000000 -0400
@@ -30,43 +30,43 @@ begin remote
 
       begin codes
@ -4136,9 +4011,9 @@ diff -upr lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.3/
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.3/remotes/silitek/lircd.conf.silitek
--- lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 20:36:10.000000000 +0100
-+++ lirc-0.8.3/remotes/silitek/lircd.conf.silitek	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.4pre1/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.4pre1.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
+++ lirc-0.8.4pre1/remotes/silitek/lircd.conf.silitek	2008-09-24 17:06:37.000000000 -0400
@@ -30,68 +30,68 @@ begin remote
     MOUSE_SSE                0x0000000000aa0004
     MOUSE_SE                 0x0000000000aa0003
@ -4256,9 +4131,9 @@ diff -upr lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.3/remotes/
 +    KEY_CLOSE                 0x0000000000cc5d62
   end codes
 end remote
-diff -upr lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.3/remotes/streamzap/lircd.conf.streamzap
--- lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 14:20:23.000000000 +0000
-+++ lirc-0.8.3/remotes/streamzap/lircd.conf.streamzap	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
+++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-09-24 17:06:37.000000000 -0400
@@ -27,41 +27,41 @@ begin remote
 
 
@ -4334,9 +4209,9 @@ diff -upr lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.3/remo
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.3/remotes/technisat/lircd.conf.mediafocusI
--- lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 13:38:09.000000000 +0000
-+++ lirc-0.8.3/remotes/technisat/lircd.conf.mediafocusI	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.4pre1/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.4pre1.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
+++ lirc-0.8.4pre1/remotes/technisat/lircd.conf.mediafocusI	2008-09-24 17:06:37.000000000 -0400
@@ -30,11 +30,11 @@ begin remote
   duty_cycle   33
 
@ -4354,9 +4229,9 @@ diff -upr lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.3/re
       end codes
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.3/remotes/tekram/lircd.conf.m230
--- lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230	2002-03-28 21:26:54.000000000 +0000
-+++ lirc-0.8.3/remotes/tekram/lircd.conf.m230	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.4pre1/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.4pre1.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
+++ lirc-0.8.4pre1/remotes/tekram/lircd.conf.m230	2008-09-24 17:06:37.000000000 -0400
@@ -13,36 +13,36 @@ begin remote
   name  M230
   bits  8
@ -4417,9 +4292,9 @@ diff -upr lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.3/remotes/tekr
 +	KEY_KPMINUS		0x0C
      end codes
 end remote
-diff -upr lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.3/remotes/vlsystem/lircd.conf.mplay
--- lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 12:33:17.000000000 +0000
-+++ lirc-0.8.3/remotes/vlsystem/lircd.conf.mplay	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4pre1/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
+++ lirc-0.8.4pre1/remotes/vlsystem/lircd.conf.mplay	2008-09-24 17:06:37.000000000 -0400
@@ -27,42 +27,42 @@ begin remote
           Movies                   0x40
           Television               0x46
@ -4492,9 +4367,9 @@ diff -upr lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.3/remotes/v
           DVD_Zoom                 0x14
           Detail                   0x4b
       end codes
-diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.3/remotes/x10/lircd.conf.mouseremote
--- lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 10:40:43.000000000 +0000
-+++ lirc-0.8.3/remotes/x10/lircd.conf.mouseremote	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote	2008-09-24 17:06:37.000000000 -0400
@@ -24,42 +24,42 @@ begin remote
   gap		140000
 
@ -4577,9 +4452,9 @@ diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.3/remotes/
 	end codes	
 
 end remote
-diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.3/remotes/x10/lircd.conf.mp3anywhere
--- lirc-0.8.3.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 08:09:11.000000000 +0100
-+++ lirc-0.8.3/remotes/x10/lircd.conf.mp3anywhere	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere	2008-09-24 17:06:37.000000000 -0400
@@ -22,43 +22,43 @@ begin remote
   gap		140000
 
--- a/lirc-use-new-instead-of-conf-as-filename-suffix.patch
+++ b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
@ -6,14 +6,10 @@ Subject: Use '.new' instead of '.conf' as filename suffix in template mode,
 to prevent a buffer overrun for 'argv[optind]'.

 ---
- daemons/irrecord.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/daemons/irrecord.c b/daemons/irrecord.c
-index ea298e3..df03c7b 100644
--- a/daemons/irrecord.c
-+++ b/daemons/irrecord.c
-@@ -364,7 +364,7 @@ int main(int argc,char **argv)
+diff -Naurp lirc.orig/daemons/irrecord.c lirc/daemons/irrecord.c
+--- lirc.orig/daemons/irrecord.c	2008-08-27 13:04:46.000000000 -0400
+++ lirc/daemons/irrecord.c		2008-09-24 17:01:37.000000000 -0400
+@@ -493,7 +493,7 @@ int main(int argc,char **argv)
 			exit(EXIT_FAILURE);
 		}
 		strcpy(filename_new, filename);
@ -21,8 +17,4 @@ index ea298e3..df03c7b 100644
 +		strcat(filename_new, ".new");
 		filename = filename_new;
 	}
- 	fout=fopen(filename,"w");
- 	if(fout==NULL)
-- 
-1.5.3.7
-
+ 	else
--- a/lirc.spec
+++ b/lirc.spec
@ -14,29 +14,26 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-#define pre     pre3
+%define pre     pre1

 Name:           lirc
-Version:        0.8.3
-Release:        7%{?pre:.%{pre}}%{?dist}
+Version:        0.8.4
+Release:        0.1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package

 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         lirc-0.8.3-remote-includes-directive.patch
-Patch1:         lirc-0.8.3-validate-transmit-buffer.patch
-Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
+# temporary, was accidentally left out of 0.8.4pre1 tarball
+Source3:        hw_commandir.h
+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
-Patch3:		lirc-0.8.3-fix-remote-keycodes.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=440231
-# http://thread.gmane.org/gmane.comp.hardware.lirc/6889
-Patch4:		lirc-dont-exit.patch
+Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{__perl}
@ -120,10 +117,8 @@ of remote control configuration files.

 %prep
 %setup -q -n %{name}-%{version}%{?pre}
-%patch0 -p1 -b .incl
-%patch1 -p1 -b .xbuf
-%patch2 -p1 -b .suf
-%patch4 -p0 -b .exit
+%patch0 -p1 -b .suf
+cp %{SOURCE3} daemons/

 chmod 644 contrib/*

@ -156,7 +151,7 @@ sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 touch -r aclocal.m4 configure.ac # avoid autofoo re-run

 # Do this after, as we're touching the remote definitions earlier
-%patch3 -p1 -b .keycode
+%patch1 -p1 -b .keycode

 %build
 %configure \
@ -268,6 +263,11 @@ fi


 %changelog
+* Wed Sep 24 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.1.pre1
+- Update to 0.8.4pre1
+- Drop upstream patches
+- Adds support for the CommandIR II userspace driver
+
 * Tue Sep 16 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.3-7
 - Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)

--- a/2
+++ b/2
@ -1 +1 @@
-8e78eeded7b31e5ad02e328970437c0f  lirc-0.8.3.tar.bz2
+b79601ea90fa552653dfc69e29fd5c4d  lirc-0.8.4pre1.tar.bz2