Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

37 files changed, 1609 insertions, 1297 deletions

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 1775cb2..e3bf28c 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=LinHES-config
 pkgver=2.0
-pkgrel=49
+pkgrel=50
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
-depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo python-pexpect python-netifaces)
+depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo python-pexpect python-netifaces LinHES-timezone)
 arch=('i686')
 
 source=(mv_install.py mv_config.py mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh autocard.py restore_km_db_chroot.sh README  mv_advanced.py  mv_common.py   mv_ir.py  mv_misc.py  mv_network.py  mv_screensaver.py  mv_smolt.py  mv_software.py  mv_webuser.py mv_hostype.py systemconfig.py myth_user_call.py)
diff --git a/abs/core-testing/LinHES-timezone/PKGBUILD b/abs/core-testing/LinHES-timezone/PKGBUILD
index b78aec5..76a22b3 100644
--- a/abs/core-testing/LinHES-timezone/PKGBUILD
+++ b/abs/core-testing/LinHES-timezone/PKGBUILD
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 23123 2009-01-03 02:43:02Z kevin $
 # Maintainer: Greg Frost <gregfrost1@bigpond.com>
-pkgname=linhes-timezone
+pkgname=LinHES-timezone
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="GUI timezone selector used by LinHES-config."
 arch=i686
 depends=()
diff --git a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
index 350cf2f..3009bee 100644
--- a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=morethemes-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Additional themes for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mp_all.sh b/abs/core-testing/mythtv/trunk/mp_all.sh
index 45ea44e..3b0421c 100755
--- a/abs/core-testing/mythtv/trunk/mp_all.sh
+++ b/abs/core-testing/mythtv/trunk/mp_all.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-_svnver=20713
+_svnver=20787
 
 # NOTE: Make sure to build and install mythtv first BEFORE building anything else
 buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
diff --git a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
index 14230b1..3101248 100644
--- a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mytharchive-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
index 3bd4d74..f01722d 100644
--- a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythbrowser-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Mini web browser for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
index b3fa81c..f5efdc9 100644
--- a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythflix-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Netflix access plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
index 521a1e2..115bc12 100644
--- a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythgallery-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Image gallery plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
index d6e8922..2271068 100644
--- a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythgame-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Emulation plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
index 8b9aeb1..b62b7c7 100644
--- a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythmovies-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Displays information about movies playing in the area."
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
index 8754ba0..912fa54 100644
--- a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythmusic-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Music playing plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
index 8bf0298..5d8c7fe 100644
--- a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythnews-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="News checking plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
index b031fde..2066152 100755
--- a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=myththemes-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Themes for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index 73842f5..cb0bc86 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythtv-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
@@ -16,8 +16,9 @@ groups=('pvr')
 #MAKEFLAGS="-j6"
 install='mythtv.install'
 
-patchs=('smolt_jump.patch' 'myththemedmenu.h.patch' 'myththemedmenu.cpp.patch' 'H264Parser-fixes-v1.1.patch' \
-	'hdpvr-signalmonitor.patch' 'ringbuffer_reset_v2.diff' )
+patchs=('smolt_jump.patch' 'myththemedmenu.h.patch' 'myththemedmenu.cpp.patch' )
+#	'H264Parser-fixes-v1.1.patch' \
+#	'hdpvr-signalmonitor.patch' 'ringbuffer_reset_v2.diff' )
 #patchs=('svn_main_menu_popup.patch' 'smolt_jump.patch')
 source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty')
 arch=('i686' 'x86_64')
diff --git a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
index 43a5699..289dd21 100644
--- a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythvideo-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Video playback and browsing plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
index d1f888f..4200bf0 100644
--- a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythweather-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Weather checking plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
index 9a7f892..b058125 100644
--- a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythweb-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Web interface for MythTV's backend"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
index 4403524..cb2f2c3 100644
--- a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythzoneminder-svn
-pkgver=20713
+pkgver=20787
 pkgrel=1
 pkgdesc="Integrates ZoneMinder into MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD
index c0f87a5..60637bc 100755
--- a/abs/core-testing/system-templates/PKGBUILD
+++ b/abs/core-testing/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=1.0
-pkgrel=24
+pkgrel=26
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder/lircrc b/abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder/lircrc
index a2f1ebb..01519a8 100644
--- a/abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder/lircrc
+++ b/abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder/lircrc
@@ -10,6 +10,7 @@ begin
     prog = mythtv
     button = tv
     config = ! 
+    repeat = 5
 end
 
 begin
@@ -17,6 +18,7 @@ begin
     prog = mythtv
     button = dvd
     config = @
+    repeat = 5
 end
 
 begin
@@ -24,6 +26,7 @@ begin
 #Jumppoint for MythWeater created in Mythweb
     button = web
     config = #
+    repeat = 5
 end
 
 begin
@@ -31,6 +34,7 @@ begin
 #Jumppoint for MythVideo created in Mythweb
     button = media_library
     config = $
+    repeat = 5
 end
 
 begin
@@ -38,6 +42,7 @@ begin
 #Jumppoint for MythWeater created in Mythweb
     button = HAND
     config = %
+    repeat = 5
 end
 
 begin
@@ -114,30 +119,35 @@ begin
     prog = mythtv
     button = mouse-up
     config = Up
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = mouse-down
     config = Down
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = mouse-left
     config = Left
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = mouse-right
     config = Right
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = mouse-button-right
     config = Esc
+    repeat = 5
 end
 
 begin
@@ -145,12 +155,14 @@ begin
 # Enter button
     button = mouse-button-left
     config = Return
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = power
     config = Esc
+    repeat = 5
 end
 
 begin
@@ -158,48 +170,56 @@ begin
 # Enter button
     button = ok
     config = Return
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = cursor-up
     config = Up
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = cursor-down
     config = Down
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = cursor-left
     config = Left
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = cursor-right
     config = Right
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = D
     config = Esc
+    repeat = 5
 end
 
 begin
 prog = mythtv
 button = chan-up
 config = Up
+    repeat = 5
 end
 
 begin
 prog = mythtv
 button = chan-down
 config = Down
+    repeat = 5
 end
 
 begin
@@ -219,6 +239,7 @@ begin
     prog = mythtv
     button = mute
     config = F9  
+    repeat = 5
 end
 
 begin
@@ -226,12 +247,14 @@ begin
     prog = mythtv
     button = mute
     config = |  
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = dvd-root_menu
     config = M  
+    repeat = 5
 end
 
 begin
@@ -239,6 +262,7 @@ begin
 # Enter button
     button = launch_setup
     config = Return
+    repeat = 5
 end
 
 
@@ -246,18 +270,21 @@ begin
     prog = mythtv
     button = a 
     config = S  
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = b
     config = I   
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = c
     config = T   
+    repeat = 5
 end
 
 begin
@@ -265,6 +292,7 @@ prog = mythtv
 # Change focus for PiP (to change channel in the other window)
 button = max_window
 config = B
+    repeat = 5
 end
 
 begin
@@ -272,12 +300,14 @@ prog = mythtv
 # Toggle PiP on/off
 button = tv_on_demand
 config = V
+    repeat = 5
 end
 
 begin
     prog = mythtv
     button = rewind
     config = Left  
+    repeat = 5
 end
 
 
@@ -285,30 +315,35 @@ begin
     prog = mythtv
     button = fastforward
     config = Right  
+    repeat = 5
 end
 
 begin
 prog = mythtv
 button = record
 config = R
+    repeat = 5
 end
 
 begin
 prog = mythtv
 button = stop
 config = Esc
+    repeat = 5
 end
 
 begin
 prog = mythtv
 button = play
 config = P
+    repeat = 5
 end
 
 begin
 prog = mythtv
 button = pause
 config = P
+    repeat = 5
 end
 
 begin
@@ -316,6 +351,7 @@ prog = mythtv
 button = e
 # Use for backwards commercial skip
 config = Q
+    repeat = 5
 end
 
 begin
@@ -323,6 +359,7 @@ prog = mythtv
 button = f
 # Use for forward commercial skip
 config = Z
+    repeat = 5
 end
 
 #Mplayer
@@ -331,42 +368,49 @@ begin
 prog = mplayer
 button = play
 config = pause
+    repeat = 5
 end
 
 begin
 prog = mplayer
 button = pause
 config = pause
+    repeat = 5
 end
 
 begin
 prog = mplayer
 button = stop
 config = quit
+    repeat = 5
 end
 
 begin
 prog = mplayer
 button = power
 config = quit
+    repeat = 5
 end
 
 begin
 prog = mplayer
 button = d
 config = quit
+    repeat = 5
 end
 
 begin
 prog = mplayer
 button = mouse-button-right
 config = quit
+    repeat = 5
 end
 
 begin
 prog = mplayer
 button = mute
 config = mute
+    repeat = 5
 end
 
 begin
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/lircd-haupgrey-g3.conf b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/lircd-haupgrey-g3.conf
deleted file mode 100755
index c245c7a..0000000
--- a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/lircd-haupgrey-g3.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-
-#
-# this config file was automatically generated
-# using lirc-0.7.0(any) on Sun Nov 28 20:25:09 2004
-#
-# contributed by 
-#
-# brand:   Hauppauge 350
-# Created: G.J. Werler (The Netherlands)
-# Project: Mythtv Fedora Pundit-R www.mythtvportal.com
-# Date:    2004/11/28
-# model no. of remote control: Hauppauge A415-HPG
-# devices being controlled by this remote: PVR-350
-#
-
-begin remote
-
-  name  Hauppauge_350
-  bits           13
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           969   811
-  zero          969   811
-  plead        1097
-  gap          114605
-  toggle_bit      2
-
-
-      begin codes
-          Go                       0x00000000000017BB
-          Power                    0x00000000000017BD
-          TV                       0x000000000000179C
-          Videos                   0x0000000000001798
-          Music                    0x0000000000001799
-          Pictures                 0x000000000000179A
-          Guide                    0x000000000000179B
-          Radio                    0x000000000000178C
-          Up                       0x0000000000001794
-          Left                     0x0000000000001796
-          Right                    0x0000000000001797
-          Down                     0x0000000000001795
-          OK                       0x00000000000017A5
-          Back/Exit                0x000000000000179F
-          Menu/i                   0x000000000000178D
-          Vol+                     0x0000000000001790
-          Vol-                     0x0000000000001791
-          Prev.Ch                  0x0000000000001792
-          Mute                     0x000000000000178F
-          Ch+                      0x00000000000017A0
-          Ch-                      0x00000000000017A1
-          Record                   0x00000000000017B7
-          Stop                     0x00000000000017B6
-          Rewind                   0x00000000000017B2
-          Play                     0x00000000000017B5
-          Forward                  0x00000000000017B4
-          Replay/SkipBackward      0x00000000000017A4
-          Pause                    0x00000000000017B0
-          SkipForward              0x000000000000179E
-          1                        0x0000000000001781
-          2                        0x0000000000001782
-          3                        0x0000000000001783
-          4                        0x0000000000001784
-          5                        0x0000000000001785
-          6                        0x0000000000001786
-          7                        0x0000000000001787
-          8                        0x0000000000001788
-          9                        0x0000000000001789
-          Asterix                  0x000000000000178A
-          0                        0x0000000000001780
-          #                        0x000000000000178E
-          Red                      0x000000000000178B
-          Green                    0x00000000000017AE
-          Yellow                   0x00000000000017B8
-          Blue                     0x00000000000017A9
-      end codes
-
-end remote
-
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/lircrc-haupgrey-g3.txt b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/lircrc-haupgrey-g3.txt
deleted file mode 100755
index f12e4eb..0000000
--- a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/lircrc-haupgrey-g3.txt
+++ /dev/null
@@ -1,586 +0,0 @@
-# ~/.mythtv/lircrc
-#
-# MythTV native LIRC config file for
-# the new grey Hauppauge remote
-#
-# Here we have the jump point commands.  They only work if you have
-# defined function keys for these jump points.  For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
-
-begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
-end
-
-begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
-end
-
-# Not yet defined
-begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
-end
-
-# Given another function for now, I don't use mythgallery
-begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
-end
-
-begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = O
-end
-
-# Radio brings up menu
-
-begin 
-prog = mythtv
-button = Go
-repeat = 3
-config = I
-end
-
-begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
-end
-
-begin
-prog = mythtv
-button = Up
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = Down
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = Left
-repeat = 3
-config = Left
-end
-
-begin
-prog = mythtv
-button = Right
-repeat = 3
-config = Right
-end
-
-# Channel Up
-begin
-prog = mythtv
-button = Ch+
-repeat = 3
-config = Up
-end
-
-# Channel Down
-begin
-prog = mythtv
-button = Ch-
-repeat = 3
-config = Down
-end
-
-# OKSelect
-begin
-prog = mythtv
-button = OK
-repeat = 3
-config = Space
-end
-
-# Play
-begin
-prog = mythtv
-button = Play
-repeat = 3
-config = Return
-end
-
-# Stop
-begin
-prog = mythtv
-button = Stop
-repeat = 3
-config = Esc
-end
-
-# Escape/Exit/Back
-begin
-prog = mythtv
-button = Back/Exit
-repeat = 3
-config = Esc
-end
-
-# Power Off/Exit
-begin
-prog = irexec
-button = Power
-config = /usr/bin/mythpowerbutton.sh
-end
-
-# Pause
-begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
-end
-
-# Mute
-begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
-end
-
-# Fast forward 
-begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = <
-end
-
-# Rewind 
-begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = >
-end
-
-# Skip forward (10 min default)
-begin
-prog = mythtv
-button = SkipForward
-repeat = 3
-config = PgDown
-end
-
-# Skip backward (10 min default)
-begin
-prog = mythtv
-button = Replay/SkipBackward
-repeat = 3
-config = PgUp
-end
-
-# Record
-begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
-end
-
-# Delete
-begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
-end
-
-# Decrease play speed
-begin
-prog = mythtv
-button = Green
-repeat = 3
-config = U
-end
-
-# Display EPG while in live TV,
-# View selected show while in EPG
-begin
-prog = mythtv
-button = Menu/i
-repeat = 3
-config = M
-end
-
-# Scroll up
-begin
-prog = mythtv
-button = Vol+
-repeat = 3
-config = F11
-end
-
-# Scroll down
-begin
-prog = mythtv
-button = Vol-
-repeat = 3
-config = F10
-end
-
-# Bring up OSD info
-begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
-end
-
-# Change display aspect ratio
-begin
-prog = mythtv
-button = Prev.Ch
-repeat = 3
-config = H
-end
-
-# double speed watch
-begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
-end
-
-# change tuners
-begin
-prog = mythtv
-button = Asterix
-repeat = 3
-config = Y
-end
-
-# Bring up Time stretch
-begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = A
-end
-
-# Numbers 0-9
-begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
-end
-
-# MPlayer lirc setup
-# Show OSD
-begin
-prog = mplayer
-button = Menu/i
-repeat = 3
-config = osd
-end
-
-# Pause playback
-begin
-prog = mplayer
-button = Pause
-repeat = 3
-config = pause
-end
-
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = Play
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Stop
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = Mute
-repeat = 3
-config = mute
-end
-
-begin
-prog = mplayer
-button = Left
-repeat = 3
-config = seek -10
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = Rewind
-repeat = 3
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = Right
-repeat = 3
-config = seek +30
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = Forward
-repeat = 3
-config = seek +30
-end
-
-# Quit
-begin
-prog = mplayer
-button = Back/Exit
-repeat = 3
-config = quit
-end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SkipForward
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = Replay/SkipBackward
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = 
-repeat = 3
-config = vo_fullscreen
-end
-
-# Xine lirc setup
-begin
-prog = xine
-button = Play
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = Stop
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = Back/Exit
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = Pause
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = Up
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = Down
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = Left
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = Right
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = Forward
-repeat = 3
-config = SpeedFaster
-end
-
-begin
-prog = xine
-button = Rewind
-repeat = 3
-config = SpeedSlower
-end
-
-begin
-prog = xine
-button = Vol+
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = Vol-
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = Mute
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = Menu/i
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SkipForward
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = Replay/SkipBackward 
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = Go
-repeat = 3
-config = OSDStreamInfos
-end 
-
-
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/preview.jpg b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/preview.jpg
deleted file mode 100644
index a40a1e8..0000000
--- a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey-g3/preview.jpg
+++ /dev/null
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircd-haupgrey.conf b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircd-haupgrey.conf
new file mode 100644
index 0000000..c0849ef
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircd-haupgrey.conf
@@ -0,0 +1,199 @@
+#
+# this config file was automatically generated
+# using lirc-0.5.5pre8 on Sun Apr 18 11:43:45 1999
+#
+# contributed by Jens Leuschner <leuschner@gmx.net>
+#
+# brand:             Hauppauge
+# model:             
+# supported devices: WinTV primo; WinTV pci; WinTV radio
+#
+# This config file will work with both homebrew receivers and 
+# original Hauppauge TV cards !!!
+#
+
+begin remote
+
+  name  Hauppauge
+  bits           13
+  flags SHIFT_ENC
+  eps            30
+  aeps          100
+
+  one           950   830
+  zero          950   830
+  plead         960
+  gap          89584
+  repeat_bit      2
+
+      begin codes
+          TV                       0x000000000000100F
+          RADIO                    0x000000000000100C
+          FULL_SCREEN              0x000000000000102E
+          CH+                      0x0000000000001020
+          CH-                      0x0000000000001021
+          VOL-                     0x0000000000001011
+          VOL+                     0x0000000000001010
+          MUTE                     0x000000000000100D
+          SOURCE                   0x0000000000001022
+          1                        0x0000000000001001
+          2                        0x0000000000001002
+          3                        0x0000000000001003
+          4                        0x0000000000001004
+          5                        0x0000000000001005
+          6                        0x0000000000001006
+          7                        0x0000000000001007
+          8                        0x0000000000001008
+          9                        0x0000000000001009
+          0                        0x0000000000001000
+          RESERVED                 0x000000000000101E
+          MINIMIZE                 0x0000000000001026
+      end codes
+
+end remote
+
+
+#
+# this config file was automatically generated
+# using lirc-0.6.6(animax) on Tue Apr 15 19:50:27 2003
+#
+# contributed by 
+#
+# brand: 				Hauppauge
+# model no. of remote control: 
+# devices being controlled by this remote: PVR 2/350
+#
+
+begin remote
+
+  name  hauppauge_pvr
+  bits           13
+  flags RC5|CONST_LENGTH
+  eps            30
+  aeps          100
+
+  one           969   811
+  zero          969   811
+  plead        1097
+  gap          114605
+  toggle_bit      2
+
+
+      begin codes
+          Power                    0x00000000000017FD
+          Go                       0x00000000000017FB
+          1                        0x00000000000017C1
+          2                        0x00000000000017C2
+          3                        0x00000000000017C3
+          4                        0x00000000000017C4
+          5                        0x00000000000017C5
+          6                        0x00000000000017C6
+          7                        0x00000000000017C7
+          8                        0x00000000000017C8
+          9                        0x00000000000017C9
+          Back/Exit                0x00000000000017DF
+          0                        0x00000000000017C0
+          Menu                     0x00000000000017CD
+          Red                      0x00000000000017CB
+          Green                    0x00000000000017EE
+          Yellow                   0x00000000000017F8
+          Blue                     0x00000000000017E9
+          Ch+                      0x00000000000017E0
+          Ch-                      0x00000000000017E1
+          Vol-                     0x00000000000017D1
+          Vol+                     0x00000000000017D0
+          Ok                       0x00000000000017E5
+          Mute                     0x00000000000017CF
+          Blank                    0x00000000000017CC
+          Full                     0x00000000000017FC
+          Rewind                   0x00000000000017F2
+          Play                     0x00000000000017F5
+          Forward                  0x00000000000017F4
+          Record                   0x00000000000017F7
+          Stop                     0x00000000000017F6
+          Pause                    0x00000000000017F0
+          Replay                   0x00000000000017E4
+          Skip                     0x00000000000017DE
+      end codes
+
+end remote
+
+
+#
+# this config file was automatically generated
+# using lirc-0.7.0(any) on Sun Nov 28 20:25:09 2004
+#
+# contributed by 
+#
+# brand:   Hauppauge 350
+# Created: G.J. Werler (The Netherlands)
+# Project: Mythtv Fedora Pundit-R www.mythtvportal.com
+# Date:    2004/11/28
+# model no. of remote control: Hauppauge A415-HPG
+# devices being controlled by this remote: PVR-350
+#
+
+begin remote
+
+  name  Hauppauge_350
+  bits           13
+  flags RC5|CONST_LENGTH
+  eps            30
+  aeps          100
+
+  one           969   811
+  zero          969   811
+  plead        1097
+  gap          114605
+  toggle_bit      2
+
+
+      begin codes
+          Go                       0x00000000000017BB
+          Power                    0x00000000000017BD
+          TV                       0x000000000000179C
+          Videos                   0x0000000000001798
+          Music                    0x0000000000001799
+          Pictures                 0x000000000000179A
+          Guide                    0x000000000000179B
+          Radio                    0x000000000000178C
+          Up                       0x0000000000001794
+          Left                     0x0000000000001796
+          Right                    0x0000000000001797
+          Down                     0x0000000000001795
+          OK                       0x00000000000017A5
+          Back/Exit                0x000000000000179F
+          Menu/i                   0x000000000000178D
+          Vol+                     0x0000000000001790
+          Vol-                     0x0000000000001791
+          Prev.Ch                  0x0000000000001792
+          Mute                     0x000000000000178F
+          Ch+                      0x00000000000017A0
+          Ch-                      0x00000000000017A1
+          Record                   0x00000000000017B7
+          Stop                     0x00000000000017B6
+          Rewind                   0x00000000000017B2
+          Play                     0x00000000000017B5
+          Forward                  0x00000000000017B4
+          Replay/SkipBackward      0x00000000000017A4
+          Pause                    0x00000000000017B0
+          SkipForward              0x000000000000179E
+          1                        0x0000000000001781
+          2                        0x0000000000001782
+          3                        0x0000000000001783
+          4                        0x0000000000001784
+          5                        0x0000000000001785
+          6                        0x0000000000001786
+          7                        0x0000000000001787
+          8                        0x0000000000001788
+          9                        0x0000000000001789
+          Asterix                  0x000000000000178A
+          0                        0x0000000000001780
+          #                        0x000000000000178E
+          Red                      0x000000000000178B
+          Green                    0x00000000000017AE
+          Yellow                   0x00000000000017B8
+          Blue                     0x00000000000017A9
+      end codes
+
+end remote
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircrc-haupgrey.txt b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircrc-haupgrey.txt
new file mode 100644
index 0000000..2f1e514
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircrc-haupgrey.txt
@@ -0,0 +1,505 @@
+# lircrc.example.HauppaugeGrey-nativelirc
+# 2003-09-17, Robert Kulagowski
+# mailto:rkulagow@rocketmail.com
+# Save this file in ~/.mythtv/lircrc
+
+begin
+    prog = mythtv
+    button = Power
+    config = Esc
+end
+
+begin
+    prog = mythtv
+    button = Go
+# Swap the PiP windows
+    config = N
+end
+
+begin
+    prog = mythtv
+    button = 1
+    config = 1
+end
+
+begin
+    prog = mythtv
+    button = 2
+    config = 2
+end
+
+begin
+    prog = mythtv
+    button = 3
+    config = 3
+end
+
+begin
+    prog = mythtv
+    button = 4
+    config = 4
+end
+
+begin
+    prog = mythtv
+    button = 5
+    config = 5
+end
+
+begin
+    prog = mythtv
+    button = 6
+    config = 6
+end
+
+begin
+    prog = mythtv
+    button = 7
+    config = 7
+end
+
+begin
+    prog = mythtv
+    button = 8
+    config = 8
+end
+
+begin
+    prog = mythtv
+    button = 9
+    config = 9
+end
+
+begin
+    prog = mythtv
+    button = Back/Exit
+    config = Esc
+end
+
+begin
+    prog = mythtv
+    button = 0
+    config = 0
+end
+
+begin
+    prog = mythtv
+    button = Menu
+    config = M
+end
+
+# Below are keys used with the Hauppauge Grey remote
+
+begin
+   prog = mythtv
+# This is the Red key
+# We'll use it for "Delete"
+   button = Red
+   config = D
+end
+
+begin
+   prog = mythtv
+# This is the Green key
+# We'll use it for "Information"
+   button = Green
+   config = I
+end
+
+# Note the "repeat = " strings in the volume and channel.
+# This means that if you hold down the key, every nth instance will be
+# passed.  This depends on your system, so you may want to increase or
+# decrease this and see what happens.  repeat = 1 is probably too
+# fast.
+
+begin
+  prog = mythtv
+# This is the Yellow key
+# Use it as a volume key
+  button = Yellow
+  repeat = 3
+  config = F10
+end
+
+begin
+  prog = mythtv
+# This is the Blue key
+# Use it as a volume key
+  button = Blue
+  repeat = 3
+  config = F11
+end
+
+begin
+    prog = mythtv
+    button = Ch+
+# This is the "up" on the central diamond
+    repeat = 3
+    config = Up
+end
+
+begin
+    prog = mythtv
+    button = Ch-
+# This is the "down" on the central diamond
+    repeat = 3
+    config = Down
+end
+
+begin
+    prog = mythtv
+    button = Vol-
+# This is the "left" on the central diamond
+    repeat = 3
+    config = Left
+end
+
+begin
+    prog = mythtv
+    button = Vol+
+# This is the "right" on the central diamond
+    repeat = 3
+    config = Right
+end
+
+begin
+    prog = mythtv
+# Middle button on the diamond
+    button = Ok
+    config = Return
+end
+
+begin
+    prog = mythtv
+    button = Mute
+    config = F9
+end
+
+begin
+   prog = mythtv
+# Change focus for PiP (to change channel in the other window)
+   button = Blank
+   config = B
+end
+
+begin
+   prog = mythtv
+# Toggle PiP on/off
+   button = Full
+   config = V
+end
+
+begin
+    prog = mythtv
+    button = Rewind
+    config = Left
+end
+
+begin
+    prog = mythtv
+    button = Play
+    config = P
+end
+
+begin
+    prog = mythtv
+    button = Forward
+    config = Right
+end
+
+begin
+  prog = mythtv
+  button = Record
+  config = R
+end
+
+begin
+   prog = mythtv
+# Teletext
+   button = Stop
+   config = T
+end
+
+begin
+    prog = mythtv
+    button = Pause
+    config = P
+end
+
+begin
+   prog = mythtv
+   button = Replay
+# Use for backwards commercial skip
+    config = Q
+end
+
+begin
+   prog = mythtv
+   button = Skip
+# Use for forward commercial skip
+    config = Z
+end
+
+#MPlayer
+begin
+   prog = mplayer
+   button = Power
+   config = quit
+end
+
+begin
+   prog = mplayer
+   button = Menu
+   config = osd
+end
+
+begin
+   prog = mplayer
+   button = Rewind
+   config = seek -10
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Forward
+   config = seek +10
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Replay
+   config = seek -60
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Skip
+   config = seek +60
+   repeat = 1
+end
+
+begin
+    prog = mplayer
+    button = Pause
+    config = pause
+end
+
+begin
+    prog = mplayer
+    button = Play
+    config = pause
+end
+
+begin
+   prog = mplayer
+   button = Back/Exit
+   config = quit
+end
+
+begin
+   prog = mplayer
+   button = Vol+
+   config = volume +1
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Vol-
+   config = volume -1
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Mute
+   config = mute
+end
+##XINE
+
+ begin
+ prog = xine
+ button = Play
+ repeat = 3
+ config = Play
+ end
+
+ begin
+ prog = xine
+ button = Stop
+ repeat = 3
+ config = Stop
+ end
+
+ begin
+ prog = xine
+ button = Back/Exit
+ config = Quit
+ end
+
+ begin
+ prog = xine
+ button = Pause
+ repeat = 3
+ config = Pause
+ end
+
+ begin
+ prog = xine
+ button = Ch+
+ repeat = 4
+ config = EventUp
+ end
+
+ begin
+ prog = xine
+ button = Ch-
+ repeat = 4
+ config = EventDown
+ end
+
+ begin
+ prog = xine
+ button = Vol-
+ repeat = 4
+ config = EventLeft
+ end
+
+ begin
+ prog = xine
+ button = Vol+
+ repeat = 4
+ config = EventRight
+ end
+
+ begin
+ prog = xine
+ button = Ok
+ repeat = 0
+ config = EventSelect
+ end
+
+ begin
+ prog = xine
+ button = Menu
+ repeat = 0
+ config = Menu
+ end
+
+ #vol down
+ begin
+ prog = xine
+ button = Yellow
+ repeat = 1
+ config = Volume-
+ end
+
+ #vol up
+ begin
+ prog = xine
+ button = Red
+ repeat = 1
+ config = Volume+
+ end
+
+ begin
+ prog = xine
+ button = Forward
+ repeat = 2
+ config = SeekRelative+30
+ end
+
+ begin
+ prog = xine
+ button = Rewind
+ repeat = 2
+ config = SeekRelative-30
+ end
+
+ #ch up
+ begin
+ prog = xine
+ button = Green
+ repeat = 1
+ config = SeekRelative+60
+ end
+
+ #ch down
+ begin
+ prog = xine
+ button = Blue
+ repeat = 1
+ config = SeekRelative-60
+ end
+
+ #sleep
+ begin
+ prog = xine
+ button = Go
+ repeat = 1
+ config = ZoomIn
+ end
+
+ #display
+ begin
+ prog = xine
+ button = Skip
+ repeat = 1
+ config = ZoomOut
+ end
+
+ #skip chapter forward
+ begin
+ prog = xine
+ button = Skip
+ repeat = 1
+ config = EventNext
+ end
+
+ #skip chapter backward
+ begin
+ prog = xine
+ button = Replay
+ repeat = 1
+ config = EventPrior
+ end
+
+ begin
+ prog = lircnav
+ button = Vol-
+ config = page_down
+ end
+
+ begin
+ prog = lircnav
+ button = Vol+
+ config = page_up
+ end
+
+ begin
+ prog = lircnav
+ button = Ch+
+ config = up
+ end
+
+ begin
+ prog = lircnav
+ button = Ch-
+ config = down
+ end
+
+ begin
+ prog = lircnav
+ button = Ok
+ config = select
+ end
+
+ begin
+ prog = lircnav
+ button = Power
+ config = quit
+ end
+
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/preview.jpg b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/preview.jpg
new file mode 100644
index 0000000..19acba3
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/hauppauge-grey/preview.jpg
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey-g3.conf b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey-g3.conf
new file mode 100644
index 0000000..7269fc2
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey-g3.conf
@@ -0,0 +1,64 @@
+begin remote 
+ 
+   name  Hauppauge_350 
+   bits           13 
+   flags RC5|CONST_LENGTH 
+   eps            30 
+   aeps          100 
+ 
+   one           969   811 
+   zero          969   811 
+   plead        1097 
+   gap          114605 
+   toggle_bit      2 
+ 
+ 
+       begin codes 
+           Go                       0x00000000000017BB 
+           Power                    0x00000000000017BD 
+           TV                       0x000000000000179C 
+           Videos                   0x0000000000001798 
+           Music                    0x0000000000001799 
+           Pictures                 0x000000000000179A 
+           Guide                    0x000000000000179B 
+           Radio                    0x000000000000178C 
+           UP                       0x0000000000001794 
+           LEFT                     0x0000000000001796 
+           RIGHT                    0x0000000000001797 
+           DOWN                     0x0000000000001795 
+           OK                       0x00000000000017A5 
+           Back-Exit                0x000000000000179F 
+           Menu                     0x000000000000178D 
+           Volume-UP                0x0000000000001790 
+           Volume-DOWN              0x0000000000001791 
+           Prev-Channel             0x0000000000001792 
+           Mute                     0x000000000000178F 
+           Channel-UP               0x00000000000017A0 
+           Channel-Down             0x00000000000017A1 
+           Record                   0x00000000000017B7 
+           Stop                     0x00000000000017B6 
+           Rewind                   0x00000000000017B2 
+           Play                     0x00000000000017B5 
+           Forward                  0x00000000000017B4 
+           Previous                 0x00000000000017A4 
+           Pause                    0x00000000000017B0 
+           Next                     0x000000000000179E 
+           1                        0x0000000000001781 
+           2                        0x0000000000001782 
+           3                        0x0000000000001783 
+           4                        0x0000000000001784 
+           5                        0x0000000000001785 
+           6                        0x0000000000001786 
+           7                        0x0000000000001787 
+           8                        0x0000000000001788 
+           9                        0x0000000000001789 
+           star                     0x000000000000178A 
+           0                        0x0000000000001780 
+           hash                     0x000000000000178E 
+           red                      0x000000000000178B 
+           green                    0x00000000000017AE 
+           yellow                   0x00000000000017B8 
+           blue                     0x00000000000017A9 
+       end codes 
+ 
+end remote
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey.conf b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey.conf
deleted file mode 100755
index 69e93b4..0000000
--- a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-begin remote
-  name            hauppauge
-  bits            13
-  flags           RC5|CONST_LENGTH
-  eps             30
-  aeps            100
-  one             969   811
-  zero            969   811
-  gap             114605
-  toggle_bit      2
-  plead           1097
-
-  begin codes
-       Power           0x00000000000017FD
-       Go              0x00000000000017FB
-       1               0x00000000000017C1
-       2               0x00000000000017C2
-       3               0x00000000000017C3
-       4               0x00000000000017C4
-       5               0x00000000000017C5
-       6               0x00000000000017C6
-       7               0x00000000000017C7
-       8               0x00000000000017C8
-       9               0x00000000000017C9
-       Back/Exit       0x00000000000017DF
-       0               0x00000000000017C0
-       Menu            0x00000000000017CD
-       Red             0x00000000000017CB
-       Green           0x00000000000017EE
-       Yellow          0x00000000000017F8
-       Blue            0x00000000000017E9
-       Ch+             0x00000000000017E0
-       Ch-             0x00000000000017E1
-       Vol-            0x00000000000017D1
-       Vol+            0x00000000000017D0
-       Ok              0x00000000000017E5
-       Mute            0x00000000000017CF
-       Blank           0x00000000000017CC
-       Full            0x00000000000017FC
-       Rewind          0x00000000000017F2
-       Play            0x00000000000017F5
-       Forward         0x00000000000017F4
-       Record          0x00000000000017F7
-       Stop            0x00000000000017F6
-       Pause           0x00000000000017F0
-       Replay          0x00000000000017E4
-       Skip            0x00000000000017DE
-
-  end codes
-
-end remote
-
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey-g3.txt b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey-g3.txt
new file mode 100644
index 0000000..3868261
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey-g3.txt
@@ -0,0 +1,762 @@
+# MythTV LIRC config file for the gray Hauppauge remote
+# Sticker on the inside of battery compartment
+#     A415-HPG
+#     1004  032400
+#
+# /home/mythtv/.mythtv/lircrc
+#
+#
+### RESET THE MYTH BOX or REBOOT IT
+# 1 click is reset front end, 2 clicks is reboot
+#
+begin
+   prog = irexec
+   button = Power
+   config = /home/mythtv/scripts/mypower.sh &
+end
+#
+### MYTHTV SETTINGS FOR IT'S CONTROL
+#
+# Program Guide
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = green
+   config = F2
+end
+#
+# TV Recording Playback
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = Videos
+   config = F3
+end
+#
+# Live TV
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = TV
+   config = F4
+end
+#
+# MythWeather
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = Go
+   config = F7
+end
+#
+# MythGame
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = Green
+   config = F5
+end
+#
+# MythMusic
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = Music
+   config = F6
+end
+#
+# Previous Channel
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = Prev-Channel
+   config = H
+end
+#
+# Channel Up
+begin
+   remote = grayHauppauge
+   prog = mythtv
+   button = Channel-UP
+   repeat = 3
+   config = Up
+end
+
+# Channel Down
+begin
+ prog = mythtv
+ button = Channel-DOWN
+ repeat = 3
+ config = Down
+end
+
+# OK/Select
+begin
+ prog = mythtv
+ button = OK
+ config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = Esc
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = Back-Exit
+config = Esc
+end
+
+# Power Off/Exit
+# begin
+# prog = mythtv
+# button = Power
+# config = Esc
+# end
+
+# Red means stop!
+#begin
+#prog = mythtv
+#button = red
+#config = Esc
+#end
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = F9
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+
+
+
+# Fast forward (while viewing)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = >
+end
+
+# Rewind (while viewing)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = <
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = PgDown
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = PgUp
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = red
+repeat = 3
+config = D
+end
+
+# OSD browse
+
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = O
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = M
+end
+
+# Volume-Up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = ]
+end
+
+# Volume-Down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = [
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+#begin
+#prog = mythtv
+#button = FULL
+#repeat = 3
+#config = W
+#end
+
+# Seek to previous commercial cut point
+begin
+prog = mythtv
+button = yellow
+repeat = 3
+config = Q
+end
+
+# Seek to next commercial cut point
+begin
+prog = mythtv
+button = blue
+repeat = 3
+config = Z
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+#
+### MPlayer lirc setup
+#
+# Show OSD
+begin
+prog = mplayer
+button = Menu
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = Pause
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = Play
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Stop
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = Mute
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = Rewind
+repeat = 3
+config = seek -10
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = Forward
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = Back-Exit
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = Next
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = Previous
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+#begin
+#prog = mplayer
+#button = FULL
+#repeat = 3
+#config = vo_fullscreen
+#end
+#
+#
+### XINE CONFIGURATION
+#
+##
+# xine key bindings.
+# Automatically generated by xine-ui version 0.99.2.
+##
+
+# start playback
+begin
+   button = Play
+   prog   = xine
+   repeat = 3
+   config = Play
+end
+
+# playback pause toggle
+begin
+   button = Pause
+   prog   = xine
+   repeat = 3
+   config = Pause
+end
+
+# stop playback
+begin
+   button = Stop
+   prog   = xine
+   repeat = 3
+   config = Stop
+end
+
+# take a snapshot
+begin
+   button = Record
+   prog   = xine
+   repeat = 3
+   config = Snapshot
+end
+
+# eject the current medium
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = Eject
+end
+
+# set position to -60 seconds in current stream
+begin
+   button = Previous
+   prog   = xine
+   repeat = 3
+   config = SeekRelative-60
+end
+
+# set position to +60 seconds in current stream
+begin
+   button = Next
+   prog   = xine
+   repeat = 3
+   config = SeekRelative+60
+end
+
+# set position to -30 seconds in current stream
+begin
+   button = Rewind
+   prog   = xine
+   repeat = 3
+   config = SeekRelative-30
+end
+
+# set position to +30 seconds in current stream
+begin
+   button = Forward
+   prog   = xine
+   repeat = 3
+   config = SeekRelative+30
+end
+
+# set position to +7 and -7 seconds in current stream
+begin
+   button = 1
+   prog   = xine
+   repeat = 3
+   config = SeekRelative-7
+end
+
+begin
+   button = 2
+   prog   = xine
+   repeat = 3
+   config = SeekRelative+7
+end
+
+begin
+   button = 4
+   prog   = xine
+        repeat = 3
+   config = SetPosition40%
+end
+
+begin
+   button = 5
+   prog   = xine
+   repeat = 3
+   config = SetPosition70%
+end
+
+begin
+   button = UP
+   prog   = xine
+   repeat = 3
+   config = SpeedFaster
+end
+
+begin
+   button = DOWN
+   prog   = xine
+   repeat = 3
+   config = SpeedSlower
+end
+
+begin
+   button = OK
+   prog   = xine
+   repeat = 3
+   config = SpeedReset
+end
+
+# increment audio volume
+begin
+   button = Volume-UP
+   prog   = xine
+   repeat = 3
+   config = Volume+
+end
+
+# decrement audio volume
+begin
+   button = Volume-DOWN
+   prog   = xine
+   repeat = 3
+   config = Volume-
+end
+
+# audio muting toggle
+begin
+   button = Mute
+   prog   = xine
+   repeat = 3
+   config = Mute
+end
+
+# set video output window to 100%
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = Window100
+end
+
+# set video output window to 200%
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = Window200
+end
+
+# zoom in
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = ZoomIn
+end
+
+# zoom out
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = ZoomOut
+end
+
+# fullscreen toggle
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = ToggleFullscreen
+end
+
+# Xinerama fullscreen toggle
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = ToggleXineramaFullscr
+end
+
+# jump to Title Menu
+begin
+   button = Go
+   prog   = xine
+   repeat = 3
+   config = TitleMenu
+end
+
+# jump to Root Menu
+begin
+   remote = xxxxx
+   button = xxxxx
+   prog   = xine
+   repeat = 3
+   config = RootMenu
+end
+
+# menu navigate up
+begin
+   button = xxxx
+   prog   = xine
+   repeat = 3
+   config = EventUp
+end
+
+# menu navigate down
+begin
+   button = xxxx
+   prog   = xine
+   repeat = 3
+   config = EventDown
+end
+
+# menu navigate left
+begin
+   button = LEFT
+   prog   = xine
+   repeat = 3
+   config = EventLeft
+end
+
+# menu navigate right
+begin
+   button = RIGHT
+   prog   = xine
+   repeat = 3
+   config = EventRight
+end
+
+# visibility toggle of stream info window
+begin
+   button = Guide
+   prog   = xine
+   repeat = 3
+   config = StreamInfosShow
+end
+
+# display stream information using OSD
+begin
+   button = Menu
+   prog   = xine
+   repeat = 3
+   config = OSDStreamInfos
+end
+
+
+
+# increase brightness by 10
+begin
+   button = Channel-UP
+   prog   = xine
+   repeat = 3
+   config = BrightnessControl+
+end
+
+# decrease brightness by 10
+begin
+   button = Channel-DOWN
+   prog   = xine
+   repeat = 3
+   config = BrightnessControl-
+end
+
+# quit the program
+begin
+   button = Back-Exit
+   prog   = xine
+   repeat = 3
+   config = Quit
+end
+
+##
+# End of xine key bindings.
+## 
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey.txt b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey.txt
deleted file mode 100755
index cf40c4f..0000000
--- a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey.txt
+++ /dev/null
@@ -1,507 +0,0 @@
-# ~/.mythtv/lircrc
-#
-# MythTV native LIRC config file for
-# the grey Hauppauge remote
-#
-# By Jarod Wilson, 2003/12/21
-# Amalgamated from Jeff Campbell's,
-# .lircrc, the mythtv.org docs, and
-# a few touches of my own. :)
-#
-
-# Channel Up
-begin
-prog = mythtv
-button = CH+
-repeat = 3
-config = Up
-end
-
-# Channel Down
-begin
-prog = mythtv
-button = CH-
-repeat = 3
-config = Down
-end
-
-# Vol Up
-begin
-prog = mythtv
-button = VOL+
-repeat = 3
-config = F11
-end
-
-# Vol Down
-begin
-prog = mythtv
-button = VOL-
-repeat = 3
-config = F10
-end
-
-# OK/Select
-begin
-prog = mythtv
-button = OK
-config = Space
-end
-
-# Play
-begin
-prog = mythtv
-button = PLAY
-config = Return
-end
-
-# Stop
-begin
-prog = mythtv
-button = STOP
-config = Esc
-end
-
-# Escape/Exit/Back
-begin
-prog = mythtv
-button = BACK/EXIT
-config = Esc
-end
-
-# Power Off/Exit
-begin
-prog = irexec
-button = OFF
-config = /usr/bin/mythpowerbutton.sh
-end
-
-# Delete
-begin
-prog = mythtv
-button = RED
-config = D
-end
-
-# Seek to previous commercial cut point
-begin
-prog = mythtv
-button = YELLOW
-repeat = 3
-config = J
-end
-
-# Seek to next commercial cut point
-begin
-prog = mythtv
-button = BLUE
-repeat = 3
-config = Z
-end
-
-# OSD browse
-begin
-prog = mythtv
-button = GREEN
-repeat = 3
-config = O
-end
-
-# Pause
-begin
-prog = mythtv
-button = PAUSE
-repeat = 3
-config = P
-end
-
-# Mute
-begin
-prog = mythtv
-button = MUTE
-repeat = 3
-config = |
-end
-
-# Fast forward (30 sec default)
-begin
-prog = mythtv
-button = REWIND
-repeat = 3
-config = Left
-end
-
-# Rewind (10 sec default)
-begin
-prog = mythtv
-button = FORWARD
-repeat = 3
-config = Right
-end
-
-# Skip forward (10 min default)
-begin
-prog = mythtv
-button = SKIP
-repeat = 3
-config = PgDown
-end
-
-# Skip backward (10 min default)
-begin
-prog = mythtv
-button = REPLAY
-repeat = 3
-config = PgUp
-end
-
-# Record
-begin
-prog = mythtv
-button = RECORD
-repeat = 3
-config = R
-end
-
-# History
-begin
-prog = mythtv
-button = BLANK
-repeat = 3
-config = H
-end
-
-# Display EPG while in live TV,
-# View selected show while in EPG
-begin
-prog = mythtv
-button = MENU
-repeat = 3
-config = M
-end
-
-# Bring up OSD info
-begin
-prog = mythtv
-button = GO
-repeat = 3
-config = I
-end
-
-# Change display aspect ratio
-begin
-prog = mythtv
-button = FULL
-repeat = 3
-config = W
-end
-
-# Numbers 0-9
-
-begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
-end
-
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
-begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
-end
-
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = STOP
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = REWIND
-repeat = 3
-config = seek -10
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = FORWARD
-repeat = 3
-config = seek +30
-end
-
-# Quit
-begin
-prog = mplayer
-button = BACK/EXIT
-repeat = 3
-config = quit
-end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK/EXIT
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FORWARD
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REWIND
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-
diff --git a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/preview.jpg b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/preview.jpg
index 19acba3..a40a1e8 100644
--- a/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/preview.jpg
+++ b/abs/core-testing/system-templates/templates/remotes/hauppauge-silver/preview.jpg
diff --git a/abs/core-testing/tweaker/PKGBUILD b/abs/core-testing/tweaker/PKGBUILD
index 44d8846..5f92817 100644
--- a/abs/core-testing/tweaker/PKGBUILD
+++ b/abs/core-testing/tweaker/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=tweaker
 pkgver=1
-pkgrel=32
+pkgrel=34
 pkgdesc=""
 arch=('i686' 'x86_64')
 
diff --git a/abs/core-testing/tweaker/bin/twk_graphics.pl b/abs/core-testing/tweaker/bin/twk_graphics.pl
index 4fb6d77..22b6688 100755
--- a/abs/core-testing/tweaker/bin/twk_graphics.pl
+++ b/abs/core-testing/tweaker/bin/twk_graphics.pl
@@ -43,7 +43,7 @@ sub check_for_GL() {
 	    # Now poll the strength, returning the FPS from glxgears, run at the default resolution.
 	    # I would love to be able to poll this in a way that 1) doesn't pop up a GUI window and
 	    # 2) doesn't rely on manually making a database that maps video cards to performance levels.
-	    $result = execute_shell_command("script -q -c \"glxgears -fullscreen &  sleep 11 ;  pkill -15 glxgears\" | tail -1");
+	    $result = execute_shell_command("script -q -c \"glxgears -fullscreen &  sleep 11 ;  pkill -15 glxgears\" | grep FPS | tail -1");
 	    if ($result =~ m/ (\d+)\.\d+ FPS/) {
 		$fps = $1;
 		execute_shell_command("echo $fps > /tmp/fps");
diff --git a/abs/core-testing/tweaker/lib/Tweaker/Script.pm b/abs/core-testing/tweaker/lib/Tweaker/Script.pm
index 8474f0b..7dd2c8f 100644
--- a/abs/core-testing/tweaker/lib/Tweaker/Script.pm
+++ b/abs/core-testing/tweaker/lib/Tweaker/Script.pm
@@ -80,7 +80,7 @@ sub get_mythtv_connection_string {
     # we want something like mythconverg:localhost
     my $dbname = "";
     my $dbhostname = "";
-    open(MYSQLTXT, "< /usr/MythVantage/templates/mysql.txt");
+    open(MYSQLTXT, "< /usr/share/mythtv/mysql.txt");
     while(<MYSQLTXT>) {
 	if (/DBName=(.*)/) {
 	    $dbname=$1;
diff --git a/abs/extra-testing/community/xbmc-svn/CHANGELOG b/abs/extra-testing/community/xbmc-svn/CHANGELOG
index 258e5ef..ddcbd53 100644
--- a/abs/extra-testing/community/xbmc-svn/CHANGELOG
+++ b/abs/extra-testing/community/xbmc-svn/CHANGELOG
@@ -1,5 +1,9 @@
 xbmc-svn Change log:
 --------------------
+2nd July 2009
+21333   haggy: updated to current svn head which has media flagging support if your skin
+               supports it (the shipped PM3HD does already, also Aeon and MediaStream redux)
+
 3rd June 2009
 20896   haggy: enabled external libs for every lib supported despite python and ffmpeg
                enabling external python breaks python support in xbmc due to Arch's python
diff --git a/abs/extra-testing/community/xbmc-svn/PKGBUILD b/abs/extra-testing/community/xbmc-svn/PKGBUILD
index 57efdca..74d2b7e 100644
--- a/abs/extra-testing/community/xbmc-svn/PKGBUILD
+++ b/abs/extra-testing/community/xbmc-svn/PKGBUILD
@@ -5,7 +5,7 @@
 # for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD
 
 pkgname=xbmc-svn
-pkgver=20948
+pkgver=21337
 pkgrel=1
 pkgdesc="XBMC Media Center from SVN (linuxport branch)"
 provides=('xbmc')
@@ -27,13 +27,10 @@ optdepends=('lirc: remote controller support'
             'unrar: access compressed files without unpacking them')
 install=("${pkgname}.install")
 source=('libcurl-not-in-lib64.patch'
-        'xbmc-safe-fullscreen.patch'
 	'Lircmap.xml')
 noextract=('libcurl-not-in-lib64.patch'
-           'xbmc-safe-fullscreen.patch'
 	   'Lircmap.xml')
 md5sums=('ac1244a5b4aad0e7d59e86a0d318df1b'
-         '809c684287b68621d3b19923bb57adfe'
 	 '3f93186f1ea4aad73011d00754c7265a')
 
 options=(!makeflags)
@@ -52,15 +49,10 @@ build() {
         msg "Checking out SVN tree of -r$pkgver"
         svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1
     fi
-    msg "Done. Starting make..."
 
     # Apply patches
     cd "$srcdir/$_svnmod"
 
-    # Experimental safe fullscreen patch from the forums (by motd2k)
-    msg "Patching with xbmc-safe-fullscreen.patch"
-    patch -p0 < "$srcdir/xbmc-safe-fullscreen.patch" || return 1
-
     # Arch's libcurl lives in /usr/lib, not /usr/lib64 - fix the path:
     msg "Patching with libcurl-not-in-lib64.patch" 
     patch -p0 < "$srcdir/libcurl-not-in-lib64.patch" || return 1
@@ -71,6 +63,8 @@ build() {
     libtoolize --copy --force
     ./autogen.sh --enable-static --with-pic
 
+    cd "$srcdir/$_svnmod"
+
     # Configure XBMC
     #
     # Note on external-libs:
@@ -81,8 +75,7 @@ build() {
     #   - We don't want to rely on AUR packages, so we also don't use libass
     #     as long as it's in AUR
     msg "Configuring XBMC" 
-    cd "$srcdir/$_svnmod"
-    make distclean
+    make clean
     ./configure --prefix=${_prefix} \
                 --enable-external-libmad \
                 --enable-external-liba52 \
diff --git a/abs/extra-testing/community/xbmc-svn/xbmc-safe-fullscreen.patch b/abs/extra-testing/community/xbmc-svn/xbmc-safe-fullscreen.patch
deleted file mode 100644
index 2da0c91..0000000
--- a/abs/extra-testing/community/xbmc-svn/xbmc-safe-fullscreen.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: xbmc/Application.cpp
-===================================================================
---- xbmc/Application.cpp	(revision 20059)
-+++ xbmc/Application.cpp	(working copy)
-@@ -877,6 +877,8 @@
- #endif
- 
-   // set GUI res and force the clear of the screen
-+  if (g_guiSettings.GetBool("videoscreen.safefull"))
-+    g_guiSettings.m_LookAndFeelResolution = AUTORES;
-   g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution, TRUE, true);
- 
- #ifdef _WIN32PC
-@@ -953,6 +955,9 @@
-   time(&seconds);
-   srand((unsigned int)seconds);
- 
-+  if (g_guiSettings.GetBool("videoscreen.safefull"))
-+    g_graphicsContext.ToggleFullScreenRoot();
-+
-   return CXBApplicationEx::Create(hWnd);
- }
- 
-Index: GUISettings.cpp
-===================================================================
---- xbmc/GUISettings.cpp	(revision 20824)
-+++ xbmc/GUISettings.cpp	(working copy)
-@@ -651,6 +651,7 @@
- #else
-   AddInt(6, "videoscreen.vsync", 13105, DEFAULT_VSYNC, VSYNC_DISABLED, 1, VSYNC_DRIVER, SPIN_CONTROL_TEXT);
- #endif
-+  AddBool(7, "videoscreen.safefull", 13121, false);
-   AddCategory(7, "filelists", 14018);
-   AddBool(1, "filelists.hideparentdiritems", 13306, false);
-   AddBool(2, "filelists.hideextensions", 497, false);