LinHES-system: move get_airplay_key, importfile.sh, myth2mkv, myth2mp3, and ripD_eject.sh from linhes-scripts

7 files changed, 14 insertions, 18 deletions

diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 03e5eca..ee79c88 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=8.0
-pkgrel=13
+pkgrel=14
 arch=('i686' 'x86_64')
 install=system.install
 pkgdesc="Everything that makes LinHES an automated system"
@@ -8,12 +8,13 @@ license=('GPL2')
 depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
         'python_aosd' 'udisks' 'LinHES-config>=2.3-59' 'sudo'
         'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu'
-        'ethtool' 'gnu-netcat')
+        'ethtool' 'gnu-netcat' 'normalize'
+        'handbrake-cli' 'mkvtoolnix' 'mplayer')
 backup=('etc/modprobe.d/alsa-base.conf')
 binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
  LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
  mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh
- install_supplemental_service.sh
+ install_supplemental_service.sh get_airplay_key importfiles.sh
  lh_system_backup lh_system_backup_job lh_system_restore_job
  lh_system_host_update lh_system_all_host_update
  add_storage.py diskspace.sh cacheclean lh_backend_control.sh
@@ -23,7 +24,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
  misc_upcoming_recordings.pl misc_which_recorder.pl
  change_channel.sh change_channel_wrapper.sh stop_xss.sh
  be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
- linhes_update.sh linhes_update2.sh
+ linhes_update.sh linhes_update2.sh myth2mkv myth2mp3 ripD_eject.sh
  mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
 
 source=(LinHES-session LinHES-profile.sh $binfiles
@@ -86,6 +87,8 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
          '692563448cca1d49f45e7d1c8abcaa0c'
          '962a3e9eaba2d1466251b7ab0956705d'
          '1758aed160de64abfafb28a3a8f3390e'
+         '33fbebbd546672cedd3c5e7350ab414e'
+         '6b6e7d34a4bda6d608d150039adefd07'
          '3edef50a49a47694bf8add39cc160add'
          '5e17e0786afd891550a660f646076308'
          'bc69a520add58ede9b060c73e67ace13'
@@ -118,6 +121,9 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
          'a94fe6d980f4b810f2e2ae5352084b39'
          'e1011e0df090372cccc03ecf9d6805c7'
          'd14335afe7dafa035a70399210e0df1a'
+         '503df99218373dfc75e7e7f5e449a44e'
+         '4a1fda884dcd7d65fb2690fbdbd92a83'
+         'e2e24dd59d5d576cc33feafb329fa302'
          '92950f0ffb1faf1ed64c6be2b8fbc3f6'
          '95c092f67036a361ef7a57436f44332e'
          '410795ef9039e4c6c0484e706ecfd567'
diff --git a/abs/core/linhes-scripts/get_airplay_key b/abs/core/LinHES-system/get_airplay_key
index 89a40dd..89a40dd 100755
--- a/abs/core/linhes-scripts/get_airplay_key
+++ b/abs/core/LinHES-system/get_airplay_key
diff --git a/abs/core/linhes-scripts/importfiles.sh b/abs/core/LinHES-system/importfiles.sh
index 84f1ab5..84f1ab5 100755
--- a/abs/core/linhes-scripts/importfiles.sh
+++ b/abs/core/LinHES-system/importfiles.sh
diff --git a/abs/core/linhes-scripts/myth2mkv b/abs/core/LinHES-system/myth2mkv
index aedccff..aedccff 100644
--- a/abs/core/linhes-scripts/myth2mkv
+++ b/abs/core/LinHES-system/myth2mkv
diff --git a/abs/core/linhes-scripts/myth2mp3 b/abs/core/LinHES-system/myth2mp3
index 69d5d3f..69d5d3f 100755
--- a/abs/core/linhes-scripts/myth2mp3
+++ b/abs/core/LinHES-system/myth2mp3
diff --git a/abs/core/linhes-scripts/ripD_eject.sh b/abs/core/LinHES-system/ripD_eject.sh
index 99947a8..99947a8 100755
--- a/abs/core/linhes-scripts/ripD_eject.sh
+++ b/abs/core/LinHES-system/ripD_eject.sh
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 050c4e2..c5849c0 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=56
+pkgrel=57
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('xosd' 'cpulimit' 'screen' 'mencoder' 'tablet-encode' 'mplayer'
-         'normalize' 'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell')
+         'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell')
 url="http://linhes.org/"
 install="linhes-scripts.install"
 source=(
@@ -17,8 +17,6 @@ shootscreens.sh
 mplayer-resumer-vdpau.pl
 run-pause-mythcommflag
 shootscreens-mythtv.sh
-importfiles.sh
-myth2mp3
 mplayer-resumer.pl
 pause-mythcommflag.sh
 myth2x264
@@ -39,17 +37,14 @@ qip7100-cc.sh
 dtheme.sh
 upgrade_screen_rc
 upgrade_linhes_script.sh
-myth2mkv
 LinHES-osd
-ripD_eject.sh
-get_airplay_key
 )
 
 package() {
   cd ${srcdir}
   install -d ${pkgdir}/usr/LH/bin
   install -d ${pkgdir}/usr/LH/etc
-  install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* get_airplay_key ${pkgdir}/usr/LH/bin/
+  install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* ${pkgdir}/usr/LH/bin/
   install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/
   mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise
   cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run
@@ -65,8 +60,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
          '9ae2cd7a0c42d57ad8b5f515d7d60196'
          '1274bad3fb7296f00acd2d44804bad14'
          '47225fa9b6c953d56f6ede84d921a300'
-         '6b6e7d34a4bda6d608d150039adefd07'
-         '4a1fda884dcd7d65fb2690fbdbd92a83'
          '18263972b6326e140bbef0bb7dfa2da9'
          'ad98d51e79f83df7c03f828dbeaea7f4'
          '3b1c44a0818b35b6939c3cb2b723ce9e'
@@ -87,7 +80,4 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
          '35693f50939d5827aeabfce8c5dce589'
          '974c137d3fcb85942ba8945a1bc815fe'
          'f454faeabfa153b10389a9a3bfd51c4a'
-         '503df99218373dfc75e7e7f5e449a44e'
-         'b608044c9e7530a400d8f5b88fdfe6e6'
-         'e2e24dd59d5d576cc33feafb329fa302'
-         '33fbebbd546672cedd3c5e7350ab414e')
+         'b608044c9e7530a400d8f5b88fdfe6e6')