From 2e95d41dfdf47a0e56f9af697108611214943357 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 4 Jun 2010 00:22:39 -0700
Subject: Bumped for 6.03.00.

---
 abs/core-testing/LinHES-config/LinHES-release | 2 +-
 abs/core-testing/LinHES-config/PKGBUILD       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release
index 8aec91b..6fc5aed 100644
--- a/abs/core-testing/LinHES-config/LinHES-release
+++ b/abs/core-testing/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R6.02.04 (Neighbors)
+LinHES R6.03.00 (M)
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 4318fd8..655d5c0 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.1
-pkgrel=38
+pkgrel=40
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -114,7 +114,7 @@ md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
          '4620f6f498ef4523398635cb0bd59425'
          '06188493e5ed79cb501d3c5694dee8ca'
          'e459ed069317bccb20351f037a9df3d2'
-         'ef8d83ae6a2b60645e034a278855d99e'
+         'e519c47ae24fb65799ec57a4a2050653'
          '6aff504ed5e860adc1b7317cd0780900'
          '55fccb1da0417a896b724f7cfc32dd5a'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
@@ -122,7 +122,7 @@ md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
          'a225143e3df6f56d451c2875e54ddbae'
          '687555968d4ca688d8f95c8f13e1d8d4'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
-         '37401edf67296d3a4467ad178958d177'
+         '5b41cfc6f4ad5cdbcd28cf980110f135'
          'ee7c8e1f025ce1527ecfffabafb26806'
          '41b03fb1e0a9d9ae7588e3b813212772'
          'a9ffe72c3ede99d505fdc97572a7c256'
-- 
cgit v0.12


From 6a763c676c7bf636b4e5d5ed8f5157d7691c8bb9 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 4 Jun 2010 00:23:04 -0700
Subject: linhes-scripts:added script to guide users to latest LinHES release.

---
 abs/core-testing/linhes-scripts/PKGBUILD          |   6 +-
 abs/core-testing/linhes-scripts/upgrade_linhes.sh | 139 ++++++++++++++++++++++
 2 files changed, 142 insertions(+), 3 deletions(-)
 create mode 100755 abs/core-testing/linhes-scripts/upgrade_linhes.sh

diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index c728d36..324b2f4 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=72
+pkgrel=73
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -36,7 +36,7 @@ linhes_update2.sh
 linhes_update3.sh
 install_hulu.sh
 update_schema_021_to_022.sh
-upgrade_to_0.22.sh
+upgrade_linhes.sh
 remove_php_mythvideo.sh
 removecommercials.sh
 system-cleanup.sh
@@ -81,7 +81,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'be324dba44ae96676973a74421944853'
          'c9dc0dd07369622879a000247ac55074'
          '65629302a4d2c3adf88cdf0ebc10d493'
-         'ea5492d4dab8271db20cb84416c001dc'
+         'dd25b07b02d48e336249a0c5dcaca07b'
          '87b0dc855181f98516acb18a7d551601'
          '25c1baeb97a49656456ae33f7e7a9f06'
          '2fb25aef03ffd1282414d8cca3df7056'
diff --git a/abs/core-testing/linhes-scripts/upgrade_linhes.sh b/abs/core-testing/linhes-scripts/upgrade_linhes.sh
new file mode 100755
index 0000000..1ce27a7
--- /dev/null
+++ b/abs/core-testing/linhes-scripts/upgrade_linhes.sh
@@ -0,0 +1,139 @@
+#!/bin/bash
+#Script to facilitate easy upgrade to latest LinHES.
+clear
+if [ "$(id -u)" != "0" ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+function pause(){
+	read -p "$*"
+}
+echo "The script will guide you thru the process of upgrading to the latest LinHES."
+pause 'Press <ENTER> to continue...'
+echo
+echo "Sync'n with the repos..."
+echo
+pacman -Sy &>/dev/null
+pacman -Qu > /tmp/linhes_upgrade
+if [ ! -s /tmp/linhes_upgrade ]
+then
+	echo "No upgrades found.  This could mean the repository is busy."
+	echo "Or your system is already up to date."
+	echo "If you have not upgrade, please try again later."
+	echo "Starting the backend."
+	sv start mythbackend &>/dev/null
+	exit 1
+fi
+if grep -E "Master|Stand" /etc/systemconfig &>/dev/null
+	then
+	echo "Stopping the backend."
+	sv stop mythbackend &>/dev/null
+fi
+if pacman -Qs mythvodka &>/dev/null
+	then
+	echo "Removing MythVodka if installed as it is no longer compatible with MythTV."
+	echo
+	pacman -R mythvodka &>/dev/null
+fi
+echo
+echo "Backing up Online Streams listings."
+echo
+cp /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.021
+echo "Removing mythcontrol, mythphone and mythsmolt if installed."
+echo
+if pacman -Qs mythcontrols &>/dev/null
+	then
+	pacman -R mythcontrols &>/dev/null
+fi
+if pacman -Qs mythphone &>/dev/null
+	then
+	pacman -R mythphone &>/dev/null
+fi
+if pacman -Qs mythsmolt &>/dev/null
+	then
+	pacman -R mythsmolt &>/dev/null
+fi
+if grep -q kernel26 /tmp/linhes_upgrade
+then
+	echo "Upgrading the kernel."
+	echo
+		if pacman -Qs v4l-dvb &>/dev/null
+		then
+		pacman -Sf --noconfirm kernel26 &>/dev/null && pacman -Sf --noconfirm v4l-dvb
+		else
+		pacman -S kernel26 --noconfirm &>/dev/null
+	fi
+fi
+if grep -q v4l-dvb /tmp/linhes_upgrade
+then
+	pacman -Sf --noconfirm v4l-dvb &>/dev/null
+fi
+echo "Checking for VDPAU packages and upgrading if needed."
+echo
+if pacman -Qs vdpinfo-71xx &>/dev/null
+	then
+	pacman -Rd vdpinfo-71xx &>/dev/null
+fi
+if pacman -Qs vdpinfo-96xx &>/dev/null
+	then
+	pacman -Rd vdpinfo-96xx &>/dev/null
+fi
+if pacman -Qs vdpinfo &>/dev/null
+	then
+	pacman -Rd vdpinfo &>/dev/null && pacman -S --noconfirm nvidia &>/dev/null && pacman -S --noconfirm vdpauinfo &>/dev/null
+fi
+echo "Performing complete system upgrade."
+echo "This may take some time depending on your connection speed."
+echo "Server bandwidth utilization will also have an affect."
+echo "Please be patient."
+echo
+pacman -Su --noconfirm &>/dev/null
+echo "Restoring Online Streams listings."
+echo
+cp /usr/share/mythtv/is.xml.021 /usr/share/mythtv/is.xml
+if grep -E "Master|Stand" /etc/systemconfig &>/dev/null
+	then
+	echo "Starting the backend.  This will automatically update the schema."
+	sv start mythbackend &>/dev/null
+	echo "I'll launch an xterm so you watch output backend log."
+	echo "Once the schema updates are complete, switch back to this xterm."
+	echo -e "\033[1mWhen you see \"Upgrading to MythTV schema version 1254\"\033[0m"
+	echo "You can switch back to this xterm."
+	echo -e "\033[1mNote:After pressing <ENTER>, I'll be asleep for 30 secs...\033[0m"
+	echo -e "\033[1mThis will give the schema time to upgrade.\033[0m"
+	pause 'Press <ENTER> to continue...'
+	xterm -fn *18* -e tail -f /var/log/mythtv/mythbackend.log &
+	#Sleeping for 30 seconds to give the schema time to upgrade....
+	sleep 30
+	read -p "Press <ENTER> to continue once the schema upgrade is complete."
+	echo
+	echo -e "\033[1mNow, the frontend will launch to update the schema for any plugins.\033[0m"
+	echo -e "\033[1mOnce the this is done, please exit the frontend.\033[0m"
+	pause 'Press <ENTER> to continue...'
+	xterm -e mythfrontend
+	echo
+	echo "Performing LinHES specific schema updates."
+	echo
+	/usr/LH/bin/update_schema_021_to_022.sh
+	cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg
+fi
+echo "All done!"
+echo -e "\033[5mThanks for choosing LinHES!\033[0m"
+if grep -q kernel26 /tmp/linhes_upgrade
+then
+	echo "The kernel was upgraded, we need to reboot."
+	pause "Press <ENTER> to reboot."
+	reboot
+else
+	if grep -q v4l-dvb /tmp/linhes_upgrade
+	then
+		echo "The V4L\DVB modules were upgraded."
+		pause "Press <ENTER> to reboot."
+		reboot
+	else
+	echo "Launching mythfrontend once again!"
+	echo "Enjoy the latest version!"
+	sleep 5
+	mythfrontend
+fi
+fi
-- 
cgit v0.12


From 28a1f97ea5cbe28b5810bcbc65e879313d24e534 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 4 Jun 2010 00:48:56 -0700
Subject: linhes-scripts:fixes in upgrade_linhes.sh.

---
 abs/core-testing/linhes-scripts/PKGBUILD          | 4 ++--
 abs/core-testing/linhes-scripts/upgrade_linhes.sh | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 324b2f4..f38006b 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=73
+pkgrel=74
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -81,7 +81,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'be324dba44ae96676973a74421944853'
          'c9dc0dd07369622879a000247ac55074'
          '65629302a4d2c3adf88cdf0ebc10d493'
-         'dd25b07b02d48e336249a0c5dcaca07b'
+         'f2062e52f593b6b177ea9b4ed9dc35f4'
          '87b0dc855181f98516acb18a7d551601'
          '25c1baeb97a49656456ae33f7e7a9f06'
          '2fb25aef03ffd1282414d8cca3df7056'
diff --git a/abs/core-testing/linhes-scripts/upgrade_linhes.sh b/abs/core-testing/linhes-scripts/upgrade_linhes.sh
index 1ce27a7..c463847 100755
--- a/abs/core-testing/linhes-scripts/upgrade_linhes.sh
+++ b/abs/core-testing/linhes-scripts/upgrade_linhes.sh
@@ -39,7 +39,7 @@ echo
 echo "Backing up Online Streams listings."
 echo
 cp /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.021
-echo "Removing mythcontrol, mythphone and mythsmolt if installed."
+echo "Removing mythcontrol and mythphone if installed."
 echo
 if pacman -Qs mythcontrols &>/dev/null
 	then
@@ -49,10 +49,6 @@ if pacman -Qs mythphone &>/dev/null
 	then
 	pacman -R mythphone &>/dev/null
 fi
-if pacman -Qs mythsmolt &>/dev/null
-	then
-	pacman -R mythsmolt &>/dev/null
-fi
 if grep -q kernel26 /tmp/linhes_upgrade
 then
 	echo "Upgrading the kernel."
@@ -87,7 +83,7 @@ echo "This may take some time depending on your connection speed."
 echo "Server bandwidth utilization will also have an affect."
 echo "Please be patient."
 echo
-pacman -Su --noconfirm &>/dev/null
+pacman -Suf --noconfirm &>/dev/null
 echo "Restoring Online Streams listings."
 echo
 cp /usr/share/mythtv/is.xml.021 /usr/share/mythtv/is.xml
-- 
cgit v0.12


From 45b5b5c70532fdb612e827b3fd4f5c2190c4cb8a Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 4 Jun 2010 01:05:58 -0700
Subject: mythappletrailers:latest trailer listing.

---
 abs/extra-testing/mythappletrailers/PKGBUILD       |   2 +-
 .../mythappletrailers/appletrailer.xml             | 406 +++++++++++----------
 2 files changed, 213 insertions(+), 195 deletions(-)

diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD
index 559d5eb..0c65c73 100644
--- a/abs/extra-testing/mythappletrailers/PKGBUILD
+++ b/abs/extra-testing/mythappletrailers/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=38
+pkgrel=39
 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/extra-testing/mythappletrailers/appletrailer.xml b/abs/extra-testing/mythappletrailers/appletrailer.xml
index a8aeaf3..9aa19f5 100644
--- a/abs/extra-testing/mythappletrailers/appletrailer.xml
+++ b/abs/extra-testing/mythappletrailers/appletrailer.xml
@@ -1,584 +1,602 @@
 <mythmenu name="TRAILERS">
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>44 Inch Chest</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/44inchchest/44inchchest_h640w.mov</action>
+		<text>Morning Glory</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/morningglory/morningglory-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Alice In Wonderland</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tlr1_h640w.mov</action>
+		<text>Scott Pilgrim vs. The World</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/scottpilgrim/scottpilgrim-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Alvin and the Chipmunks: the Squeakquel</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/alvinandthechipmunks2/alvinsqueekquel-tlrd_h640w.mov</action>
+		<text>Adjustment Bureau</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/adjustmentbureau/adjustmentbureau-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Avatar</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/avatar/avatar-tlrf_h640w.mov</action>
+		<text>Grease Sing-A-Long</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/greasesingalong/greasesingalong-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Babies</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/babies/babies-tlr1_h640w.mov</action>
+		<text>Solitary Man</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/solitaryman/solitaryman-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Back-up Plan</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thebackupplan/backupplan-tlr1_h640w.mov</action>
+		<text>Racing Dreams</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/racingdreams/racingdreams-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Beastly</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/beastly/beastly-tlr1_h640w.mov</action>
+		<text>Joan Rivers: A Piece of Work</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/joanriversapieceofwork/joanriversapieceofwork-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Bitch Slap</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/bitchslap/bitchslap-tlr1_h640w.mov</action>
+		<text>The Killer Inside Me</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/ifc_films/killerinsideme/killerinsideme-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Blind Side</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/theblindside/theblindside-tlr1_h640w.mov</action>
+		<text>You Again</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/youagain/youagain-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Book of Eli</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thebookofeli/bookofeli-tlr2_h640w.mov</action>
+		<text>Love Ranch</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/loveranch/loveranch-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Bounty Hunter</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/thebountyhunter/thebountyhunter-tlr1_h640w.mov</action>
+		<text>Charlie St. Cloud</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/charliestcloud/charliestcloud-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Brooklyn’s Finest</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/brooklynsfinest/brooklynsfinest-tlr1_h640w.mov</action>
+		<text>Step Up 3D</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/touchstone/stepup3d/stepup3d-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Cats and Dogs: the Revenge of Kitty Galore 3D</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/catsanddogs2/catsanddogs2-tlr1_h640w.mov</action>
+		<text>Secretariat</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/secretariat/secretariat-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Chloe</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/chloe/chloe-tlr1_h640w.mov</action>
+		<text>African Cats</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/africancats/africancats-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>City Island</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/cityisland/cityisland-tlr1_h640w.mov</action>
+		<text>Nowhere Boy</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/weinstein/nowhereboy/nowhereboy-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Clash of the Titans</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/clashofthetitans/clashofthetitans-tlr2_h640w.mov</action>
+		<text>Jonah Hex</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/weinstein/jonahhex/jonahhex-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Cop Out</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/copout/copout-tlr1_h640w.mov</action>
+		<text>Splice</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/splice/splice-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Crazies</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thecrazies/thecrazies-tlr2_h640w.mov</action>
+		<text>Winter's Bone</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/wintersbone/wintersbone-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Crazy Heart</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/crazyheart/crazyheart-tlr1_h640w.mov</action>
+		<text>Super 8</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/super8/super8-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Crazy On the Outside</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/crazyontheoutside/crazyontheoutside_h640w.mov</action>
+		<text>Piranha 3D</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/weinstein/piranha3d/piranha3d-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Cyrus</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/cyrus/cyrus-tlr1_h640w.mov</action>
+		<text>Gangster Paradise: Jerusalema</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/gangsterparadise/gangsterparadise-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Date Night</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/datenight/datenight-tlr1_h640w.mov</action>
+		<text>Waiting for Superman</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount_vantage/waitingforsuperman/waitingforsuperman-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Daybreakers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
+		<text>Survival of the Dead</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/survivalofthedead/survivalofthedead-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Dear John</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/dearjohn/dearjohn-tlr1_h640w.mov</action>
+		<text>Countdown to Zero</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/countdowntozero/countdowntozero-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Death At a Funeral</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/deathatafuneral/deathatafuneral-tlr1_h640w.mov</action>
+		<text>Nanny McPhee Returns</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/nannymcpheereturns/nannymcpheereturns-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Despicable Me</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/despicableme/despicableme-tlr3_h640w.mov</action>
+		<text>I Spit On Your Grave</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/ispitonyourgrave/ispitonyourgrave-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Diary of a Wimpy Kid</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/diaryofawimpykid/diaryofawimpykid-tlr1_h640w.mov</action>
+		<text>Buried</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/buried/buried-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>District 13: Ultimatum</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/district13ultimatum/district13-tlr1_h640w.mov</action>
+		<text>Lottery Ticket</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/lotteryticket/lotteryticket-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Eclipse</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/theeclipse/theeclipse-tlr2_h640w.mov</action>
+		<text>Get Low</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/getlow/getlow-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Edge of Darkness</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/edgeofdarkness/edgeofdarkness_h640w.mov</action>
+		<text>Princess Kaiulani</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/princesskaiulani/princesskaiulani-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Extraordinary Measures</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/extraordinarymeasures/extraordinarymeasures-tlr1_h640w.mov</action>
+		<text>The Twilight Saga: Eclipse</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/summit/twilightsagaeclipse/twilightsagaeclipse-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>From Paris With Love</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/frompariswithlove/frompariswithlove-tlr2_h640w.mov</action>
+		<text>8: The Mormon Proposition</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/8themormonproposition/8themormonproposition_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Frozen</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/frozen/frozen-tlr1_h640w.mov</action>
+		<text>Predators</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/predators/predators-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Furry Vengeance</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/furryvengeance/furryvengeance-tlr1_h640w.mov</action>
+		<text>Acts of Violence</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/actsofviolence/actsofviolence-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Get Him To the Greek</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/gethimtothegreek/gethimtothegreek-tlr_h640w.mov</action>
+		<text>The Disappearance of Alice Creed</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/thedisappearanceofalicecreed/disappearanceofalicecreed-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Ghost Writer</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/theghostwriter/theghostwriter-tlr1_h640w.mov</action>
+		<text>The Expendables</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/theexpendables/expendables-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Good Guy</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thegoodguy/thegoodguy-tlr1_h640w.mov</action>
+		<text>TiMER</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/timer/timer-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Green Zone</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/greenzone/greenzone-tlr1_h640w.mov</action>
+		<text>Paper Man</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/paperman/paperman-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Greenberg</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/greenberg/greenberg-tlr1_h640w.mov</action>
+		<text>Holy Rollers</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/holyrollers/holyrollers-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Grown Ups</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/grownups/grownups-tlr1_h640w.mov</action>
+		<text>Ondine</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/ondine/ondine-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Happy Tears</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/happytears/happytears-tlr1_h640w.mov</action>
+		<text>DCI 2010: The Countdown</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/dci2010thecountdown/dcicountdown-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Hot Tub Time Machine</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/mgm/hottubtimemachine/hottubtimemachine-tlr2_h640w.mov</action>
+		<text>The Other Guys</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/theotherguys/theotherguys-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>How To Train Your Dragon</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount_classics/howtotrainyourdragon/howtotrainyourdragon-tlr1_h640w.mov</action>
+		<text>The Kids Are All Right</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/focus_features/thekidsareallright/kidsarealright-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Hubble 3D</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/imax/hubble3d/hubble3d-tlr1_h640w.mov</action>
+		<text>Dinner for Schmucks</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/dinnerforschmucks/dinnerforschmucks-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Inception</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/inception/inception-tlr2_h640w.mov</action>
+		<text>Micmacs</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/micmacs/micmacs-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Iron Man 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/ironman2/ironman2-z7r459g-tlr1_h640w.mov</action>
+		<text>Coco Chanel and Igor Stravinsky</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/cocoandigor/cocoigor-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>It’s Complicated</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/itscomplicated/itscomplicated-tlr2r_h640w.mov</action>
+		<text>Casino Jack and the United States of Money</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/casinojack/casinojack-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Jackie Chan In Shinjuku Incident</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/jackiechaninshinjukuincident/shinjukuincident-tlr1_h640w.mov</action>
+		<text>I Am Love</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/iamlove/iamlove-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Karate Kid</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/karatekid/karatekid-tlr1_h640w.mov</action>
+		<text>Mother and Child</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/motherandchild/motherandchild-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Kick-Ass</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/kickass/kickass-tlr2_h640w.mov</action>
+		<text>Just Wright</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox_searchlight/justwright/justwright-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Knight and Day</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/knightandday/knightanday-tlr1_h640w.mov</action>
+		<text>In My Sleep</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/inmysleep/inmysleep_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Last Airbender</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/thelastairbender/thelastairbender-tlr1_h640w.mov</action>
+		<text>My Girlfriend's Boyfriend</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/mygirlfriendsboyfriend/mygirlfriendsboyfriend-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Last Station</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/thelaststation/thelaststation-tlr2_h640w.mov</action>
+		<text>Wild Grass</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/wildgrass/wildgrass-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Leap Year</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/leapyear/leapyear-tlr1b_h640w.mov</action>
+		<text>Eat Pray Love</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/eatpraylove/eatpraylove-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Leaves of Grass</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/leavesofgrass/leavesofgrass-tlr_h640w.mov</action>
+		<text>The Secret In Their Eyes</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/thesecretintheireyes/thesecretintheireyes-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Legion</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
+		<text>The Switch</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/miramax/theswitch/theswitch-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Letters To Juliet</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/letterstojuliet/letterstojuliet-tlr1_h640w.mov</action>
+		<text>Harry Brown</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/harrybrown/harrybrown-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Losers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thelosers/thelosers-tlr1_h640w.mov</action>
+		<text>Please Give</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/pleasegive/pleasegive-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Loss of a Teardrop Diamond</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thelossofateardropdiamond/lossofateardropdiamond-tlr1_h640w.mov</action>
+		<text>Touching Home</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/touchinghome/touchinghome-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>MacGruber</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/macgruber/macgruber-tlr1_h640w.mov</action>
+		<text>Hey Hey It's Esther Blueburger </text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/heyheyitsestherblueburger/heyhey-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Men Who Stare At Goats</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/overture/themenwhostareatgoats/themenwhostareatgoats_h640w.mov</action>
+		<text>The Good Heart</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/thegoodheart/thegoodheart-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Mother</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/mother/mother-tlr1_h640w.mov</action>
+		<text>Killers</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/killers/killers-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Multiple Sarcasms</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/multiplesarcasms/multiplesarcasms-tlr1_h640w.mov</action>
+		<text>Get Him To The Greek</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/gethimtothegreek/gethimtothegreek-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>A Nightmare On Elm Street</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/anightmareonelmstreet/nightmareonelmstreet-tlr1_h640w.mov</action>
+		<text>The A-Team</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/theateam/ateam-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Oceans</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
+		<text>Alice In Wonderland</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Our Family Wedding</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/ourfamilywedding/ourfamilywedding-tlr1_h640w.mov</action>
+		<text>Avatar</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/avatar/avatar-tlrf_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Percy Jackson  the Olympians: Lightning Thief</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/lightningthief/percyjackson-tlrf_h640w.mov</action>
+		<text>Babies</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/focus_features/babies/babies-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Preacher’s Kid</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/preacherskid/preacherskid-tlr1_h640w.mov</action>
+		<text>The Back-up Plan</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/thebackupplan/backupplan-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Prince of Persia: the Sands of Time</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/princeofpersia/princeofpersia-tlr1_h640w.mov</action>
+		<text>Beastly</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/beastly/beastly-tlr1b_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Princess and the Frog</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
+		<text>Cats and Dogs: The Revenge of Kitty Galore 3D</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/catsanddogs2/catsanddogs2-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>A Prophet (Un Prophete)</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/aprophet/aprophet-tlr1_h640w.mov</action>
+		<text>Cyrus</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox_searchlight/cyrus/cyrus-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Remember Me</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/rememberme/rememberme-tlrl_h640w.mov</action>
+		<text>Date Night</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/datenight/datenight-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Repo Men</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/repoman/repoman-tlr1_h640w.mov</action>
+		<text>Despicable Me</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/despicableme/despicableme-tlr5i_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Robin Hood</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/robinhood/robinhood-tlr1_h640w.mov</action>
+		<text>Furry Vengeance</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/summit/furryvengeance/furryvengeance-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Saint John of Las Vegas</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/saintjohnoflasvegas/saintjohnoflasvegas-tlr1b_h640w.mov</action>
+		<text>Grown Ups</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/grownups/grownups-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Salt</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/salt/salt-tlr1_h640w.mov</action>
+		<text>Hot Tub Time Machine</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/mgm/hottubtimemachine/hottubtimemachine-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Season of the Witch</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/seasonofthewitch/seasonofthewitch-tlr1_h640w.mov</action>
+		<text>How To Train Your Dragon</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/dreamworks/howtotrainyourdragon/howtotrainyourdragon-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Sex and the City 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/sexandthecity2/sexandthecity2-tlr1_h640w.mov</action>
+		<text>Hubble 3D</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/imax/hubble3d/hubble3d-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>She’s Out of My League</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/dreamworks/shesoutofmyleague/shesoutofmyleague-tlr1_h640w.mov</action>
+		<text>Inception</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/inception/inception-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Shrek Forever After</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/dreamworks/shrekforeverafter/shrek4_tlr1_h640w.mov</action>
+		<text>Iron Man 2</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/ironman2/ironman2-34rgrwt9-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Shutter Island</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/shutterisland/shutterisland-tlr1r2r_h640w.mov</action>
+		<text>Karate Kid</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/karatekid/karatekid-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Sorcerer’s Apprentice</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/thesorcerersapprentice/sorcerersapprentice-tlr1_h640w.mov</action>
+		<text>Knight and Day</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/knightandday/knightandday-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Spy Next Door</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/spynextdoor/spynextdoor-tlr1_h640w.mov</action>
+		<text>The Last Airbender</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/thelastairbender/lastairbender-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Takers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/takers/takers-tlr1_h640w.mov</action>
+		<text>Letters To Juliet</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/summit/letterstojuliet/letterstojuliet-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>To Save a Life</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/tosavealife/tosavealife-tlr1_h640w.mov</action>
+		<text>The Losers</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/thelosers/thelosers-tlr1b_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Tooth Fairy</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/thetoothfairy/toothfairy-tlr_h640w.mov</action>
+		<text>MacGruber</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/macgruber/macgruber-tlr4_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Toy Story 3</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/toystory3/toystory3-tlr3_h640w.mov</action>
+		<text>Multiple Sarcasms</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/multiplesarcasms/multiplesarcasms-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Twilight Saga: New Moon</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/newmoon/newmoon-tlr3_h640w.mov</action>
+		<text>A Nightmare On Elm Street</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/newline/anightmareonelmstreet/nightmareonelmstreet-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Tyler Perry’s Why Did I Get Married Too</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/whydidigetmarriedtoo/whydidigetmarriedtoo-tlr2_h640w.mov</action>
+		<text>Oceans</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Up In the Air</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/upintheair/upintheair-tlr3_h640w.mov</action>
+		<text>Prince of Persia: the Sands of Time</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/princeofpersia/princeofpersia-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Valentine’s Day</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/valentinesday/valentinesday-tlr1_h640w.mov</action>
+		<text>Robin Hood</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/robinhood/robinhood-tlr3_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Salt</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/salt/salt-tlr2_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Sex and the City 2</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/sexandthecity2/sexandthecity2-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Warlords</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/warlords/warlords-tlr1_h640w.mov</action>
+		<text>Shrek Forever After</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/dreamworks/shrekforeverafter/shrek4-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>When In Rome</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/touchstone/wheninrome/wheninrome-tlr2_h640w.mov</action>
+		<text>Shutter Island</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/shutterisland/shutterisland-tlr1r2r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Wolfman</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/thewolfman/wolfman-tlr2_h640w.mov</action>
+		<text>The Sorcerer's Apprentice</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/thesorcerersapprentice/sorcerersapprentice-tlr2_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Toy Story 3</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/toystory3/toystory3-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Wonderful World</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/wonderfulworld/wonderfulworld-tlr1_h640w.mov</action>
+		<text>Tron Legacy</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/tronlegacy/tronlegacy-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Yellow Handkerchief</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theyellowhandkerchief/yellowhandkerchief-tlr1_h640w.mov</action>
+		<text>Tyler Perry's Why Did I Get Married Too</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/whydidigetmarriedtoo/whydidigetmarriedtoo-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Youth In Revolt</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/youthinrevolt/youthinrevolt-tlr2_h640w.mov</action>
+		<text>Wall Street: Money Never Sleeps</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/wallstreetmoneyneversleeps/wallstreet-tlrf_h640w.mov</action>
 	</button>
 
 </mythmenu>
-- 
cgit v0.12


From d19a8085a8b022fd61e231843a36a9075d7712c0 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 4 Jun 2010 01:50:11 -0700
Subject: linhes-scripts:update upgrade_linhes.sh to close bug 690.

---
 abs/core-testing/linhes-scripts/PKGBUILD          | 4 ++--
 abs/core-testing/linhes-scripts/upgrade_linhes.sh | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index f38006b..377cb60 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=74
+pkgrel=75
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -81,7 +81,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'be324dba44ae96676973a74421944853'
          'c9dc0dd07369622879a000247ac55074'
          '65629302a4d2c3adf88cdf0ebc10d493'
-         'f2062e52f593b6b177ea9b4ed9dc35f4'
+         '2734054f08c4c885bb9070dce239d4c3'
          '87b0dc855181f98516acb18a7d551601'
          '25c1baeb97a49656456ae33f7e7a9f06'
          '2fb25aef03ffd1282414d8cca3df7056'
diff --git a/abs/core-testing/linhes-scripts/upgrade_linhes.sh b/abs/core-testing/linhes-scripts/upgrade_linhes.sh
index c463847..91a46e6 100755
--- a/abs/core-testing/linhes-scripts/upgrade_linhes.sh
+++ b/abs/core-testing/linhes-scripts/upgrade_linhes.sh
@@ -112,6 +112,7 @@ if grep -E "Master|Stand" /etc/systemconfig &>/dev/null
 	echo
 	/usr/LH/bin/update_schema_021_to_022.sh
 	cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg
+	/usr/LH/bin/mythwelcome-config.py
 fi
 echo "All done!"
 echo -e "\033[5mThanks for choosing LinHES!\033[0m"
-- 
cgit v0.12


From d08fd71d3b4f574be097698e4255b839cf226877 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sun, 6 Jun 2010 13:57:41 -0700
Subject: mre:initial inclusion.  Recorder extender for sporting events.

---
 abs/extra-testing/community/mre/PKGBUILD         |  41 ++++
 abs/extra-testing/community/mre/livescores.tgz   | Bin 0 -> 39586 bytes
 abs/extra-testing/community/mre/mre-1.1.2.tar.gz | Bin 0 -> 19685 bytes
 abs/extra-testing/community/mre/mre.install      |  20 ++
 abs/extra-testing/community/mre/mre.lr           |   9 +
 abs/extra-testing/community/mre/patch.diff       | 273 +++++++++++++++++++++++
 abs/extra-testing/community/mre/run              |  10 +
 7 files changed, 353 insertions(+)
 create mode 100644 abs/extra-testing/community/mre/PKGBUILD
 create mode 100644 abs/extra-testing/community/mre/livescores.tgz
 create mode 100644 abs/extra-testing/community/mre/mre-1.1.2.tar.gz
 create mode 100755 abs/extra-testing/community/mre/mre.install
 create mode 100644 abs/extra-testing/community/mre/mre.lr
 create mode 100644 abs/extra-testing/community/mre/patch.diff
 create mode 100755 abs/extra-testing/community/mre/run

diff --git a/abs/extra-testing/community/mre/PKGBUILD b/abs/extra-testing/community/mre/PKGBUILD
new file mode 100644
index 0000000..72d3bc3
--- /dev/null
+++ b/abs/extra-testing/community/mre/PKGBUILD
@@ -0,0 +1,41 @@
+arch=('i686')
+pkgname=mre
+pkgver=1.1.2
+pkgrel=2
+_kernver=2.6.28-LinHES
+pkgdesc="Myth Recording Extender"
+url="http://sourceforge.net/projects/mythtv-tools/"
+license=('GPL-2')
+depends=('PearDB' 'PearLog')
+makedepends=()
+source=('mre-1.1.2.tar.gz' 'patch.diff' 'livescores.tgz' 'run' 'mre.lr')
+install=('mre.install')
+
+build() {
+	cd $startdir/src/mre-1.1.2/
+	patch -p0 < ../patch.diff
+	./configure
+	make INST_ROOT=$startdir/pkg install
+	cp $startdir/src/mre-1.1.2/conf/mre.conf $startdir/pkg/etc/mre.conf
+	cp $startdir/src/mre-1.1.2/test/test_title_subtitle.php\
+       		$startdir/pkg/usr/local/bin/
+	chmod a+x $startdir/pkg/usr/local/bin/test_title_subtitle.php
+	rm -r $startdir/pkg/etc/init.d
+	mkdir -p  $startdir/pkg/var/log/mre
+	touch $startdir/pkg/var/log/mre/mre.log
+	chown mythtv:mythtv "$startdir/pkg/var/log/mre/mre.log"
+	mkdir -p $startdir/pkg/etc/sv/mre
+	cp $startdir/src/run $startdir/pkg/etc/sv/mre/run
+	mkdir -p $startdir/pkg/etc/logrotate.d
+	cp $startdir/src/mre.lr $startdir/pkg/etc/logrotate.d/mre.lr
+	mkdir -p $startdir/pkg/data/srv/http/htdocs/
+	cp -r $startdir/src/scores /$startdir/pkg/data/srv/http/htdocs/
+	chown -R http:users "$startdir/pkg/data/srv/http/htdocs/scores"
+}
+
+
+md5sums=('8ab312e7597ae9413a57bd5e9a068096'
+         'd2591989da512c0faa567408721b6e95'
+         'fcc02a234b22ba5c2714a6b8dbaf3bef'
+         'dea22d4e0f2c1dd8a2debd2f50756dda'
+         '6d71ab57afd974c5130c994b94e8746f')
diff --git a/abs/extra-testing/community/mre/livescores.tgz b/abs/extra-testing/community/mre/livescores.tgz
new file mode 100644
index 0000000..d97175b
Binary files /dev/null and b/abs/extra-testing/community/mre/livescores.tgz differ
diff --git a/abs/extra-testing/community/mre/mre-1.1.2.tar.gz b/abs/extra-testing/community/mre/mre-1.1.2.tar.gz
new file mode 100644
index 0000000..3846e4b
Binary files /dev/null and b/abs/extra-testing/community/mre/mre-1.1.2.tar.gz differ
diff --git a/abs/extra-testing/community/mre/mre.install b/abs/extra-testing/community/mre/mre.install
new file mode 100755
index 0000000..4e3fb0d
--- /dev/null
+++ b/abs/extra-testing/community/mre/mre.install
@@ -0,0 +1,20 @@
+# arg 1:  the new package version
+post_install() {
+	add_service.sh mre
+	sed -i.pacsave '/^open_basedir/s|$|:/var/log/mre:/usr/local/lib/mre|' /etc/php/php.ini
+}
+
+post_upgrade() {
+
+}
+
+
+# arg 1:  the old package version
+post_remove() {
+	remove_service.sh mre
+	sed -i.pacsave '/^open_basedir/s|:/var/log/mre:/usr/local/lib/mre||' /etc/php/php.ini
+}
+
+op=$1
+shift
+$op $*
diff --git a/abs/extra-testing/community/mre/mre.lr b/abs/extra-testing/community/mre/mre.lr
new file mode 100644
index 0000000..3b54c23
--- /dev/null
+++ b/abs/extra-testing/community/mre/mre.lr
@@ -0,0 +1,9 @@
+/var/log/mre/mre.log {
+	copytruncate
+	daily
+	size 10M
+	missingok
+	rotate 7
+	compress
+	notifempty
+}
diff --git a/abs/extra-testing/community/mre/patch.diff b/abs/extra-testing/community/mre/patch.diff
new file mode 100644
index 0000000..66390d9
--- /dev/null
+++ b/abs/extra-testing/community/mre/patch.diff
@@ -0,0 +1,273 @@
+--- ../mre-1.1.2/class/MythClient.php.original	2006-04-05 17:39:13.000000000 -0500
++++ ../mre-1.1.2/class/MythClient.php	2010-05-14 10:16:54.000000000 -0500
+@@ -112,7 +112,7 @@
+          return '0';
+       }
+       foreach($out as $line)
+-         if(preg_match('/^Library API version: (.*)$/', $line, $matches))
++         if(preg_match('/^Library API *: (.*)$/', $line, $matches))
+             return $matches[1];
+       return '0';
+    }
+--- ../mre-1.1.2/class/NHLEvent.php.original	2006-11-05 17:06:57.000000000 -0600
++++ ../mre-1.1.2/class/NHLEvent.php	2010-05-21 00:44:49.000000000 -0500
+@@ -27,7 +27,7 @@
+    /**
+     * URL to grab game info from
+     */
+-   const url = 'http://scores.espn.go.com/nhl/scoreboard';
++   const url = 'http://localhost/scores/nhl.php';
+ 
+    /**
+     * Class constructor.
+@@ -39,32 +39,27 @@
+       parent::__construct();
+ 
+       $criteria = $this->generateSearchTerms($gameInfo);
++      
+       if(!sizeof($criteria))
+          trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING);
+       else
+       {
+          $data = file(self::url);
+-         if($data !== FALSE)
+-            foreach($criteria as $term)
+-            {
+-               $status = '';
+-               foreach($data as $line)
+-                  if(preg_match('/' . preg_quote($term) . '/', $line))
+-                  {
+-                     $status = $line;
+-                     break;
+-                  }
+-               if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match))
+-               {
+-                  $this->setStatus($match[1]);
+-                  if(preg_match('/^Final/', $match[1]))
+-                     $this->setEventOver(TRUE);
+-                  else
+-                     $this->setEventOver(FALSE);
+-                  $this->setValid(TRUE);
+-                  break;
+-               }
++         if($data)
++         {
++            foreach($data as $line)
++	    {
++               if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
++	       {
++		  if(strpos($line,'FINAL')) 
++		     $this->setEventOver(TRUE);
++		  else
++		     $this->setEventOver(FALSE);
++		  $this->setValid(TRUE);
++		  break;
++	       }
+             }
++         }
+       }
+       if(!$this->isValid())
+          trigger_error("Unable to find NHL info for '$gameInfo'!  The NHL parser may need to be updated.", E_USER_WARNING);
+--- ../mre-1.1.2/conf/mre.conf.in.original	2006-08-13 16:48:57.000000000 -0500
++++ ../mre-1.1.2/conf/mre.conf.in	2010-05-04 00:25:26.000000000 -0500
+@@ -28,9 +28,9 @@
+ ; *** Application settings
+ ; Unprivledged user to run as, if started as root
+ ; This script will not run as root
+-user = nobody
++user = mythtv
+ ; Run MRE as daemon?  Requires pcntl_* functions built into PHP
+-daemon = true
++daemon = false
+ ; Number of minutes to sleep between runs
+ sleep = 5
+ ; Logging level (0 = normal, 1 = +error, 2 = +warning, 3 = +debug)
+--- ../mre-1.1.2/class/MLBEvent.php.original	2006-11-05 17:06:57.000000000 -0600
++++ ../mre-1.1.2/class/MLBEvent.php	2010-05-21 20:08:30.000000000 -0500
+@@ -27,7 +27,7 @@
+    /**
+     * URL to grab game info from
+     */
+-   const url = 'http://scores.espn.go.com/mlb/scoreboard';
++   const url = 'http://localhost/scores/mlb.php';
+ 
+    /**
+     * Class constructor.
+@@ -43,41 +43,22 @@
+          trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING);
+       else
+       {
+-         $data = file(self::url);
+-         $games = array();
+-         if($data !== FALSE)
+-         {
+-            // Split the huge string into individual game data
+-            foreach($data as $line)
+-               if(preg_match('/\<div id="allGames".*\>.*/', $line))
+-               {
+-                  while(($loc = strrpos($line, 'teamTop')) !== FALSE)
+-                  {
+-                     $games[] = substr($line, $loc);
+-                     $line = substr($line, 0, $loc);
+-                  }
+-                  break;
+-               }
+-            if(!sizeof($games))
+-               trigger_error("Unable to find valid game data within source!", E_USER_WARNING);
+-            foreach($criteria as $term)
+-            {
+-               foreach($games as $game)
+-               {
+-                  if(preg_match('/' . preg_quote($term) . '/', $game))
+-                     if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches))
+-                     {
+-                        $this->setStatus($matches[1]);
+-                        if(preg_match('/^(Final|Postponed)/', $matches[1]))
+-                           $this->setEventOver(TRUE);
+-                        else
+-                           $this->setEventOver(FALSE);
+-                        $this->setValid(TRUE);
+-                        break 2;
+-                     }
+-               }
++	 $data = file(self::url);
++         if($data)
++	 {
++	    foreach($data as $line)
++      	    {
++               if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
++   	       {
++     		  if((strpos($line,'FINAL'))or(strpos($line,'Postponed'))) 
++ 		     $this->setEventOver(TRUE);
++  		  else
++  		     $this->setEventOver(FALSE);
++  		  $this->setValid(TRUE);
++  		  break;
++  	       }
+             }
+-         }
++	 }
+       }
+       if(!$this->isValid())
+          trigger_error("Unable to find MLB info for '$gameInfo'!  The MLB parser may need to be updated.", E_USER_WARNING);
+--- ../mre-1.1.2/class/NBAEvent.php.original	2006-11-05 17:06:57.000000000 -0600
++++ ../mre-1.1.2/class/NBAEvent.php	2010-05-21 21:15:42.000000000 -0500
+@@ -27,7 +27,7 @@
+    /**
+     * URL to grab game info from
+     */
+-   const url = 'http://scores.espn.go.com/nba/scoreboard';
++   const url = 'http://localhost/scores/nba.php';
+ 
+    /**
+     * Class constructor.
+@@ -44,35 +44,21 @@
+       else
+       {
+          $data = file(self::url);
+-         if($data !== FALSE)
+-            foreach($criteria as $term)
+-            {
+-               $status = '';
+-               $i = 0;
+-               while($i < sizeof($data))
+-               {
+-                  if(preg_match('/' . preg_quote($term) . '/', $data[$i]))
+-                  {
+-                     $status = $data[$i];
+-                     break;
+-                  }
+-                  ++$i;
+-               }
+-               if($i == sizeof($data))
+-                  --$i;
+-
+-               if(preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i], $match) ||
+-                  preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i-1], $match))
+-               {
+-                  $this->setStatus($match[1]);
+-                  if(preg_match('/^Final/', $match[1]))
+-                     $this->setEventOver(TRUE);
+-                  else
+-                     $this->setEventOver(FALSE);
+-                  $this->setValid(TRUE);
+-                  break;
+-               }
++         if($data)
++         {
++            foreach($data as $line)
++      	    {
++               if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
++  	       {
++       		  if(strpos($line,'FINAL')) 
++ 		     $this->setEventOver(TRUE);
++  		  else
++  		     $this->setEventOver(FALSE);
++  		  $this->setValid(TRUE);
++ 		  break;
++  	       }
+             }
++         }
+       }
+       if(!$this->isValid())
+          trigger_error("Unable to find NBA info for '$gameInfo'!  The NBA parser may need to be updated.", E_USER_WARNING);
+--- ../mre-1.1.2/class/NFLEvent.php.original	2006-11-05 17:06:57.000000000 -0600
++++ ../mre-1.1.2/class/NFLEvent.php	2010-05-21 19:09:36.000000000 -0500
+@@ -27,7 +27,7 @@
+    /**
+     * URL to grab game info from
+     */
+-   const url = 'http://scores.espn.go.com/nfl/scoreboard';
++   const url = 'http://localhost/scores/nfl.php';
+ 
+    /**
+     * Class constructor.
+@@ -44,33 +44,21 @@
+       else
+       {
+          $data = file(self::url);
+-         $games = array();
+-         if($data !== FALSE)
+-         {
+-            // Split the huge string into individual game data
+-            foreach($data as $line)
+-               if(preg_match('/\<td class="teamTop.*".*\>.*/', $line))
+-                  $games[] = $line;
+-            if(!sizeof($games))
+-               trigger_error("Unable to find valid game data within source!", E_USER_WARNING);
+-            foreach($criteria as $term)
+-            {
+-               foreach($games as $game)
+-               {
+-                  if(preg_match('/' . preg_quote($term) . '/', $game))
+-                     if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches))
+-                     {
+-                        $this->setStatus($matches[1]);
+-                        if(preg_match('/^(Final|Postponed)/', $matches[1]))
+-                           $this->setEventOver(TRUE);
+-                        else
+-                           $this->setEventOver(FALSE);
+-                        $this->setValid(TRUE);
+-                        break 2;
+-                     }
+-               }
+-            }
+-         }
++	 if($data)
++	 {
++	    foreach($data as $line)
++	    {
++               if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
++	       {
++		  if(strpos($line,'FINAL'))
++		     $this->setEventOver(TRUE);
++		  else
++		     $this->setEventOver(FALSE);
++		  $this->setValid(TRUE);
++		  break;
++	       }
++	    }
++	 }
+       }
+       if(!$this->isValid())
+          trigger_error("Unable to find NFL info for '$gameInfo'!  The NFL parser may need to be updated.", E_USER_WARNING);
diff --git a/abs/extra-testing/community/mre/run b/abs/extra-testing/community/mre/run
new file mode 100755
index 0000000..84d08e5
--- /dev/null
+++ b/abs/extra-testing/community/mre/run
@@ -0,0 +1,10 @@
+#!/bin/bash
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting mythrecordingextender"
+
+sv start mythbackend || exit 1
+sleep 5
+
+exec /usr/local/bin/mre.php
-- 
cgit v0.12


From 8dcd1d7ecd09581bc1e0d67898be273048989e26 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sun, 6 Jun 2010 13:58:03 -0700
Subject: peardb:initial inclusion. dep for mre.

---
 abs/extra-testing/community/peardb/PKGBUILD | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 abs/extra-testing/community/peardb/PKGBUILD

diff --git a/abs/extra-testing/community/peardb/PKGBUILD b/abs/extra-testing/community/peardb/PKGBUILD
new file mode 100755
index 0000000..dafe00f
--- /dev/null
+++ b/abs/extra-testing/community/peardb/PKGBUILD
@@ -0,0 +1,22 @@
+arch=('i686')
+pkgname=PearDB
+pkgver=1.7.13
+pkgrel=1
+_kernver=2.6.28-LinHES
+pkgdesc="Pear Database Abstraction Layer"
+url="http://pear.php.net/"
+license=('GPL-2')
+source=('http://download.pear.php.net/package/DB-1.7.13.tgz')
+#install=('')
+
+build() {
+	mkdir -p $startdir/pkg/usr/share/pear/
+	cp -r $startdir/src/DB-$pkgver/DB* $startdir/pkg/usr/share/pear/
+	mkdir -p $startdir/pkg/usr/share/pear/docs/DB/
+	cp -r $startdir/src/DB-$pkgver/doc/* $startdir/pkg/usr/share/pear/docs/DB/
+	mkdir -p $startdir/pkg/usr/share/pear/tests/DB/
+	cp -r $startdir/src/DB-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/DB/
+
+	}
+
+md5sums=('39b451245941a7059511a852f18b4946')
-- 
cgit v0.12


From 35023198b8846a8e9831da94d3bb64e77e316147 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sun, 6 Jun 2010 13:58:11 -0700
Subject: pearlog:initial inclusion. dep for mre.

---
 abs/extra-testing/community/pearlog/PKGBUILD | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100755 abs/extra-testing/community/pearlog/PKGBUILD

diff --git a/abs/extra-testing/community/pearlog/PKGBUILD b/abs/extra-testing/community/pearlog/PKGBUILD
new file mode 100755
index 0000000..5bc4ccc
--- /dev/null
+++ b/abs/extra-testing/community/pearlog/PKGBUILD
@@ -0,0 +1,25 @@
+arch=('i686')
+pkgname=PearLog
+pkgver=1.12.0
+pkgrel=1
+_kernver=2.6.28-LinHES
+pkgdesc="Pear Logging Framework"
+url="http://pear.php.net/"
+license=('GPL-2')
+source=('http://download.pear.php.net/package/Log-1.12.0.tgz')
+#install=('')
+
+build() {
+	mkdir -p $startdir/pkg/usr/share/pear/
+	cp -r $startdir/src/Log-$pkgver/Log* $startdir/pkg/usr/share/pear/
+	mkdir -p $startdir/pkg/usr/share/pear/docs/Log
+	cp -r $startdir/src/Log-$pkgver/docs/* $startdir/pkg/usr/share/pear/docs/Log/
+	mkdir -p $startdir/pkg/usr/share/pear/examples/Log
+	cp -r $startdir/src/Log-$pkgver/examples/* $startdir/pkg/usr/share/pear/examples/Log/
+	mkdir -p $startdir/pkg/usr/share/pear/misc/Log
+	cp -r $startdir/src/Log-$pkgver/misc/* $startdir/pkg/usr/share/pear/misc/Log/
+	mkdir -p $startdir/pkg/usr/share/pear/tests/Log
+	cp -r $startdir/src/Log-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/Log/
+	}
+
+md5sums=('7fe68920afc4b122cb15aba40d735cb6')
-- 
cgit v0.12

