diff -u mythplugins-0.20/debian/mythweb.postinst mythplugins-0.20/debian/mythweb.postinst
--- mythplugins-0.20/debian/mythweb.postinst
+++ mythplugins-0.20/debian/mythweb.postinst
@@ -1,107 +1,94 @@
-#! /bin/bash
+#!/bin/sh
 
 set -e
 
-# summary of how this script can be called:
-#	* <postinst> `configure' <most-recently-configured-version>
-#	* <old-postinst> `abort-upgrade' <new version>
-#	* <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#	  <new-version>
-#	* <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#	  <failed-install-package> <version> `removing'
-#	  <conflicting-package> <version>
-
-ACCESS=/etc/mythtv/mythweb-htaccess.conf
-CONFIG=/etc/mythtv/mythweb-settings.php
-
-DEFAULTS='C["db_server"]="localhost";C["db_name"]="mythconverg";C["db_login"]="mythtv";C["db_password"]="mythtv"'
-FORMAT='"C[\""V"\"]=\""C[V]"\";"'
-
 reload_apache()
 {
-	if apache2ctl configtest 2>/dev/null; then
-		invoke-rc.d apache2 force-reload || true
-	else
-		echo "Your apache2 configuration is broken, so we're not restarting it for you."
-	fi
-}
-
-get_config_define()
-{
-	DEFAULTS=${DEFAULTS/db_server/db_host}
-	DEFAULTS=${DEFAULTS/db_name/db_dbname}
-	DEFAULTS=${DEFAULTS/db_login/db_username}
-	#DEFAULTS=${DEFAULTS/db_password/db_password}
-	DEFAULTS=$(awk -F "['\"]" "BEGIN {$DEFAULTS}
-		/^[ \t]+define/ {if (\$2 in C) C[\$2]=\$4}
-		END {for (V in C) print $FORMAT}" $1)
-	DEFAULTS=${DEFAULTS/db_host/db_server}
-	DEFAULTS=${DEFAULTS/db_dbname/db_name}
-	DEFAULTS=${DEFAULTS/db_username/db_login}
-	#DEFAULTS=${DEFAULTS/db_password/db_password}
-}
-
-get_access_setenv()
-{
-	DEFAULTS=$(awk -F "['\" \t]+" "BEGIN {$DEFAULTS}
-		/^[ \t]+setenv/ {if (\$3 in C) C[\$3]=\$4}
-		END {for (V in C) print $FORMAT}" $1)
-}
-
-set_access_setenv()
-{
-	SETENV='"        setenv "$3" \""C[$3]"\""'
-	awk -F "['\" \t]+" "BEGIN {$DEFAULTS}
-		/^[ \t]+setenv/ {if (\$3 in C) {print $SETENV; next}}
-		{print}" $1 > $2
+    if apache2ctl configtest 2>/dev/null; then
+        invoke-rc.d apache2 force-reload || true
+    else
+        echo "Your apache2 configuration is broken, so we're not restarting it for you."
+    fi
 }
 
 case "$1" in
     configure)
 
-	# XXX - this should get settings from mythweb-settings.php if
-	# it exists
-
-	if [ -n "$2" -a -e $CONFIG ]; then
-		if dpkg --compare-versions "$2" lt 0.19-0.0; then
-			get_config_define $CONFIG
-			mv $CONFIG $CONFIG.dpkg-old
-		else
-			get_access_setenv $ACCESS
-		fi
-	fi
-
-	# if the awk stuff fails then comment it out and copy this file
-	set_access_setenv /usr/share/mythtv/mythweb/.htaccess.dist $ACCESS
-	cp /usr/share/mythtv/mythweb/includes/config.php.dist $CONFIG
-
-
-	chmod 600 $ACCESS
-	chmod 600 $CONFIG
-
-	if ! dpkg-statoverride --list $ACCESS; then
-	    chown mythtv:www-data $ACCESS
-	    chmod 640 $ACCESS
-	fi
-
-	if ! dpkg-statoverride --list $CONFIG; then
-	    chown mythtv:www-data $CONFIG
-	    chmod 640 $CONFIG
-	fi
-
-	cachedir=/var/cache/mythweb/image_cache
-	if ! dpkg-statoverride --list $cachedir; then
-	    chgrp www-data $cachedir
-	    chmod 1775 $cachedir
-	fi
-
-	if [ -e /etc/apache2/apache2.conf ]; then
-	# Enable rewrite_module and reload apache.
-		a2enmod rewrite >/dev/null || true
-		a2ensite mythwebdir >/dev/null || true
-		reload_apache
-	fi
+        # like mythtv-common.postinst
+        . /usr/share/debconf/confmodule
 
+        db_get mythtv/mysql_host
+        hostname="$RET"
+        db_get mythtv/mysql_mythtv_dbname
+        database="$RET"
+        db_get mythtv/mysql_mythtv_user
+        mythtv_username="$RET"
+        db_get mythtv/mysql_mythtv_password
+        mythtv_password="$RET"
+
+        db_stop
+
+        HTACCESS=/etc/mythtv/mythweb-htaccess
+        NEW=${HTACCESS}.new
+        touch $NEW
+
+        if [ -s $HTACCESS ]; then
+            INPUT=$HTACCESS
+            chown --reference=$INPUT $NEW
+            chmod --reference=$INPUT $NEW
+        else
+            INPUT=/usr/share/mythtv/mythweb/.htaccess.dist
+            chown mythtv:www-data $NEW
+            chmod 640 $NEW
+        fi
+
+        cat $INPUT | sed -e "
+s/\(^[ \t]*setenv[ \t]\+db_server[ \t]\+\"\)[^\"]*\"/\1$hostname\"/g;
+s/\(^[ \t]*setenv[ \t]\+db_name[ \t]\+\"\)[^\"]*\"/\1$database\"/g;
+s/\(^[ \t]*setenv[ \t]\+db_login[ \t]\+\"\)[^\"]*\"/\1$mythtv_username\"/g;
+s/\(^[ \t]*setenv[ \t]\+db_password[ \t]\+\"\)[^\"]*\"/\1$mythtv_password\"/g;
+            " > $NEW
+       mv $NEW $HTACCESS
+
+        ACCESS=/etc/mythtv/mythweb-htaccess.conf
+        if test -f $ACCESS; then
+            mv $ACCESS ${ACCESS}.dpkg-old
+        fi
+
+        CONFIG=/etc/mythtv/mythweb-settings.php
+        if test -f $CONFIG; then
+            mv $CONFIG ${CONFIG}.dpkg-old
+        fi
+
+        cachedir=/var/cache/mythweb/image_cache
+        if ! dpkg-statoverride --list $cachedir; then
+            chgrp www-data $cachedir
+            chmod 1775 $cachedir
+        fi
+
+        LINKS='
+/var/lib/music^/usr/share/mythtv/mythweb/data/music
+/var/lib/mythtv^/usr/share/mythtv/mythweb/data/recordings
+/var/lib/mythvideo^/usr/share/mythtv/mythweb/data/video
+/var/lib/mythvideo^/usr/share/mythtv/mythweb/data/video_covers
+/var/cache/mythweb/image_cache^/usr/share/mythtv/mythweb/data/tv_icons
+/var/cache/mythweb/image_cache^/usr/share/mythtv/mythweb/data/cache'
+        for LINK in $LINKS; do
+            TARGET=${LINK%^*}
+            NAME=${LINK#*^}
+            if ! [ -L $NAME ]; then
+                if ! [ -e $NAME ]; then
+                    ln -s $TARGET $NAME
+                fi
+            fi
+        done
+
+        if [ -e /etc/apache2/apache2.conf ]; then
+            # Enable rewrite_module and reload apache.
+            a2enmod rewrite >/dev/null || true
+            a2ensite mythwebdir >/dev/null || true
+            reload_apache
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -109,8 +96,8 @@
     ;;
 
     *)
-	echo "postinst called with unknown argument \`$1'" >&2
-	exit 1
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
     ;;
 esac
 
diff -u mythplugins-0.20/debian/control mythplugins-0.20/debian/control
--- mythplugins-0.20/debian/control
+++ mythplugins-0.20/debian/control
@@ -14,19 +14,19 @@
 
 Package: mythbrowser
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: A small web browser module for MythTV
  Mythbrowser is an integrated web browser plugin for your MythTV system.
 
 Package: mythcontrols
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: External controls for MythTV
  External controls for MythTV.
 
 Package: mythflix
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: netflix module for MythTV
  Allows you to monitor your Netflix dvd rental queue.
  .
@@ -34,7 +34,7 @@
 
 Package: mythdvd
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Recommends: xine | ogle | mplayer
 Suggests: transcode, mythvideo
 Description: DVD add-on module for MythTV
@@ -44,7 +44,7 @@
 
 Package: mythgallery
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: Image gallery/slideshow add-on module for MythTV
  MythGallery allows you to visually browse a directory tree containing image
  files. It can display any image file format supported by Qt, and supports
@@ -52,14 +52,14 @@
 
 Package: mythgame
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: Emulator & PC Game frontend module for MythTV
  MythGame can be used as a frontend to start any emulator or binary that your host OS
  runs.
 
 Package: mythmusic
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: Music add-on module for MythTV
  MythMusic provides a digital audio jukebox integrated with MythTV. It
  supports Ogg Vorbis, FLAC and MP3 streams, displays visualizations, and can
@@ -68,13 +68,13 @@
 
 Package: mythnews
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: An RSS feed news reader module for MythTV
  An RSS feed news reader module for MythTV
 
 Package: mythphone
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1) , ${shlibs:Depends}
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1) , ${shlibs:Depends} , ${misc:Depends}
 Description: a phone and videophone module for MythTV
  Mythphone is a phone and videophone capability on MYTH using the standard
  SIP protocol. It is compatible with Microsoft XP Messenger (see caveat
@@ -83,21 +83,21 @@
 
 Package: mythvideo
 Architecture: any
-Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, libxml-simple-perl, libwww-perl
+Depends: mythtv-common (>= 0.20-0.0ubuntu1), mythtv-frontend (>= 0.20-0.0ubuntu1), libxml-simple-perl, libwww-perl, ${shlibs:Depends}, ${misc:Depends}
 Description: A generic video player frontend module for MythTV
  MythVideo allows you to browse and play video streams, using an external
  player, from within the MythTV interface.
 
 Package: mythweather
 Architecture: any
-Depends: mythtv-common, mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}
+Depends: mythtv-common, mythtv-frontend (>= 0.20-0.0ubuntu1), ${shlibs:Depends}, ${misc:Depends}
 Description: Weather add-on module for MythTV
  MythWeather displays current and forecast weather information within
  MythTV.
 
 Package: mythweb
 Architecture: all
-Depends: mythtv-common, apache2 | httpd, libapache2-mod-php4 | php4 | php5 | libapache2-mod-php5, php4-mysql | php5-mysql
+Depends: mythtv-common, apache2 | httpd, libapache2-mod-php4 | php4 | php5 | libapache2-mod-php5, php4-mysql | php5-mysql, ${misc:Depends}
 Description: Web interface add-on module for MythTV
  MythWeb provides a web interface which can be used to view listings,
  schedule recordings, delete recordings, and search for programs. It can
@@ -106,7 +106,7 @@
 
 Package: mytharchive
 Architecture: any
-Depends: mytharchive, mythtv-common, mjpegtools, ffmpeg, dvdauthor, mkisofs, dvd+rw-tools, mytharchive-data, python-imaging, python-mysqldb
+Depends: mytharchive-data, mythtv-common, mjpegtools, ffmpeg, dvdauthor, mkisofs, dvd+rw-tools, python-imaging, python-mysqldb, ${misc:Depends}
 Suggests: transcode
 Description: create and burn DVD's from MythTV - binary file
  MythArchive is a plugin for MythTV that lets you create DVDs from your
@@ -121,8 +121,6 @@
 
 Package: mytharchive-data
 Architecture: all
-Depends: mythtv-common, mjpegtools, ffmpeg, dvdauthor, mkisofs, dvd+rw-tools
-Suggests: transcode
 Replaces: mytharchive (<= 0.20-0.0ubuntu1)
 Description: create and burn DVD's from MythTV - data files
  MythArchive is a plugin for MythTV that lets you create DVDs from your
diff -u mythplugins-0.20/debian/rules mythplugins-0.20/debian/rules
--- mythplugins-0.20/debian/rules
+++ mythplugins-0.20/debian/rules
@@ -58,9 +58,8 @@
 	dh_installdirs -pmythnews
 	dh_installdirs -pmythvideo var/lib/mythvideo
 	dh_installdirs -pmythweather etc/mythtv
-
-	dh_installdirs -pmythweb var/cache/mythweb/image_cach\
-	e var/www etc/mythtv usr/share/mythtv etc/apache2/sites-available
+	dh_installdirs -pmythweb var/cache/mythweb/image_cache \
+	var/www etc/mythtv usr/share/mythtv etc/apache2/sites-available
 
 	for plugin in mytharchive mythbrowser mythcontrols mythflix mythdvd \
 	mythgallery mythgame mythmusic mythnews mythphone mythvideo \
@@ -80,15 +79,20 @@
 
 	mv debian/mythweb/usr/share/mythtv/mythweb/.htaccess \
 	debian/mythweb/usr/share/mythtv/mythweb/.htaccess.dist
+
 	mv debian/mythweb/usr/share/mythtv/mythweb/includes/config.php \
-	debian/mythweb/usr/share/mythtv/mythweb/includes/config.php.dist
+	debian/mythweb/etc/mythtv/mythweb-config.php
+	mv debian/mythweb/usr/share/mythtv/mythweb/modules/tv/canned_searches.conf.php \
+	debian/mythweb/etc/mythtv/mythweb-canned_searches.conf.php
 
 	rm debian/mythweb/usr/share/mythtv/mythweb/LICENSE
 	rm debian/mythweb/usr/share/mythtv/mythweb/README
 	rm debian/mythweb/usr/share/mythtv/mythweb/TODO
 
 	dh_movefiles --sourcedir=debian/mytharchive
-	-find debian/mytharchive -type d -exec rmdir -p --ignore-fail-on-non-empty {} \;
+
+	mv debian/mytharchive-data/usr/share/mythtv/mytharchive/scripts/mythburn.py \
+	debian/mytharchive/usr/share/mythtv/mytharchive/scripts/mythburn.py
 
 # Build architecture-independent files here.
 binary-indep: build install
diff -u mythplugins-0.20/debian/changelog mythplugins-0.20/debian/changelog
--- mythplugins-0.20/debian/changelog
+++ mythplugins-0.20/debian/changelog
@@ -1,3 +1,11 @@
+mythplugins (0.20-0.7ubuntu1) edgy; urgency=low
+
+  * Merge from debian multimedia, Remaining Changes:
+  * Revert last change, and use sh again for mythweb.postinst
+  * Move 04_festival_paths.dpatch to 05_festival_paths.dpatch
+
+ -- Mario Limonciello <superm1@ubuntu.com>  Tue, 17 Oct 2006 01:11:33 -0500
+
 mythplugins (0.20-0.6ubuntu4) edgy; urgency=low
 
   * Make mythweb.postinst use bash instead of sh (Closes Ubuntu: #63493)
diff -u mythplugins-0.20/debian/mythweb.links mythplugins-0.20/debian/mythweb.links
--- mythplugins-0.20/debian/mythweb.links
+++ mythplugins-0.20/debian/mythweb.links
@@ -1,9 +1,4 @@
-etc/mythtv/mythweb-htaccess.conf usr/share/mythtv/mythweb/.htaccess
-etc/mythtv/mythweb-settings.php usr/share/mythtv/mythweb/includes/config.php
-mnt/store/music usr/share/mythtv/mythweb/data/music
+etc/mythtv/mythweb-canned_searches.conf.php usr/share/mythtv/mythweb/modules/tv/canned_searches.conf.php
+etc/mythtv/mythweb-config.php usr/share/mythtv/mythweb/includes/config.php
+etc/mythtv/mythweb-htaccess usr/share/mythtv/mythweb/.htaccess
 usr/share/mythtv/mythweb var/www/mythweb
-var/cache/mythweb/image_cache usr/share/mythtv/mythweb/data/cache
-var/lib/mythtv usr/share/mythtv/mythweb/data/recordings
-var/lib/mythtv usr/share/mythtv/mythweb/data/tv_icons
-var/lib/mythvideo usr/share/mythtv/mythweb/data/video
-var/lib/mythvideo usr/share/mythtv/mythweb/data/video_covers
diff -u mythplugins-0.20/debian/patches/02_0.20-fixes.dpatch mythplugins-0.20/debian/patches/02_0.20-fixes.dpatch
--- mythplugins-0.20/debian/patches/02_0.20-fixes.dpatch
+++ mythplugins-0.20/debian/patches/02_0.20-fixes.dpatch
@@ -1,12 +1,11 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_mythmusic_endian.ppc.dpatch by Magnus Ihse Bursie <magnus@ihse.net>
+##
 ##
 ## All lines beginning with ## DP:' are a description of the patch.
 ## DP: Fix from svn 0.20 fixes branch.
 
 @DPATCH@
 
-
 Index: branches/release-0-20-fixes/mythplugins/mythdvd/mythdvd/main.cpp
 ===================================================================
 --- mythplugins/mythdvd/mythdvd/main.cpp (revision 10878)
@@ -208,7 +207,7 @@
      Notas
 -"Number of epsodes"
 +"Number of episodes"
-     Número de episodios
+     Número de episodios
  "Number of shows"
 Index: branches/release-0-20-fixes/mythplugins/mythweb/modules/_shared/lang/Danish.lang
 ===================================================================
@@ -216,7 +215,7 @@
 +++ release-0-20-fixes/mythplugins/mythweb/modules/_shared/lang/Danish.lang (revision 11336)
 @@ -426,5 +426,5 @@
  "Notes"
-     BemÊrkninger
+     BemÊrkninger
 -"Number of epsodes"
 +"Number of episodes"
      Antal episoder
@@ -260,10 +259,10 @@
 +++ release-0-20-fixes/mythplugins/mythweb/modules/_shared/lang/Japanese.lang (revision 11336)
 @@ -442,5 +442,5 @@
  "Notes"
-     備考
+     備考
 -"Number of epsodes"
 +"Number of episodes"
-     録画数
+     録画数
  "Number of shows"
 Index: branches/release-0-20-fixes/mythplugins/mythweb/modules/_shared/lang/English.lang
 ===================================================================
@@ -281,7 +280,7 @@
 --- mythplugins/mythweb/modules/_shared/lang/Czech.lang (revision 11002)
 +++ release-0-20-fixes/mythplugins/mythweb/modules/_shared/lang/Czech.lang (revision 11336)
 @@ -291,5 +291,5 @@
-     ŜádnÜ
+     ŜádnÜ
  "Notes"
 -"Number of epsodes"
 +"Number of episodes"
@@ -601,0 +601,23 @@
+Index: branches/release-0-20-fixes/mythplugins/mythphone/mythphone/phoneui.cpp
+===================================================================
+--- mythplugins/mythphone/mythphone/phoneui.cpp (revision 6559)
++++ release-0-20-fixes/mythplugins/mythphone/mythphone/phoneui.cpp (revision 11482)
+@@ -1031,9 +1031,9 @@
+         closeCallPopup(); // Check we were not displaying one (e.g. user was getting ready to dial)
+         if (entry)
+-            doCallPopup(entry, "Answer", inAudioOnly);
++            doCallPopup(entry, tr("Answer"), inAudioOnly);
+         else
+         {
+             DirEntry dummyEntry(callerDisplay, callerUrl, "", "", "");
+-            doCallPopup(&dummyEntry, "Answer", inAudioOnly);
++            doCallPopup(&dummyEntry, tr("Answer"), inAudioOnly);
+         }
+     }
+@@ -1717,5 +1717,5 @@
+     
+         QButton *button2=0;
+-        if (DialorAnswer == "Dial")
++        if (DialorAnswer == tr("Dial"))
+         {
+             if (!audioOnly)
diff -u mythplugins-0.20/debian/patches/00list mythplugins-0.20/debian/patches/00list
--- mythplugins-0.20/debian/patches/00list
+++ mythplugins-0.20/debian/patches/00list
@@ -4 +4,2 @@
-04_festival_paths
+04_mythweb_complaints
+05_festival_paths
reverted:
--- mythplugins-0.20/debian/patches/04_festival_paths.dpatch
+++ mythplugins-0.20.orig/debian/patches/04_festival_paths.dpatch
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## festival_paths.dpatch by  <supermario@localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
---- mythplugins-0.20~/configure	2006-08-03 15:39:47.000000000 -0500
-+++ mythplugins-0.20/configure	2006-10-05 17:33:28.000000000 -0500
-@@ -806,10 +806,11 @@
-     if test "$festival" = "yes" ; then
-         echo "        FESTIVAL      support will be included in MythPhone"
-         echo "#define FESTIVAL_SUPPORT 1" >> ./mythphone/mythphone/config.h
--        echo "FESTIVALDIR = /home/paul/Build/festival/festival/" >> ./mythphone/mythphone/config.pro
--        echo "DEFINES += FESTIVAL_HOME=\\\"\$\${FESTIVALDIR}\\\"" >> ./mythphone/mythphone/config.pro
--        echo "INCLUDEPATH += /usr/include/festival /usr/include/speech_tools" >> ./mythphone/mythphone/config.pro
--        echo "INCLUDEPATH += /usr/local/include/festival /usr/local/include/speech_tools" >> ./mythphone/mythphone/config.pro
-+        echo "FESTIVALDIR = /usr/include/festival/" >> ./mythphone/mythphone/config.pro
-+        echo "SPEECHTOOLSDIR = /usr/include/speech_tools/" >> ./mythphone/mythphone/config.pro
-+        echo "DEFINES += FESTIVAL_HOME=\\\"/usr/share/festival/\\\"" >> ./mythphone/mythphone/config.pro
-+        echo "INCLUDEPATH += \$\${FESTIVALDIR}" >> ./mythphone/mythphone/config.pro
-+        echo "INCLUDEPATH += \$\${SPEECHTOOLSDIR}" >> ./mythphone/mythphone/config.pro
-         echo "LIBS += -lFestival -lestools -lestbase -leststring -ltermcap" >> ./mythphone/mythphone/config.pro
-     fi
- 
---- mythplugins-0.20~/mythphone/mythphone/PhoneSettings.cpp	2005-06-29 19:05:38.000000000 -0500
-+++ mythplugins-0.20/mythphone/mythphone/PhoneSettings.cpp	2006-10-05 17:33:28.000000000 -0500
-@@ -132,7 +132,7 @@
-     HostComboBox *gc = new HostComboBox("TTSVoice", true);
-     gc->setLabel(QObject::tr("Text to Speech Voice"));
- #ifdef FESTIVAL_SUPPORT
--    QDir festDir(FESTIVAL_HOME "lib/voices/english/",
-+    QDir festDir(FESTIVAL_HOME "voices/english/",
-                  "[a-z]*;[A-Z]*", QDir::Name, QDir::Dirs);
-                  // The name filter is to remove "." and ".." directories
-     gc->fillSelectionsFromDir(festDir, false);
only in patch2:
unchanged:
--- mythplugins-0.20.orig/debian/patches/04_mythweb_complaints.dpatch
+++ mythplugins-0.20/debian/patches/04_mythweb_complaints.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_mythweb_complaints.dpatch by Paul Andreassen
+##
+## All lines beginning with ## DP:' are a description of the patch.
+## DP: Fix mythweb directory complaints.
+
+@DPATCH@
+
+diff -Nurp mythplugins/mythweb/includes/init.php mythplugins-t/mythweb/includes/init.php
+--- mythplugins/mythweb/includes/init.php      2006-09-15 17:24:40.670062224 +1000
++++ mythplugins-t/mythweb/includes/init.php    2006-10-08 19:31:56.239314704 +1000
+@@ -263,10 +263,12 @@
+     if (!is_dir('data') && !mkdir('data', 0755)) {
+         custom_error('Error creating the data directory. Please check permissions.');
+     }
++/*
+     if (!is_writable('data')) {
+         $process_user = posix_getpwuid(posix_geteuid());
+         custom_error('data directory is not writable by '.$process_user['name'].'. Please check permissions.');
+     }
++*/
+ 
+ // New hard-coded cache directory
+     define('cache_dir', 'data/cache');
+diff -Nurp mythplugins/mythweb/modules/tv/handler.php mythplugins-t/mythweb/modules/tv/handler.php
+--- mythplugins/mythweb/modules/tv/handler.php 2006-09-15 17:25:03.409605288 +1000
++++ mythplugins-t/mythweb/modules/tv/handler.php       2006-10-08 19:28:10.791587968 +1000
+@@ -18,11 +18,13 @@
+         custom_error('Error creating data/tv_icons: Please check permissions on the data directory.');
+         exit;
+     }
++/*
+     if (!is_writable('data/tv_icons')) {
+         $process_user = posix_getpwuid(posix_geteuid());
+         custom_error('data/tv_icons directory is not writable by '.$process_user['name'].'. Please check permissions.');
+         exit;
+     }
++*/
+ 
+ /**
+  * @global  array   $GLOBALS['Categories']
only in patch2:
unchanged:
--- mythplugins-0.20.orig/debian/patches/05_festival_paths.dpatch
+++ mythplugins-0.20/debian/patches/05_festival_paths.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## festival_paths.dpatch by  <supermario@localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+--- mythplugins-0.20~/configure	2006-08-03 15:39:47.000000000 -0500
++++ mythplugins-0.20/configure	2006-10-05 17:33:28.000000000 -0500
+@@ -806,10 +806,11 @@
+     if test "$festival" = "yes" ; then
+         echo "        FESTIVAL      support will be included in MythPhone"
+         echo "#define FESTIVAL_SUPPORT 1" >> ./mythphone/mythphone/config.h
+-        echo "FESTIVALDIR = /home/paul/Build/festival/festival/" >> ./mythphone/mythphone/config.pro
+-        echo "DEFINES += FESTIVAL_HOME=\\\"\$\${FESTIVALDIR}\\\"" >> ./mythphone/mythphone/config.pro
+-        echo "INCLUDEPATH += /usr/include/festival /usr/include/speech_tools" >> ./mythphone/mythphone/config.pro
+-        echo "INCLUDEPATH += /usr/local/include/festival /usr/local/include/speech_tools" >> ./mythphone/mythphone/config.pro
++        echo "FESTIVALDIR = /usr/include/festival/" >> ./mythphone/mythphone/config.pro
++        echo "SPEECHTOOLSDIR = /usr/include/speech_tools/" >> ./mythphone/mythphone/config.pro
++        echo "DEFINES += FESTIVAL_HOME=\\\"/usr/share/festival/\\\"" >> ./mythphone/mythphone/config.pro
++        echo "INCLUDEPATH += \$\${FESTIVALDIR}" >> ./mythphone/mythphone/config.pro
++        echo "INCLUDEPATH += \$\${SPEECHTOOLSDIR}" >> ./mythphone/mythphone/config.pro
+         echo "LIBS += -lFestival -lestools -lestbase -leststring -ltermcap" >> ./mythphone/mythphone/config.pro
+     fi
+ 
+--- mythplugins-0.20~/mythphone/mythphone/PhoneSettings.cpp	2005-06-29 19:05:38.000000000 -0500
++++ mythplugins-0.20/mythphone/mythphone/PhoneSettings.cpp	2006-10-05 17:33:28.000000000 -0500
+@@ -132,7 +132,7 @@
+     HostComboBox *gc = new HostComboBox("TTSVoice", true);
+     gc->setLabel(QObject::tr("Text to Speech Voice"));
+ #ifdef FESTIVAL_SUPPORT
+-    QDir festDir(FESTIVAL_HOME "lib/voices/english/",
++    QDir festDir(FESTIVAL_HOME "voices/english/",
+                  "[a-z]*;[A-Z]*", QDir::Name, QDir::Dirs);
+                  // The name filter is to remove "." and ".." directories
+     gc->fillSelectionsFromDir(festDir, false);