rpms/mythtv/F-12 mythplugins-0.23.1-svnfixes.patch, NONE, 1.1 mythtv-0.23.1-svnfixes.patch, NONE, 1.1 mythtv.spec, 1.74, 1.75 sources, 1.39, 1.40 mythplugins-0.23-svnfixes.patch, 1.6, NONE

Jarod Wilson jarod at rpmfusion.org
Fri Aug 13 23:02:12 CEST 2010


Author: jarod

Update of /cvs/free/rpms/mythtv/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22963

Modified Files:
	mythtv.spec sources 
Added Files:
	mythplugins-0.23.1-svnfixes.patch mythtv-0.23.1-svnfixes.patch 
Removed Files:
	mythplugins-0.23-svnfixes.patch 
Log Message:
* Fri Aug 13 2010 Jarod Wilson <jarod at wilsonet.com> 0.23.1-1
- Update to 0.23.1 release (plus a few minor svn fixes)


mythplugins-0.23.1-svnfixes.patch:
 mythmusic/theme/default-wide/music-ui.xml                      |    2 -
 mythmusic/theme/default/music-ui.xml                           |   18 +++++++---
 mythvideo/mythvideo/scripts/jamu.py                            |    5 ++
 mythweb/classes/Database.php                                   |    4 +-
 mythweb/classes/Database/Query.php                             |    4 +-
 mythweb/classes/Database/Query/mysql.php                       |    4 +-
 mythweb/classes/Database/Query/mysqlicompat.php                |    4 +-
 mythweb/classes/Database/mysql.php                             |    4 +-
 mythweb/classes/Database/mysqlicompat.php                      |    4 +-
 mythweb/classes/JSON.php                                       |    4 +-
 mythweb/classes/Modules.php                                    |    4 +-
 mythweb/classes/MythBackend.php                                |    4 +-
 mythweb/classes/MythFrontend.php                               |    4 +-
 mythweb/includes/class_autoload.php                            |    4 +-
 mythweb/includes/cleanup.php                                   |    4 +-
 mythweb/includes/config.php                                    |    4 +-
 mythweb/includes/css.php                                       |    4 +-
 mythweb/includes/data_dir.php                                  |    4 +-
 mythweb/includes/database.php                                  |    4 +-
 mythweb/includes/db_update.php                                 |    4 +-
 mythweb/includes/defines.php                                   |    4 +-
 mythweb/includes/errordisplay.php                              |    4 +-
 mythweb/includes/errors.php                                    |    4 +-
 mythweb/includes/init.php                                      |    4 +-
 mythweb/includes/jobqueue.php                                  |    4 +-
 mythweb/includes/lockdown.php                                  |    4 +-
 mythweb/includes/mobile.php                                    |    4 +-
 mythweb/includes/mouseovers.php                                |    4 +-
 mythweb/includes/php_version_check.php                         |    4 +-
 mythweb/includes/session.php                                   |    4 +-
 mythweb/includes/skin.php                                      |    4 +-
 mythweb/includes/sorting.php                                   |    4 +-
 mythweb/includes/translate.php                                 |    4 +-
 mythweb/includes/utils.php                                     |    4 +-
 mythweb/js/pngbehavior.htc                                     |    2 -
 mythweb/js/table_sort.js                                       |    4 +-
 mythweb/js/utils.js                                            |    4 +-
 mythweb/modules/_shared/tmpl/_errors/db_access_denied.php      |    4 +-
 mythweb/modules/_shared/tmpl/_errors/db_vars_error.php         |    4 +-
 mythweb/modules/_shared/tmpl/_errors/error.php                 |    4 +-
 mythweb/modules/_shared/tmpl/_errors/fatal.php                 |    4 +-
 mythweb/modules/_shared/tmpl/_errors/lockdown.php              |    4 +-
 mythweb/modules/_shared/tmpl/_errors/no_modules.php            |    4 +-
 mythweb/modules/_shared/tmpl/_errors/site_down.php             |    4 +-
 mythweb/modules/_shared/tmpl/_errors/unknown_module.php        |    4 +-
 mythweb/modules/_shared/tmpl/default/footer.php                |    4 +-
 mythweb/modules/_shared/tmpl/default/header.php                |    4 +-
 mythweb/modules/_shared/tmpl/default/welcome.php               |    4 +-
 mythweb/modules/_shared/tmpl/iPod/footer.php                   |    4 +-
 mythweb/modules/_shared/tmpl/iPod/header.php                   |    4 +-
 mythweb/modules/_shared/tmpl/iPod/welcome.php                  |    4 +-
 mythweb/modules/_shared/tmpl/lite/footer.php                   |    4 +-
 mythweb/modules/_shared/tmpl/lite/header.php                   |    4 +-
 mythweb/modules/_shared/tmpl/lite/welcome.php                  |    4 +-
 mythweb/modules/_shared/tmpl/wap/footer.php                    |    4 +-
 mythweb/modules/_shared/tmpl/wap/header.php                    |    4 +-
 mythweb/modules/_shared/tmpl/wap/welcome.php                   |    4 +-
 mythweb/modules/backend_log/handler.php                        |    4 +-
 mythweb/modules/backend_log/init.php                           |    4 +-
 mythweb/modules/backend_log/tmpl/default/backend_log.php       |    4 +-
 mythweb/modules/backend_log/tmpl/default/welcome.php           |    4 +-
 mythweb/modules/backend_log/tmpl/lite/backend_log.php          |    4 +-
 mythweb/modules/backend_log/tmpl/lite/welcome.php              |    4 +-
 mythweb/modules/database/init.php                              |    4 +-
 mythweb/modules/database/set_settings.php                      |    4 +-
 mythweb/modules/database/tmpl/default/set_settings.php         |    4 +-
 mythweb/modules/music/handler.php                              |    4 +-
 mythweb/modules/music/init.php                                 |    4 +-
 mythweb/modules/music/mp3act_functions.php                     |    4 +-
 mythweb/modules/music/stream.php                               |    4 +-
 mythweb/modules/music/tmpl/default/welcome.php                 |    4 +-
 mythweb/modules/mythtv/init.php                                |    4 +-
 mythweb/modules/mythtv/set_keys.php                            |    4 +-
 mythweb/modules/mythtv/set_settings.php                        |    4 +-
 mythweb/modules/mythtv/tmpl/default/set_keys.php               |    4 +-
 mythweb/modules/mythtv/tmpl/default/set_settings.php           |    4 +-
 mythweb/modules/mythtv/tmpl/lite/set_keys.php                  |    4 +-
 mythweb/modules/mythtv/tmpl/lite/set_settings.php              |    4 +-
 mythweb/modules/mythweb/init.php                               |    4 +-
 mythweb/modules/mythweb/set_defaults.php                       |    4 +-
 mythweb/modules/mythweb/set_flvplayer.php                      |    4 +-
 mythweb/modules/mythweb/set_session.php                        |    4 +-
 mythweb/modules/mythweb/tmpl/default/set_defaults.php          |    4 +-
 mythweb/modules/mythweb/tmpl/default/set_flvplayer.php         |    4 +-
 mythweb/modules/mythweb/tmpl/default/set_session.php           |    4 +-
 mythweb/modules/mythweb/tmpl/lite/set_defaults.php             |    4 +-
 mythweb/modules/mythweb/tmpl/lite/set_flvplayer.php            |    4 +-
 mythweb/modules/mythweb/tmpl/lite/set_session.php              |    4 +-
 mythweb/modules/remote/do.php                                  |    4 +-
 mythweb/modules/remote/handler.php                             |    4 +-
 mythweb/modules/remote/init.php                                |    4 +-
 mythweb/modules/remote/keys.php                                |    4 +-
 mythweb/modules/remote/play_program_on_frontend.php            |    4 +-
 mythweb/modules/remote/tmpl/default/keys.php                   |    4 +-
 mythweb/modules/remote/tmpl/default/remote.php                 |    4 +-
 mythweb/modules/remote/tmpl/default/welcome.php                |    4 +-
 mythweb/modules/remote/tmpl/iPod/play_program_on_frontend.php  |    4 +-
 mythweb/modules/remote/tmpl/iPod/welcome.php                   |    4 +-
 mythweb/modules/settings/handler.php                           |    4 +-
 mythweb/modules/settings/init.php                              |    4 +-
 mythweb/modules/settings/tmpl/default/header.php               |    4 +-
 mythweb/modules/settings/tmpl/default/welcome.php              |    4 +-
 mythweb/modules/settings/tmpl/lite/header.php                  |    4 +-
 mythweb/modules/settings/tmpl/lite/mythweb.php                 |    4 +-
 mythweb/modules/settings/tmpl/lite/welcome.php                 |    4 +-
 mythweb/modules/stats/handler.php                              |    4 +-
 mythweb/modules/stats/init.php                                 |    4 +-
 mythweb/modules/stats/tmpl/default/stats.php                   |    4 +-
 mythweb/modules/stats/tmpl/default/welcome.php                 |    4 +-
 mythweb/modules/stats/tmpl/lite/stats.php                      |    4 +-
 mythweb/modules/stats/tmpl/lite/welcome.php                    |    4 +-
 mythweb/modules/status/handler.php                             |    4 +-
 mythweb/modules/status/init.php                                |    4 +-
 mythweb/modules/status/tmpl/default/status.php                 |    4 +-
 mythweb/modules/status/tmpl/default/welcome.php                |    4 +-
 mythweb/modules/status/tmpl/lite/status.php                    |    4 +-
 mythweb/modules/status/tmpl/lite/welcome.php                   |    4 +-
 mythweb/modules/status/tmpl/wap/status.php                     |    4 +-
 mythweb/modules/stream/handler.pl                              |    4 +-
 mythweb/modules/stream/init.php                                |    4 +-
 mythweb/modules/stream/set_protocol.php                        |    4 +-
 mythweb/modules/stream/stream_asx.pl                           |    4 +-
 mythweb/modules/stream/stream_flv.pl                           |    4 +-
 mythweb/modules/stream/stream_flvp.pl                          |    4 +-
 mythweb/modules/stream/stream_mp4.pl                           |    4 +-
 mythweb/modules/stream/stream_raw.pl                           |    4 +-
 mythweb/modules/stream/tmpl/default/set_protocol.php           |    4 +-
 mythweb/modules/stream/tmpl/lite/set_protocol.php              |    4 +-
 mythweb/modules/stream/tv.pl                                   |    4 +-
 mythweb/modules/tv/canned_searches.conf.php                    |    4 +-
 mythweb/modules/tv/channel.php                                 |    4 +-
 mythweb/modules/tv/classes/Channel.php                         |    4 +-
 mythweb/modules/tv/classes/Channel_List.php                    |    4 +-
 mythweb/modules/tv/classes/Program.php                         |    4 +-
 mythweb/modules/tv/classes/Recording.php                       |    4 +-
 mythweb/modules/tv/classes/Schedule.php                        |    4 +-
 mythweb/modules/tv/detail.php                                  |    4 +-
 mythweb/modules/tv/get_pixmap.php                              |    4 +-
 mythweb/modules/tv/handler.php                                 |    4 +-
 mythweb/modules/tv/includes/channels.php                       |    4 +-
 mythweb/modules/tv/includes/programs.php                       |    4 +-
 mythweb/modules/tv/includes/recording_schedules.php            |    4 +-
 mythweb/modules/tv/includes/schedule_utils.php                 |    4 +-
 mythweb/modules/tv/init.php                                    |    4 +-
 mythweb/modules/tv/list.php                                    |    4 +-
 mythweb/modules/tv/list_recording_groups.php                   |    4 +-
 mythweb/modules/tv/list_shows_in_title_and_group.php           |    4 +-
 mythweb/modules/tv/list_titles_in_group.php                    |    4 +-
 mythweb/modules/tv/opensearch.php                              |    4 +-
 mythweb/modules/tv/recorded.php                                |    4 +-
 mythweb/modules/tv/schedules.php                               |    4 +-
 mythweb/modules/tv/schedules_custom.php                        |    4 +-
 mythweb/modules/tv/schedules_manual.php                        |    4 +-
 mythweb/modules/tv/search.php                                  |    4 +-
 mythweb/modules/tv/searches.php                                |    4 +-
 mythweb/modules/tv/set_channels.php                            |    4 +-
 mythweb/modules/tv/set_playgroup.php                           |    4 +-
 mythweb/modules/tv/set_screens.php                             |    4 +-
 mythweb/modules/tv/set_session.php                             |    4 +-
 mythweb/modules/tv/submenu.php                                 |    4 +-
 mythweb/modules/tv/tmpl/default/channel.php                    |    4 +-
 mythweb/modules/tv/tmpl/default/detail.php                     |    4 +-
 mythweb/modules/tv/tmpl/default/list.php                       |    4 +-
 mythweb/modules/tv/tmpl/default/list_data.php                  |    4 +-
 mythweb/modules/tv/tmpl/default/recorded.php                   |    4 +-
 mythweb/modules/tv/tmpl/default/schedules.php                  |    4 +-
 mythweb/modules/tv/tmpl/default/schedules_custom.php           |    4 +-
 mythweb/modules/tv/tmpl/default/schedules_manual.php           |    4 +-
 mythweb/modules/tv/tmpl/default/search.php                     |    4 +-
 mythweb/modules/tv/tmpl/default/searches.php                   |    4 +-
 mythweb/modules/tv/tmpl/default/set_channels.php               |    4 +-
 mythweb/modules/tv/tmpl/default/set_playgroup.php              |    4 +-
 mythweb/modules/tv/tmpl/default/set_screens.php                |    4 +-
 mythweb/modules/tv/tmpl/default/set_session.php                |    4 +-
 mythweb/modules/tv/tmpl/default/upcoming.php                   |    4 +-
 mythweb/modules/tv/tmpl/default/welcome.php                    |    4 +-
 mythweb/modules/tv/tmpl/iPod/detail.php                        |    4 +-
 mythweb/modules/tv/tmpl/iPod/list_recording_groups.php         |    4 +-
 mythweb/modules/tv/tmpl/iPod/list_shows_in_title_and_group.php |    4 +-
 mythweb/modules/tv/tmpl/iPod/list_titles_in_group.php          |    4 +-
 mythweb/modules/tv/tmpl/iPod/search.php                        |    4 +-
 mythweb/modules/tv/tmpl/iPod/submenu.php                       |    4 +-
 mythweb/modules/tv/tmpl/iPod/upcoming.php                      |    4 +-
 mythweb/modules/tv/tmpl/iPod/welcome.php                       |    4 +-
 mythweb/modules/tv/tmpl/ical/upcoming.php                      |    4 +-
 mythweb/modules/tv/tmpl/lite/channel.php                       |    4 +-
 mythweb/modules/tv/tmpl/lite/detail.php                        |    4 +-
 mythweb/modules/tv/tmpl/lite/list.php                          |    4 +-
 mythweb/modules/tv/tmpl/lite/recorded.php                      |    4 +-
 mythweb/modules/tv/tmpl/lite/schedules.php                     |    4 +-
 mythweb/modules/tv/tmpl/lite/schedules_custom.php              |    4 +-
 mythweb/modules/tv/tmpl/lite/schedules_manual.php              |    4 +-
 mythweb/modules/tv/tmpl/lite/search.php                        |    4 +-
 mythweb/modules/tv/tmpl/lite/searches.php                      |    4 +-
 mythweb/modules/tv/tmpl/lite/set_channels.php                  |    4 +-
 mythweb/modules/tv/tmpl/lite/set_session.php                   |    4 +-
 mythweb/modules/tv/tmpl/lite/upcoming.php                      |    4 +-
 mythweb/modules/tv/tmpl/lite/welcome.php                       |    4 +-
 mythweb/modules/tv/tmpl/rss/recorded.php                       |    4 +-
 mythweb/modules/tv/tmpl/wap/channel.php                        |    4 +-
 mythweb/modules/tv/tmpl/wap/detail.php                         |    4 +-
 mythweb/modules/tv/tmpl/wap/list.php                           |    4 +-
 mythweb/modules/tv/tmpl/wap/recorded.php                       |    4 +-
 mythweb/modules/tv/tmpl/wap/search.php                         |    4 +-
 mythweb/modules/tv/tmpl/wap/upcoming.php                       |    4 +-
 mythweb/modules/tv/upcoming.php                                |    4 +-
 mythweb/modules/video/edit.php                                 |    4 +-
 mythweb/modules/video/handler.php                              |    4 +-
 mythweb/modules/video/imdb.php                                 |    4 +-
 mythweb/modules/video/init.php                                 |    4 +-
 mythweb/modules/video/scan.php                                 |    4 +-
 mythweb/modules/video/set_settings.php                         |    4 +-
 mythweb/modules/video/tmpl/default/set_settings.php            |    4 +-
 mythweb/modules/video/tmpl/default/video.php                   |    4 +-
 mythweb/modules/video/tmpl/default/welcome.php                 |    4 +-
 mythweb/modules/weather/classes/WeatherScreen.php              |    4 +-
 mythweb/modules/weather/handler.php                            |    4 +-
 mythweb/modules/weather/init.php                               |    4 +-
 mythweb/modules/weather/set_screen.php                         |    4 +-
 mythweb/modules/weather/tmpl/default/set_screen.php            |    4 +-
 mythweb/modules/weather/tmpl/default/weather.18h.php           |    4 +-
 mythweb/modules/weather/tmpl/default/weather.3d.php            |    4 +-
 mythweb/modules/weather/tmpl/default/weather.6d.php            |    4 +-
 mythweb/modules/weather/tmpl/default/weather.am.php            |    4 +-
 mythweb/modules/weather/tmpl/default/weather.cc.php            |    4 +-
 mythweb/modules/weather/tmpl/default/weather.php               |    4 +-
 mythweb/modules/weather/tmpl/default/weather.sm.php            |    4 +-
 mythweb/modules/weather/tmpl/default/welcome.php               |    4 +-
 mythweb/modules/welcome.php                                    |    4 +-
 mythweb/mythweb.php                                            |    4 +-
 mythweb/mythweb.pl                                             |    4 +-
 231 files changed, 473 insertions(+), 462 deletions(-)

--- NEW FILE mythplugins-0.23.1-svnfixes.patch ---
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythmusic/theme/default/music-ui.xml mythplugins-0.23.1/mythmusic/theme/default/music-ui.xml
--- mythplugins-0.23.1-release/mythmusic/theme/default/music-ui.xml	2010-02-02 13:39:22.000000000 -0500
+++ mythplugins-0.23.1/mythmusic/theme/default/music-ui.xml	2010-08-07 14:14:51.432531000 -0400
@@ -1508,7 +1508,7 @@
         </statetype>
 
         <textarea name="info" from="basetextarea">
-            <area>170,129,250,25</area>
+            <area>170,125,250,25</area>
         </textarea>
 
         <textarea name="time" from="basetextarea">
@@ -1518,12 +1518,20 @@
 
         <imagetype name="coverart">
             <filename>mm_nothumb.png</filename>
-            <area>22,22,144,144</area>
+            <area>22,22,143,144</area>
         </imagetype>
 
-        <progressbar name="progress" from="baseprogressbar">
-            <position>170,150</position>
-        </progressbar>
+        <progressbar name="progress">
+            <area>170,150,10,10</area>
+            <layout>horizontal</layout>
+            <style>reveal</style>
+            <imagetype name="background">
+                <filename>mm_progress-bg.png</filename>
+            </imagetype>
+            <imagetype name="progressimage">
+                <filename>mm_progress-fg.png</filename>
+            </imagetype>
+        </progressbar>   
     </window>
 
 </mythuitheme>
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythmusic/theme/default-wide/music-ui.xml mythplugins-0.23.1/mythmusic/theme/default-wide/music-ui.xml
--- mythplugins-0.23.1-release/mythmusic/theme/default-wide/music-ui.xml	2010-02-02 13:39:22.000000000 -0500
+++ mythplugins-0.23.1/mythmusic/theme/default-wide/music-ui.xml	2010-08-07 14:14:51.432531000 -0400
@@ -270,7 +270,7 @@
 
             <textarea name="time_text" draworder="1">
                 <font>currentartist</font>
-                <area>200,120,185,35</area>
+                <area>200,120,200,35</area>
             </textarea>
 
             <blackhole name="visual_blackhole">
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythvideo/mythvideo/scripts/jamu.py mythplugins-0.23.1/mythvideo/mythvideo/scripts/jamu.py
--- mythplugins-0.23.1-release/mythvideo/mythvideo/scripts/jamu.py	2010-05-06 11:05:16.000000000 -0400
+++ mythplugins-0.23.1/mythvideo/mythvideo/scripts/jamu.py	2010-07-30 01:30:44.653168000 -0400
@@ -492,7 +492,6 @@ try:
     mythdb = None
     mythvideo = None
     mythbeconn = None
-    localhostname = gethostname()
     try:
         '''Create an instance of each: MythDB, MythVideo
         '''
@@ -510,6 +509,10 @@ try:
     except Exception, e:
         print u"\n! Warning - Creating an instance caused an error for one of: MythDBConn or MythVideo, error(%s)\n" % e
     try:
+        localhostname = mythdb.gethostname()
+    except:
+        localhostname = gethostname()
+    try:
         MythLog._setlevel('none') # Some non option -M cannot have any logging on stdout
         mythbeconn = MythBE(backend=localhostname, db=mythdb)
         MythLog._setlevel('important,general')
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/Database/mysqlicompat.php mythplugins-0.23.1/mythweb/classes/Database/mysqlicompat.php
--- mythplugins-0.23.1-release/mythweb/classes/Database/mysqlicompat.php	2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.23.1/mythweb/classes/Database/mysqlicompat.php	2008-11-08 21:42:14.216654000 -0500
@@ -20,8 +20,8 @@
  * compatibility so programs can take advantage of the better integration of
  * mysqli but still run on older installations.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/Database/mysqlicompat.php $
- * @date        $Date: 2008-11-08 18:42:14 -0800 (Sat, 08 Nov 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/Database/mysqlicompat.php $
+ * @date        $Date: 2008-11-08 21:42:14 -0500 (Sat, 08 Nov 2008) $
  * @version     $Revision: 19023 $
  * @author      $Author: kormoc $
  * @copyright   Silicon Mechanics
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/Database/mysql.php mythplugins-0.23.1/mythweb/classes/Database/mysql.php
--- mythplugins-0.23.1-release/mythweb/classes/Database/mysql.php	2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.23.1/mythweb/classes/Database/mysql.php	2008-11-08 21:42:14.216654000 -0500
@@ -13,8 +13,8 @@
  *
  * MySQL Database connection class.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/Database/mysql.php $
- * @date        $Date: 2008-11-08 18:42:14 -0800 (Sat, 08 Nov 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/Database/mysql.php $
+ * @date        $Date: 2008-11-08 21:42:14 -0500 (Sat, 08 Nov 2008) $
  * @version     $Revision: 19023 $
  * @author      $Author: kormoc $
  * @copyright   Silicon Mechanics
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/Database/Query/mysqlicompat.php mythplugins-0.23.1/mythweb/classes/Database/Query/mysqlicompat.php
--- mythplugins-0.23.1-release/mythweb/classes/Database/Query/mysqlicompat.php	2007-12-31 15:38:38.000000000 -0500
+++ mythplugins-0.23.1/mythweb/classes/Database/Query/mysqlicompat.php	2007-12-31 15:38:38.100453000 -0500
@@ -15,8 +15,8 @@
  * This is also the parent class for the full/expanded mysqli query object,
  * since many of the routines are shared between them.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/Database/Query/mysqlicompat.php $
- * @date        $Date: 2007-12-31 12:38:38 -0800 (Mon, 31 Dec 2007) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/Database/Query/mysqlicompat.php $
+ * @date        $Date: 2007-12-31 15:38:38 -0500 (Mon, 31 Dec 2007) $
  * @version     $Revision: 15274 $
  * @author      $Author: xris $
  * @copyright   Silicon Mechanics
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/Database/Query/mysql.php mythplugins-0.23.1/mythweb/classes/Database/Query/mysql.php
--- mythplugins-0.23.1-release/mythweb/classes/Database/Query/mysql.php	2007-12-31 15:38:38.000000000 -0500
+++ mythplugins-0.23.1/mythweb/classes/Database/Query/mysql.php	2007-12-31 15:38:38.100453000 -0500
@@ -13,8 +13,8 @@
  *
  * Query handler for MySQL
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/Database/Query/mysql.php $
- * @date        $Date: 2007-12-31 12:38:38 -0800 (Mon, 31 Dec 2007) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/Database/Query/mysql.php $
+ * @date        $Date: 2007-12-31 15:38:38 -0500 (Mon, 31 Dec 2007) $
  * @version     $Revision: 15274 $
  * @author      $Author: xris $
  * @copyright   Silicon Mechanics
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/Database/Query.php mythplugins-0.23.1/mythweb/classes/Database/Query.php
--- mythplugins-0.23.1-release/mythweb/classes/Database/Query.php	2009-10-09 01:29:02.000000000 -0400
+++ mythplugins-0.23.1/mythweb/classes/Database/Query.php	2009-10-09 01:29:02.832866000 -0400
@@ -14,8 +14,8 @@
  * This is an abstract superclass that defines the basic variables and functions
  * used by possible subclasses.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/Database/Query.php $
- * @date        $Date: 2009-10-08 22:29:02 -0700 (Thu, 08 Oct 2009) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/Database/Query.php $
+ * @date        $Date: 2009-10-09 01:29:02 -0400 (Fri, 09 Oct 2009) $
  * @version     $Revision: 22328 $
  * @author      $Author: kormoc $
  * @copyright   Silicon Mechanics
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/Database.php mythplugins-0.23.1/mythweb/classes/Database.php
--- mythplugins-0.23.1-release/mythweb/classes/Database.php	2008-06-01 19:52:54.000000000 -0400
+++ mythplugins-0.23.1/mythweb/classes/Database.php	2008-06-01 19:52:54.094464000 -0400
@@ -24,8 +24,8 @@
  * define _errstr() and _errno() methods to return the appropriate database
  * engine error string/number.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/Database.php $
- * @date        $Date: 2008-06-01 16:52:54 -0700 (Sun, 01 Jun 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/Database.php $
+ * @date        $Date: 2008-06-01 19:52:54 -0400 (Sun, 01 Jun 2008) $
  * @version     $Revision: 17434 $
  * @author      $Author: kormoc $
  * @copyright   Silicon Mechanics
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/JSON.php mythplugins-0.23.1/mythweb/classes/JSON.php
--- mythplugins-0.23.1-release/mythweb/classes/JSON.php	2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.23.1/mythweb/classes/JSON.php	2008-02-22 16:35:09.910169000 -0500
@@ -3,8 +3,8 @@
  * Wrapper so we can support php less then 5.2 and/or installs without native json built in.
  * The native json is much faster, so prefer it if we can.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/JSON.php $
- * @date        $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/JSON.php $
+ * @date        $Date: 2008-02-22 16:35:09 -0500 (Fri, 22 Feb 2008) $
  * @version     $Revision: 16202 $
  * @author      $Author: xris $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/Modules.php mythplugins-0.23.1/mythweb/classes/Modules.php
--- mythplugins-0.23.1-release/mythweb/classes/Modules.php	2009-01-22 02:08:37.000000000 -0500
+++ mythplugins-0.23.1/mythweb/classes/Modules.php	2009-01-22 02:08:37.784770000 -0500
@@ -2,8 +2,8 @@
 /**
  * Handling Modules
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/Modules.php $
- * @date        $Date: 2009-01-21 23:08:37 -0800 (Wed, 21 Jan 2009) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/Modules.php $
+ * @date        $Date: 2009-01-22 02:08:37 -0500 (Thu, 22 Jan 2009) $
  * @version     $Revision: 19784 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/MythBackend.php mythplugins-0.23.1/mythweb/classes/MythBackend.php
--- mythplugins-0.23.1-release/mythweb/classes/MythBackend.php	2010-07-16 23:33:19.000000000 -0400
+++ mythplugins-0.23.1/mythweb/classes/MythBackend.php	2010-07-16 23:33:19.783309000 -0400
@@ -1,8 +1,8 @@
 <?php
 /**
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/classes/MythBackend.php $
- * @date        $Date: 2010-07-16 20:33:19 -0700 (Fri, 16 Jul 2010) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/classes/MythBackend.php $
+ * @date        $Date: 2010-07-16 23:33:19 -0400 (Fri, 16 Jul 2010) $
  * @version     $Revision: 25367 $
  * @author      $Author: cpinkham $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/classes/MythFrontend.php mythplugins-0.23.1/mythweb/classes/MythFrontend.php
--- mythplugins-0.23.1-release/mythweb/classes/MythFrontend.php	2009-01-22 02:01:06.000000000 -0500
[...2850 lines suppressed...]
+ * @date        $Date: 2008-02-16 19:07:51 -0500 (Sat, 16 Feb 2008) $
  * @version     $Revision: 16087 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/init.php mythplugins-0.23.1/mythweb/modules/weather/init.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/init.php	2008-02-17 19:50:28.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/weather/init.php	2008-02-17 19:50:28.500640000 -0500
@@ -2,8 +2,8 @@
 /**
  * Initialization routines for the MythWeb Weather module
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/init.php $
- * @date        $Date: 2008-02-17 16:50:28 -0800 (Sun, 17 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/init.php $
+ * @date        $Date: 2008-02-17 19:50:28 -0500 (Sun, 17 Feb 2008) $
  * @version     $Revision: 16122 $
  * @author      $Author: xris $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/set_screen.php mythplugins-0.23.1/mythweb/modules/weather/set_screen.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/set_screen.php	2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/weather/set_screen.php	2008-02-22 16:35:09.910169000 -0500
@@ -2,8 +2,8 @@
 /**
  * Weather Screen settings
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/set_screen.php $
- * @date        $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/set_screen.php $
+ * @date        $Date: 2008-02-22 16:35:09 -0500 (Fri, 22 Feb 2008) $
  * @version     $Revision: 16202 $
  * @author      $Author: xris $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/set_screen.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/set_screen.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/set_screen.php	2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/set_screen.php	2008-02-22 16:35:09.910169000 -0500
@@ -2,8 +2,8 @@
 /**
  * Display/save MythWeather Screen settings
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/set_screen.php $
- * @date        $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/set_screen.php $
+ * @date        $Date: 2008-02-22 16:35:09 -0500 (Fri, 22 Feb 2008) $
  * @version     $Revision: 16202 $
  * @author      $Author: xris $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.18h.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.18h.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.18h.php	2008-06-22 10:34:53.000000000 -0400
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.18h.php	2008-06-22 10:34:53.829578000 -0400
@@ -2,8 +2,8 @@
 /**
  * Display template for 18 Hour Forecast for the Weather module
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/weather.18h.php $
- * @date        $Date: 2008-06-22 07:34:53 -0700 (Sun, 22 Jun 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/weather.18h.php $
+ * @date        $Date: 2008-06-22 10:34:53 -0400 (Sun, 22 Jun 2008) $
  * @version     $Revision: 17568 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.3d.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.3d.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.3d.php	2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.3d.php	2008-02-22 16:35:09.910169000 -0500
@@ -2,8 +2,8 @@
 /**
  * Display template for Three Day Forecast for the Weather module
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/weather.3d.php $
- * @date        $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/weather.3d.php $
+ * @date        $Date: 2008-02-22 16:35:09 -0500 (Fri, 22 Feb 2008) $
  * @version     $Revision: 16202 $
  * @author      $Author: xris $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.6d.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.6d.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.6d.php	2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.6d.php	2008-02-22 16:35:09.910169000 -0500
@@ -2,8 +2,8 @@
 /**
  * Display template for Six Day Forecast for the Weather module
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/weather.6d.php $
- * @date        $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/weather.6d.php $
+ * @date        $Date: 2008-02-22 16:35:09 -0500 (Fri, 22 Feb 2008) $
  * @version     $Revision: 16202 $
  * @author      $Author: xris $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.am.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.am.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.am.php	2009-09-12 00:26:24.000000000 -0400
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.am.php	2009-09-12 00:26:24.233065000 -0400
@@ -2,8 +2,8 @@
 /**
  * Display template for Animated Maps for the Weather module
  a
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/weather.am.php $
- * @date        $Date: 2009-09-11 21:26:24 -0700 (Fri, 11 Sep 2009) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/weather.am.php $
+ * @date        $Date: 2009-09-12 00:26:24 -0400 (Sat, 12 Sep 2009) $
  * @version     $Revision: 21795 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.cc.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.cc.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.cc.php	2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.cc.php	2008-02-22 16:35:09.910169000 -0500
@@ -2,8 +2,8 @@
 /**
  * Display template for Current Conditions for the Weather module
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/weather.cc.php $
- * @date        $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/weather.cc.php $
+ * @date        $Date: 2008-02-22 16:35:09 -0500 (Fri, 22 Feb 2008) $
  * @version     $Revision: 16202 $
  * @author      $Author: xris $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.php	2009-08-02 00:50:00.000000000 -0400
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.php	2009-08-02 00:50:00.173060000 -0400
@@ -2,8 +2,8 @@
 /**
  * Display template for the Weather module
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/weather.php $
- * @date        $Date: 2009-08-01 21:50:00 -0700 (Sat, 01 Aug 2009) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/weather.php $
+ * @date        $Date: 2009-08-02 00:50:00 -0400 (Sun, 02 Aug 2009) $
  * @version     $Revision: 21099 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.sm.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.sm.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/weather.sm.php	2009-09-12 00:26:24.000000000 -0400
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/weather.sm.php	2009-09-12 00:26:24.233065000 -0400
@@ -2,8 +2,8 @@
 /**
  * Display template for Static Maps for the Weather module
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/weather.sm.php $
- * @date        $Date: 2009-09-11 21:26:24 -0700 (Fri, 11 Sep 2009) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/weather.sm.php $
+ * @date        $Date: 2009-09-12 00:26:24 -0400 (Sat, 12 Sep 2009) $
  * @version     $Revision: 21795 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/welcome.php mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/welcome.php
--- mythplugins-0.23.1-release/mythweb/modules/weather/tmpl/default/welcome.php	2008-02-10 04:51:19.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/weather/tmpl/default/welcome.php	2008-02-10 04:51:19.898502000 -0500
@@ -2,8 +2,8 @@
 /**
  * Welcome page description of the Weather module.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/weather/tmpl/default/welcome.php $
- * @date        $Date: 2008-02-10 01:51:19 -0800 (Sun, 10 Feb 2008) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/weather/tmpl/default/welcome.php $
+ * @date        $Date: 2008-02-10 04:51:19 -0500 (Sun, 10 Feb 2008) $
  * @version     $Revision: 15887 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/modules/welcome.php mythplugins-0.23.1/mythweb/modules/welcome.php
--- mythplugins-0.23.1-release/mythweb/modules/welcome.php	2009-01-20 01:42:03.000000000 -0500
+++ mythplugins-0.23.1/mythweb/modules/welcome.php	2009-01-20 01:42:03.375248000 -0500
@@ -2,8 +2,8 @@
 /**
  * Welcome page that lists the available mythweb sections
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/modules/welcome.php $
- * @date        $Date: 2009-01-19 22:42:03 -0800 (Mon, 19 Jan 2009) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/modules/welcome.php $
+ * @date        $Date: 2009-01-20 01:42:03 -0500 (Tue, 20 Jan 2009) $
  * @version     $Revision: 19752 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/mythweb.php mythplugins-0.23.1/mythweb/mythweb.php
--- mythplugins-0.23.1-release/mythweb/mythweb.php	2009-01-20 01:42:03.000000000 -0500
+++ mythplugins-0.23.1/mythweb/mythweb.php	2009-01-20 01:42:03.375248000 -0500
@@ -2,8 +2,8 @@
 /**
  * The main brain script for all of MythWeb.
  *
- * @url         $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/mythweb.php $
- * @date        $Date: 2009-01-19 22:42:03 -0800 (Mon, 19 Jan 2009) $
+ * @url         $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/mythweb.php $
+ * @date        $Date: 2009-01-20 01:42:03 -0500 (Tue, 20 Jan 2009) $
  * @version     $Revision: 19752 $
  * @author      $Author: kormoc $
  * @license     GPL
diff -Naurp -x '*/docs/*' mythplugins-0.23.1-release/mythweb/mythweb.pl mythplugins-0.23.1/mythweb/mythweb.pl
--- mythplugins-0.23.1-release/mythweb/mythweb.pl	2008-11-08 17:54:46.000000000 -0500
+++ mythplugins-0.23.1/mythweb/mythweb.pl	2008-11-08 17:54:46.123838000 -0500
@@ -2,8 +2,8 @@
 #
 # This is the perl-based module handler.  It is the counterpart of mythweb.php
 #
-# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythplugins/mythweb/mythweb.pl $
-# @date      $Date: 2008-11-08 14:54:46 -0800 (Sat, 08 Nov 2008) $
+# @url       $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythplugins/mythweb/mythweb.pl $
+# @date      $Date: 2008-11-08 17:54:46 -0500 (Sat, 08 Nov 2008) $
 # @version   $Revision: 19007 $
 # @author    $Author: kormoc $
 #

mythtv-0.23.1-svnfixes.patch:
 VERSION                                                 |    1 
 bindings/perl/IO/Socket/INET/MythTV.pm                  |    4 
 bindings/perl/MythTV.pm                                 |    4 
 bindings/perl/MythTV/Channel.pm                         |    4 
 bindings/perl/MythTV/Program.pm                         |    4 
 bindings/perl/MythTV/Recording.pm                       |    4 
 bindings/perl/MythTV/StorageGroup.pm                    |    4 
 bindings/python/MythTV/MythBase.py                      |   26 +
 bindings/python/MythTV/MythData.py                      |   14 
 bindings/python/MythTV/MythFunc.py                      |    4 
 bindings/python/scripts/mythpython                      |   10 
 configure                                               |    1 
 contrib/config_files/lirc/lircrc.native.example.mceusb2 |    2 
 contrib/icons/master_iconmap/channel_icons.pl           |    4 
 contrib/imports/mirobridge/mirobridge.py                |    5 
 contrib/maintenance/flush_deleted_recgroup.pl           |    4 
 contrib/maintenance/optimize_mythdb.pl                  |    4 
 contrib/user_jobs/firewire_primer.pl                    |    4 
 contrib/user_jobs/mythlink.pl                           |    4 
 docs/index.html                                         |   15 -
 docs/mythtv-HOWTO-1.html                                |    8 
 docs/mythtv-HOWTO-10.html                               |    2 
 docs/mythtv-HOWTO-11.html                               |   43 +-
 docs/mythtv-HOWTO-12.html                               |   12 
 docs/mythtv-HOWTO-13.html                               |   10 
 docs/mythtv-HOWTO-14.html                               |    4 
 docs/mythtv-HOWTO-15.html                               |    4 
 docs/mythtv-HOWTO-16.html                               |   30 +-
 docs/mythtv-HOWTO-17.html                               |   11 
 docs/mythtv-HOWTO-18.html                               |    4 
 docs/mythtv-HOWTO-19.html                               |    4 
 docs/mythtv-HOWTO-2.html                                |    2 
 docs/mythtv-HOWTO-20.html                               |    2 
 docs/mythtv-HOWTO-21.html                               |    4 
 docs/mythtv-HOWTO-22.html                               |    6 
 docs/mythtv-HOWTO-23.html                               |   48 ---
 docs/mythtv-HOWTO-24.html                               |   13 
 docs/mythtv-HOWTO-3.html                                |   28 -
 docs/mythtv-HOWTO-4.html                                |    2 
 docs/mythtv-HOWTO-5.html                                |   20 -
 docs/mythtv-HOWTO-6.html                                |    4 
 docs/mythtv-HOWTO-7.html                                |    2 
 docs/mythtv-HOWTO-8.html                                |    4 
 docs/mythtv-HOWTO-9.html                                |   15 -
 docs/mythtv-HOWTO-singlehtml.html                       |  238 ++++++----------
 docs/mythtv-HOWTO.html                                  |   15 -
 docs/mythtv-HOWTO.sgml                                  |  186 ++++++------
 libs/libmythsoundtouch/AAFilter.cpp                     |    2 
 libs/libmythsoundtouch/AAFilter.h                       |    2 
 libs/libmythsoundtouch/BPMDetect.h                      |    2 
 libs/libmythsoundtouch/FIFOSampleBuffer.cpp             |    2 
 libs/libmythsoundtouch/FIFOSampleBuffer.h               |    2 
 libs/libmythsoundtouch/FIFOSamplePipe.h                 |    2 
 libs/libmythsoundtouch/FIRFilter.cpp                    |    2 
 libs/libmythsoundtouch/FIRFilter.h                      |    2 
 libs/libmythsoundtouch/RateTransposer.cpp               |    2 
 libs/libmythsoundtouch/RateTransposer.h                 |    2 
 libs/libmythsoundtouch/STTypes.h                        |    2 
 libs/libmythsoundtouch/SoundTouch.cpp                   |    2 
 libs/libmythsoundtouch/SoundTouch.h                     |    2 
 libs/libmythsoundtouch/TDStretch.cpp                    |    2 
 libs/libmythsoundtouch/TDStretch.h                      |    2 
 libs/libmythsoundtouch/cpu_detect.h                     |    2 
 libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp           |    2 
 libs/libmythsoundtouch/mmx_gcc.cpp                      |    2 
 libs/libmythui/lirc.cpp                                 |    2 
 programs/mythfrontend/proglist.cpp                      |    8 
 version.pro                                             |    2 
 68 files changed, 408 insertions(+), 483 deletions(-)

--- NEW FILE mythtv-0.23.1-svnfixes.patch ---
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/IO/Socket/INET/MythTV.pm mythtv-0.23.1/bindings/perl/IO/Socket/INET/MythTV.pm
--- mythtv-0.23.1-release/bindings/perl/IO/Socket/INET/MythTV.pm	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/IO/Socket/INET/MythTV.pm	2009-04-10 20:04:30.069718000 -0400
@@ -3,8 +3,8 @@
 # A MythTV Socket class that extends IO::Socket::INET to include some
 # MythTV-specific data queries
 #
-# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/IO/Socket/INET/MythTV.pm $
-# @date      $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+# @url       $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/bindings/perl/IO/Socket/INET/MythTV.pm $
+# @date      $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 # @version   $Revision: 20349 $
 # @author    $Author: xris $
 # @copyright Silicon Mechanics
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV/Channel.pm mythtv-0.23.1/bindings/perl/MythTV/Channel.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/Channel.pm	2010-05-23 12:42:23.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/MythTV/Channel.pm	2010-05-23 12:42:23.678567000 -0400
@@ -3,8 +3,8 @@
 #
 # Object containing info about a particular MythTV channel.
 #
-# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV/Channel.pm $
-# @date      $Date: 2010-05-23 09:42:23 -0700 (Sun, 23 May 2010) $
+# @url       $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/bindings/perl/MythTV/Channel.pm $
+# @date      $Date: 2010-05-23 12:42:23 -0400 (Sun, 23 May 2010) $
 # @version   $Revision: 24810 $
 # @author    $Author: mdean $
 #
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV/Program.pm mythtv-0.23.1/bindings/perl/MythTV/Program.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/Program.pm	2009-07-06 13:01:48.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/MythTV/Program.pm	2009-07-06 13:01:48.827558000 -0400
@@ -3,8 +3,8 @@
 #
 # Object containing info about a particular MythTV program.
 #
-# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV/Program.pm $
-# @date      $Date: 2009-07-06 10:01:48 -0700 (Mon, 06 Jul 2009) $
+# @url       $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/bindings/perl/MythTV/Program.pm $
+# @date      $Date: 2009-07-06 13:01:48 -0400 (Mon, 06 Jul 2009) $
 # @version   $Revision: 20795 $
 # @author    $Author: stuartm $
 #
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV/Recording.pm mythtv-0.23.1/bindings/perl/MythTV/Recording.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/Recording.pm	2010-03-21 19:16:27.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/MythTV/Recording.pm	2010-03-21 19:16:27.821969000 -0400
@@ -3,8 +3,8 @@
 #
 # Object containing info about a particular MythTV recording.
 #
-# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV/Recording.pm $
-# @date      $Date: 2010-03-21 16:16:27 -0700 (Sun, 21 Mar 2010) $
+# @url       $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/bindings/perl/MythTV/Recording.pm $
+# @date      $Date: 2010-03-21 19:16:27 -0400 (Sun, 21 Mar 2010) $
 # @version   $Revision: 23772 $
 # @author    $Author: beirdo $
 #
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV/StorageGroup.pm mythtv-0.23.1/bindings/perl/MythTV/StorageGroup.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/StorageGroup.pm	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/MythTV/StorageGroup.pm	2009-04-10 20:04:30.069718000 -0400
@@ -3,8 +3,8 @@
 #
 # Object containing info about a particular MythTV Storage Group.
 #
-# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV/StorageGroup.pm $
-# @date      $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+# @url       $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/bindings/perl/MythTV/StorageGroup.pm $
+# @date      $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 # @version   $Revision: 20349 $
 # @author    $Author: xris $
 #
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV.pm mythtv-0.23.1/bindings/perl/MythTV.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV.pm	2010-07-21 22:21:00.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/MythTV.pm	2010-07-21 22:21:00.112292000 -0400
@@ -1,8 +1,8 @@
 #
 # MythTV bindings for perl.
 #
-# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV.pm $
-# @date      $Date: 2010-07-21 19:21:00 -0700 (Wed, 21 Jul 2010) $
+# @url       $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/bindings/perl/MythTV.pm $
+# @date      $Date: 2010-07-21 22:21:00 -0400 (Wed, 21 Jul 2010) $
 # @version   $Revision: 25396 $
 # @author    $Author: gigem $
 #
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/python/MythTV/MythBase.py mythtv-0.23.1/bindings/python/MythTV/MythBase.py
--- mythtv-0.23.1-release/bindings/python/MythTV/MythBase.py	2010-05-04 20:45:58.000000000 -0400
+++ mythtv-0.23.1/bindings/python/MythTV/MythBase.py	2010-07-30 01:30:44.653168000 -0400
@@ -979,7 +979,7 @@ class MythDBBase( object ):
             for config_file in config_files:
                 dbconn.update({ 'DBHostName':None,  'DBName':None,
                                 'DBUserName':None,  'DBPassword':None,
-                                'DBPort':0})
+                                'DBPort':0,         'LocalHostName':None})
                 try:
                     config = etree.parse(config_file).getroot()
                     for child in config.find('UPnP').find('MythFrontend').\
@@ -1027,13 +1027,20 @@ class MythDBBase( object ):
                 fp.write(config)
                 fp.close()
                 
-        if 'DBPort' not in dbconn:
-            dbconn['DBPort'] = 3306
+        if 'DBPort' in dbconn:
+            if dbconn['DBPort'] == '0':
+                dbconn['DBPort'] = 3306
+            else:
+                dbconn['DBPort'] = int(dbconn['DBPort'])
         else:
-            dbconn['DBPort'] = int(dbconn['DBPort'])
-        if dbconn['DBPort'] == 0:
             dbconn['DBPort'] = 3306
 
+        if 'LocalHostName' in dbconn:
+            if dbconn['LocalHostName'] is None:
+                dbconn['LocalHostName'] = socket.gethostname()
+        else:
+            dbconn['LocalHostName'] = socket.gethostname()
+
         self.dbconn = dbconn
         self.ident = "sql://%s@%s:%d/" % \
                 (dbconn['DBName'],dbconn['DBHostName'],dbconn['DBPort'])
@@ -1147,6 +1154,9 @@ class MythDBBase( object ):
             self.db = None
             raise MythDBError(MythError.DB_SCHEMAMISMATCH, value, sver, local)
 
+    def gethostname(self):
+        return self.dbconn['LocalHostName']
+
     def getStorageGroup(self, groupname=None, hostname=None):
         """
         obj.getStorageGroup(groupname=None, hostname=None)
@@ -1245,7 +1255,7 @@ class MythBEConn( object ):
             raise
 
     def announce(self,type):
-        res = self.backendCommand('ANN %s %s 0' % (type, socket.gethostname()))
+        res = self.backendCommand('ANN %s %s 0' % (type, self.db.gethostname()))
         if res != 'OK':
             self.log(MythLog.IMPORTANT|MythLog.NETWORK,
                             "Unexpected answer to ANN", res)
@@ -1795,7 +1805,7 @@ class StorageGroup( DBData ):
         DBData.__init__(self, (id,), db, raw)
         if self.wheredat is None:
             return
-        if (self.hostname == socket.gethostname()) or \
+        if (self.hostname == self.db.gethostname()) or \
               os.access(self.dirname.encode('utf-8'), os.F_OK):
             self.local = True
         else:
@@ -1817,7 +1827,7 @@ class Grabber( MythDBBase ):
         if path is not None:
             self.path = path
         elif setting is not None:
-            host = socket.gethostname()
+            host = self.gethostname()
             self.path = self.settings[host][setting]
             if self.path is None:
                 raise MythDBError(MythError.DB_SETTING, setting, host)
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/python/MythTV/MythData.py mythtv-0.23.1/bindings/python/MythTV/MythData.py
--- mythtv-0.23.1-release/bindings/python/MythTV/MythData.py	2010-06-06 20:03:02.000000000 -0400
+++ mythtv-0.23.1/bindings/python/MythTV/MythData.py	2010-07-30 01:30:44.653168000 -0400
@@ -7,11 +7,11 @@ Provides data access classes for accessi
 from MythStatic import *
 from MythBase import *
 
-import re, sys, socket, os
+import re, sys, os
 import xml.etree.cElementTree as etree
 from time import mktime, strftime, strptime
 from datetime import date, time, datetime
-from socket import gethostbyaddr, gethostname
+from socket import gethostbyaddr
 
 #### FILE ACCESS ####
 
@@ -161,7 +161,7 @@ class FileTransfer( MythBEConn ):
         elif type == 'r':
             self.w = False
         res = self.backendCommand('ANN FileTransfer %s %d %d %s' \
-                    % (socket.gethostname(), self.w, False,
+                    % (self.db.gethostname(), self.w, False,
                         BACKEND_SEP.join(['-1',self.filename,self.sgroup])))
         if res.split(BACKEND_SEP)[0] != 'OK':
             raise MythError(MythError.PROTO_ANNOUNCE, self.host, self.port, res)
@@ -1454,7 +1454,7 @@ class NetVisionGrabber( Grabber ):
                                 NVSCHEMA_VERSION, 'NetVision')
         c = db.cursor(self.log)
         log = MythLog('Python MythNetVision Grabber', db=db)
-        host = gethostname()
+        host = db.gethostname()
         glist = []
         for t in types.split(','):
             c.execute("""SELECT name,commandline
@@ -1478,7 +1478,7 @@ class NetVisionGrabber( Grabber ):
             if c.execute("""SELECT commandline
                             FROM netvision%sgrabbers
                             WHERE name=%%s AND host=%%s""" % type,
-                                        (name, gethostname())) == 1:
+                                        (name, db.gethostname())) == 1:
[...2322 lines suppressed...]
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: FIFOSampleBuffer.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSampleBuffer.h mythtv-0.23.1/libs/libmythsoundtouch/FIFOSampleBuffer.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSampleBuffer.h	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIFOSampleBuffer.h	2009-04-10 20:04:30.069718000 -0400
@@ -15,7 +15,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: FIFOSampleBuffer.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSamplePipe.h mythtv-0.23.1/libs/libmythsoundtouch/FIFOSamplePipe.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSamplePipe.h	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIFOSamplePipe.h	2009-04-10 20:04:30.069718000 -0400
@@ -17,7 +17,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: FIFOSamplePipe.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.cpp mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.cpp	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.cpp	2009-04-10 20:04:30.069718000 -0400
@@ -11,7 +11,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: FIRFilter.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.h mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.h	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.h	2009-04-10 20:04:30.069718000 -0400
@@ -11,7 +11,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: FIRFilter.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/mmx_gcc.cpp mythtv-0.23.1/libs/libmythsoundtouch/mmx_gcc.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/mmx_gcc.cpp	2009-07-06 16:42:28.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/mmx_gcc.cpp	2009-07-06 16:42:28.950839000 -0400
@@ -15,7 +15,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-07-06 13:42:28 -0700 (Mon, 06 Jul 2009) $
+// Last changed  : $Date: 2009-07-06 16:42:28 -0400 (Mon, 06 Jul 2009) $
 // File revision : $Revision: 20797 $
 //
 // $Id: mmx_gcc.cpp 20797 2009-07-06 20:42:28Z janne $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.cpp mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.cpp	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.cpp	2009-04-10 20:04:30.069718000 -0400
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: RateTransposer.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.h mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.h	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.h	2009-04-10 20:04:30.069718000 -0400
@@ -14,7 +14,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: RateTransposer.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.cpp mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.cpp	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.cpp	2009-04-10 20:04:30.069718000 -0400
@@ -41,7 +41,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: SoundTouch.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.h mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.h	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.h	2009-04-10 20:04:30.069718000 -0400
@@ -41,7 +41,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: SoundTouch.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/STTypes.h mythtv-0.23.1/libs/libmythsoundtouch/STTypes.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/STTypes.h	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/STTypes.h	2009-04-10 20:04:30.069718000 -0400
@@ -8,7 +8,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: STTypes.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.cpp mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.cpp	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.cpp	2009-04-10 20:04:30.069718000 -0400
@@ -13,7 +13,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: TDStretch.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.h mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.h	2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.h	2009-04-10 20:04:30.069718000 -0400
@@ -13,7 +13,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed  : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
 // File revision : $Revision: 20349 $
 //
 // $Id: TDStretch.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythui/lirc.cpp mythtv-0.23.1/libs/libmythui/lirc.cpp
--- mythtv-0.23.1-release/libs/libmythui/lirc.cpp	2009-11-28 10:55:09.000000000 -0500
+++ mythtv-0.23.1/libs/libmythui/lirc.cpp	2010-07-23 21:29:36.107491000 -0400
@@ -383,6 +383,8 @@ void LIRC::Process(const QByteArray &dat
             mod |= (Qt::CTRL  & keycode) ? Qt::ControlModifier: Qt::NoModifier;
             mod |= (Qt::ALT   & keycode) ? Qt::AltModifier   : Qt::NoModifier;
 
+            keycode &= ~Qt::MODIFIER_MASK;
+
             QString text = "";
             if (!mod)
                 text = QString(QChar(keycode));
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/programs/mythfrontend/proglist.cpp mythtv-0.23.1/programs/mythfrontend/proglist.cpp
--- mythtv-0.23.1-release/programs/mythfrontend/proglist.cpp	2010-01-24 09:23:40.000000000 -0500
+++ mythtv-0.23.1/programs/mythfrontend/proglist.cpp	2010-07-25 23:07:19.192973000 -0400
@@ -912,10 +912,14 @@ void ProgLister::fillViewList(const QStr
         {
             while (query.next())
             {
-                QString phrase = query.value(0).toString();
+                /* The keyword.phrase column uses utf8_bin collation, so
+                 * Qt uses QString::fromAscii() for toString(). Explicitly
+                 * convert the value using QString::fromUtf8() to prevent
+                 * corruption. */
+                QString phrase = QString::fromUtf8(query.value(0)
+                                                   .toByteArray().constData());
                 if (phrase.isEmpty())
                     continue;
-                phrase = query.value(0).toString();
                 m_viewList << phrase;
                 m_viewTextList << phrase;
             }
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/VERSION mythtv-0.23.1/VERSION
--- mythtv-0.23.1-release/VERSION	2010-07-22 02:40:45.000000000 -0400
+++ mythtv-0.23.1/VERSION	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-SOURCE_VERSION="0.23.1"
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/version.pro mythtv-0.23.1/version.pro
--- mythtv-0.23.1-release/version.pro	2009-10-04 12:38:03.000000000 -0400
+++ mythtv-0.23.1/version.pro	2009-10-04 12:38:03.692900000 -0400
@@ -6,7 +6,7 @@
 ############################################################
 
 SVNTREEDIR = $$system(pwd)
-SVNREPOPATH = "$$URL: http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/version.pro $$"
+SVNREPOPATH = "$$URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/version.pro $$"
 
 
 SOURCES += version.cpp


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythtv.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mythtv.spec	24 Jul 2010 04:48:00 -0000	1.74
+++ mythtv.spec	13 Aug 2010 21:02:11 -0000	1.75
@@ -65,7 +65,7 @@
 %define desktop_vendor  RPMFusion
 
 # SVN Revision number and branch ID
-%define _svnrev r25413
+%define _svnrev r25638
 %define branch release-0-23-fixes
 
 #
@@ -77,11 +77,11 @@
 Group:          Applications/Multimedia
 
 # Version/Release info
-Version: 0.23
+Version: 0.23.1
 %if "%{branch}" == "trunk"
 Release: 0.1.svn.%{_svnrev}%{?dist}
 %else
-Release: 8%{?dist}
+Release: 1%{?dist}
 %endif
 
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1449,6 +1449,9 @@
 ################################################################################
 
 %changelog
+* Fri Aug 13 2010 Jarod Wilson <jarod at wilsonet.com> 0.23.1-1
+- Update to 0.23.1 release (plus a few minor svn fixes)
+
 * Fri Jul 23 2010 Jarod Wilson <jarod at wilsonet.com> 0.23-8
 - Update to release-0-23-fixes branch, svn revision 25413
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	10 May 2010 16:04:22 -0000	1.39
+++ sources	13 Aug 2010 21:02:12 -0000	1.40
@@ -1,4 +1,4 @@
 be3ab99952c2a3a135a7c4af90b08f15  mythfrontend.png
 be3ab99952c2a3a135a7c4af90b08f15  mythtv-setup.png
-be44db841f9e03d0d17ab449545b38aa  mythplugins-0.23.tar.bz2
-3c58f4f45a550b60fbddfb8726d7fc38  mythtv-0.23.tar.bz2
+3379a5fd12ae866cd10c5b5d23439898  mythtv-0.23.1.tar.bz2
+edd9c5f8a9ae0189b1c8951fa8282c4d  mythplugins-0.23.1.tar.bz2


--- mythplugins-0.23-svnfixes.patch DELETED ---



More information about the rpmfusion-commits mailing list