Merge remote-tracking branch 'origin/testing' into testing

# By Cecil (6) and Britney Fransen (2)
# Via Britney Fransen (1) and Cecil (1)
* origin/testing:
  LinHES-system: myth_status.py: fix conflicted recordings
  mythtv: bump to latest fixes to get python bindings fix
  pyxis:Initial inclusion. Needed for pyxis to close #63/4).
  python-distribute:Needed for python-beautifulsoup (to close #63/4).
  python-beautifulsoup4:Needed for pyxis (to close #63/4).
  python-libconcord:Moved to core with rest of python modules.
  gdb:Recompile against Python 2.6. Closes 850.
  mythappletrailers:Closes 849. Adds Play All, Shuffle and Play Random trailer to the menu.

Conflicts were set to 64 bit versions, except for appletrailers

Conflicts:
	abs/core/LinHES-system/PKGBUILD
	abs/core/gdb/PKGBUILD
	abs/core/gdb/__changelog
	abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
	abs/core/python_modules/python-distribute/PKGBUILD
	abs/core/python_modules/python-distribute/__changelog
	abs/extra/mythappletrailers/PKGBUILD

1 files changed, 19 insertions, 15 deletions

diff --git a/abs/extra/mythappletrailers/PKGBUILD b/abs/extra/mythappletrailers/PKGBUILD
index e82e49a..57b6b72 100644
--- a/abs/extra/mythappletrailers/PKGBUILD
+++ b/abs/extra/mythappletrailers/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=42
+pkgrel=45
 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -11,17 +11,16 @@ url="http://www.mythtv.org/wiki/index.php/Myth_Apple_Trailers"
 depends=('php' 'mythtv' 'mplayer-wrapper')
 install=mythappletrailers.install
 source=('myth_trailers_grabber' 'appletrailer.xml'
-'trailers' 'loading.sh' 'fix_aple_url.sh' 'appletrailers_is.conf')
-. /usr/MythVantage/bin/install_functions.sh
+'trailers' 'loading.sh' 'fix_aple_url.sh'
+'play_trailer.sh' 'gen_trailer_menu.sh' 'all_trailers' 'shuffle_trailers')
+
 build() {
-   #This bit of code is used to determine where mythhome is located
-  home_check
   mkdir -p $startdir/pkg/usr/bin
   mkdir -p $startdir/pkg/etc/cron.daily
-  mkdir -p $startdir/pkg/$MYTHHOME
+  mkdir -p $startdir/pkg/home/mythtv/
   mkdir -p $startdir/pkg/usr/share/mythtv/
-  cp appletrailer.xml  $startdir/pkg/$MYTHHOME/appletrailer.xml
-  chown 1000:1000 $startdir/pkg/$MYTHHOME/appletrailer.xml
+  cp appletrailer.xml  $startdir/pkg/home/mythtv/appletrailer.xml
+  chown 1000:1000 $startdir/pkg/home/mythtv/appletrailer.xml
   chmod 755 trailers
   chmod 755 myth_trailers_grabber
   chmod 755 loading.sh 
@@ -29,13 +28,18 @@ build() {
   cp loading.sh $startdir/pkg/usr/bin/
   cp trailers $startdir/pkg/etc/cron.daily/
   install -m755 $srcdir/fix_aple_url.sh $pkgdir/usr/bin
-  #add in file for gen_is.xml
-  install -D -m0744 ${srcdir}/appletrailers_is.conf ${pkgdir}/etc/gen_is_xml.d/appletrailers_is.conf
-
+  install -m755 $srcdir/play_trailer.sh $pkgdir/usr/bin
+  install -m755 $srcdir/gen_trailer_menu.sh $pkgdir/usr/bin
+  install -m644 $srcdir/all_trailers $pkgdir/home/mythtv
+  install -m644 $srcdir/shuffle_trailers $pkgdir/home/mythtv
+  chown 1000:1000 $startdir/pkg/home/mythtv/*_trailers
 }
 md5sums=('336e68953d0e1e8a0c7a4990f8d43a2b'
-         'c7da92600afe2a3b1f564764500315a0'
-         '5fdd4aa17b9c1e77b272437ae42a1827'
-         'aff3d1ce845ce8364d336032788118f7'
+         'be0d071981e5536f24aaf67545a96cc5'
+         'a508f2de763f5bec5b4549885c062c8a'
+         'ece3c5f8a605b6e2270c6f7671705631'
          'a2349f844e47fd95a672739177ca44ff'
-         '341eb4f98b70b51b9420f58051c8df6a')
+         '14f153c1efa7ae4e192d87010cbf9f7c'
+         '3e9d8014a0e76e2cf8057291d20c9291'
+         '7af1e58dfab2772dbb6f339481ae8d5d'
+         'd26681921482cbf334b43f700adf0d29')