From bdee4067516bb6bfcb05ae2984cb77a360f6ab78 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 8 Jun 2011 00:55:34 +0200
Subject: [PATCH] xbmc-pvr: syncing with last merge

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 ...xbmc-pvr-615e173-463-add_remote_devinput-0.1.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-615e173-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-615e173-463-add_remote_devinput-0.1.patch
index 5c42a38424..6fba762884 100644
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-615e173-463-add_remote_devinput-0.1.patch
+++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-615e173-463-add_remote_devinput-0.1.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lircmap.xml
---- xbmc-pvr-3513480/system/Lircmap.xml	2011-04-25 05:32:22.105621042 +0200
-+++ xbmc-pvr-3513480.patch/system/Lircmap.xml	2011-04-25 05:32:42.799227308 +0200
-@@ -366,7 +366,6 @@
+diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml
+--- xbmc-10.1-Dharma/system/Lircmap.xml	2011-06-07 23:02:00.297946207 +0200
++++ xbmc-10.1-Dharma.patch/system/Lircmap.xml	2011-06-07 23:02:43.716485530 +0200
+@@ -365,7 +365,6 @@
  
  	<remote device="linux-input-layer">
  	<altname>cx23885_remote</altname>
@@ -9,7 +9,7 @@ diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lir
  		<left>KEY_LEFT</left>
  		<right>KEY_RIGHT</right>
  		<up>KEY_UP</up>
-@@ -453,4 +452,57 @@
+@@ -452,4 +451,58 @@
  		<mypictures>yellow</mypictures>
  		<myvideo>blue</myvideo>
  	</remote>
@@ -38,6 +38,7 @@ diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lir
 +		<skipminus>KEY_PREVIOUS</skipminus>
 +		<title>KEY_EPG</title>
 +		<subtitle>KEY_SUBTITLE</subtitle>
++		<language>KEY_LANGUAGE</language>
 +		<info>KEY_INFO</info>
 +		<display>KEY_ZOOM</display>
 +		<mute>KEY_MUTE</mute>