From 81b8c11ec695a33b28a5ebcd8ddef89ffb91a524 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Nov 2011 17:33:06 -0600
Subject: linhes-scripts: upgrade_linhes_script.sh: revert php/mysql fix

php/mysql fix is now handled in the php pkg
---
 abs/core/linhes-scripts/PKGBUILD                 | 4 ++--
 abs/core/linhes-scripts/upgrade_linhes_script.sh | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 421d774..fb9a04a 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=18
+pkgrel=19
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -97,4 +97,4 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '35693f50939d5827aeabfce8c5dce589'
          'a94fe6d980f4b810f2e2ae5352084b39'
          '974c137d3fcb85942ba8945a1bc815fe'
-         'd279763f58a9bc9998f3cba6e7224ced')
+         '5ada346a85ceb4b4fc15514706c65fe7')
diff --git a/abs/core/linhes-scripts/upgrade_linhes_script.sh b/abs/core/linhes-scripts/upgrade_linhes_script.sh
index 851bcc5..e48824b 100644
--- a/abs/core/linhes-scripts/upgrade_linhes_script.sh
+++ b/abs/core/linhes-scripts/upgrade_linhes_script.sh
@@ -145,8 +145,6 @@ remove_service.sh portmap
 wget ftp://ftp.knoppmyth.net/R6/sources/wallpaper.png -P /tmp
 mv /tmp/wallpaper.png /home/mythtv/.fluxbox/
 chown mythtv.mythtv /home/mythtv/.fluxbox/wallpaper.png
-mv /etc/php/php.ini /etc/php/php.ini.prer7
-mv /etc/php/php.ini.pacnew /etc/php/php.ini
 echo "All done!"
 
 
-- 
cgit v0.12

