Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

1 files changed, 0 insertions, 86 deletions

diff --git a/abs/core/tweaker/bin/SQLtweaker.sh b/abs/core/tweaker/bin/SQLtweaker.sh
deleted file mode 100755
index 5760e5d..0000000
--- a/abs/core/tweaker/bin/SQLtweaker.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-# This isn't to be run.  Do not chmod it +x and try - it won't do anything.
-
-# This function will change or create entries in various tables within
-# the mythconverg database.
-# If the key value already exists in $SQL_FILENAME, then it is changed.  Otherwise,
-# it will create the necessary SQL to make the entry if it does not exist.
-#
-# For the purposes of this function, a key is defined as any unique string of text
-# after which a comma and a value or values follow.  E.g.:
-# in an entry like this:
-# INSERT INTO `videotypes` VALUES (6,'mpeg','',0,1);
-# we can define the key as "6" if we wanted, but that would be ambiguous.  So we can instead
-# define it as "6,'mpeg'" and we gain the ability to control the values of the fields after
-# the first two.  So this function call
-#
-# ChangeOrMakeEntry "6,'mpeg'" "'mplayer -fs -zoom', 0,1" "videotypes"
-#
-# would change the above SQL entry into this:
-#
-# INSERT INTO `videotypes` VALUES (6,'mpeg','mplayer -fs -zoom', 0,1);
-
-# parameters: name, value, table
-
-# Some tables have simple key, value pairs.  Others have several potential keys and values.
-# The 'settings' table is a simple key, value pair table, plus the name of the system on which
-# the settings hold true, e.g.:
-# INSERT INTO `settings` VALUES ('FooHat','Peas with sauce:drizzle','MythTVhost');
-###
-function ChangeOrMakeEntry {
-    NAME=$1	; shift
-    VALUE=$1	; shift
-    TABLE=$1	; shift
-
-    if [ `grep -c "$NAME" $SQL_FILENAME` == 0 ]; then
-	# There is no setting for $SETTING_NAME, so we need to make it
-	echo "INSERT INTO \`$TABLE\`" VALUES \($NAME,$VALUE\)\; >> $SQL_FILENAME
-    else
-	# There is a setting for $SETTING_NAME, so make sure it's what we want it to be.
-	sed -i "s@$NAME,.*);@$NAME,$VALUE);@" $SQL_FILENAME
-    fi
-}
-
-# shortcut function to ChangeOrMakeEntry for 'settings' table
-function ChangeOrMakeSetting {
-    NAME=$1	; shift
-    VALUE=$1	; shift
-
-    ChangeOrMakeEntry "$NAME" "$VALUE, 'MythTVhost'" "settings"
-}
-
-# shortcut function to ChangeOrMakeEntry for 'settings' table
-function ChangeOrMakeKeybinding {
-    NAME=$1	; shift
-    VALUE=$1	; shift
-
-    ChangeOrMakeEntry "$NAME" "$VALUE, 'MythTVhost'" "keybindings"
-}
-
-# This only works for North America at the moment.
-LocaleCode() { # no arguments.  Obtain a zipcode or locale, either using
-    # SchedulesDirect subscription info or by asking the user.
-
-    mysqldump --tab=/tmp --opt mythconverg videosource
-    # Get the first data direct "Video Source"
-    dd_src=$(awk -F'\t' '$3 == "schedulesdirect1" {print $0; exit 0;}' </tmp/videosource.txt)
-    /bin/rm -f /tmp/videosource.txt
-    if [ -n "$dd_src" ]; then
-	# we have a chance at getting a usable locale from the schedulesdirect data
-	    cd /usr/LH/
-	    
-	    SCHEDULESDIRECT_USERNAME=$(echo "$dd_src" | cut -f4)
-	    SCHEDULESDIRECT_PASSWORD=$(echo "$dd_src" | cut -f7)
-	    
-	    sed -i "s/<userName>.*<\/userName>/<userName>$SCHEDULESDIRECT_USERNAME<\/userName>/" xtvd.xml
-	    sed -i "s/<password>.*<\/password>/<password>$SCHEDULESDIRECT_PASSWORD<\/password>/" xtvd.xml
-	    datadirect-parse.pl &> /dev/null
-	    
-	    SQL_LocaleCode=`grep -i postalCode \`ls -1tr *xml | tail -1\` | perl -e '%zips=""; while(<>) { split(/postalCode=/); @_[1] =~ m/(\d{5})/; if ($1) { $zips{$1}=$1; } } @keys = keys %zips; if ($#keys == 1) { print values %zips,"\n"; }'`
-
-	    if [ "$SQL_LocaleCode" == "" ]; then # zipcode was ambiguous or was not extractable
-		echo -e "\nPlease enter your US zipcode or Canadian Postal Code:"
-		read SQL_LocaleCode
-	    fi
-	    echo $SQL_LocaleCode > /tmp/locale.txt # remember this just long enough to make use of it in PostSQLTweaker.sh
-    fi
-}