rpms/mythtv/devel mythbackend.init, NONE, 1.1 mythbackend.logrotate, NONE, 1.1 mythbackend.sysconfig, NONE, 1.1 mythbackend.init.in, 1.3, NONE mythbackend.logrotate.in, 1.1, NONE mythbackend.sysconfig.in, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22430
Added Files:
mythbackend.init mythbackend.logrotate mythbackend.sysconfig
Removed Files:
mythbackend.init.in mythbackend.logrotate.in
mythbackend.sysconfig.in
Log Message:
narf, forgot these have changed since I last touched the devel branch too...
--- NEW FILE mythbackend.init ---
#!/bin/bash
#
# Startup script for mythbackend
#
# chkconfig: - 86 14
# description: mythbackend.
# processname: mythbackend
# pidfile: /var/run/mythbackend.pid
# config:
# Source function library.
. /etc/init.d/functions
if [ -f /etc/sysconfig/mythbackend ]; then
. /etc/sysconfig/mythbackend
fi
## Defaults, override them in /etc/sysconfig/mythbackend
MYTHTV_HOME=${MYTHTV_HOME:-/etc/mythtv}
MYTHBACKEND_USER=${MYTHBACKEND_USER:-root}
binary=/usr/bin/mythbackend
prog=mythbackend
RETVAL=0
OPTIONS="$OPTIONS --daemon --user ${MYTHBACKEND_USER} --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
start() {
echo -n $"Starting $prog: "
touch /var/run/mythbackend.pid
if [ "${MYTHBACKEND_USER}" != root ]; then
chown ${MYTHBACKEND_USER}:${MYTHBACKEND_USER} /var/run/mythbackend.pid
if [ -d /dev/dvb ]; then
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/dvb/
fi
if [ -d /dev/snd ]; then
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/snd/
fi
for f in $(ls /dev/video* 2>/dev/null); do
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- $f
done
for f in $(ls /dev/vbi* 2>/dev/null); do
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- $f
done
fi
export MYTHCONFDIR="$MYTHTV_HOME"
export HOME="$MYTHTV_HOME"
daemon $binary $OPTIONS
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
killproc $binary
RETVAL=$?
if [ "${MYTHBACKEND_USER}" != root ]; then
if [ -d /dev/dvb ]; then
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
fi
if [ -d /dev/snd ]; then
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/snd/
fi
for f in $(ls /dev/video* 2>/dev/null); do
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} $f
done
for f in $(ls /dev/vbi* 2>/dev/null); do
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} $f
done
fi
echo
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
reload|restart)
stop
start
;;
status)
status $prog
RETVAL=$?
;;
*)
echo $"Usage: $prog {start|stop|status|restart}"
exit 1
esac
exit $RETVAL
--- NEW FILE mythbackend.logrotate ---
/var/log/mythtv/mythbackend.log {
notifempty
missingok
compress
compresscmd /usr/bin/bzip2
uncompresscmd /usr/bin/bunzip2
compressext .bz2
weekly
rotate 4
size 10M
postrotate
/bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true
endscript
}
--- NEW FILE mythbackend.sysconfig ---
#MYTHTV_HOME=/etc/mythtv
# mythbackend runs as root by default, but support for running as a non-root
# user should be functional. However, switching to a non-root user on an
# existing setup will require fixing up permissions on files mythbackend
# needs access to -- particularly, your recordings, which are owned by the
# user mythbackend runs as. If you switch from running as root to running as
# user mythtv, deleting existing recordings won't work until their file
# ownership has been changed from root to mythtv as well.
#MYTHBACKEND_USER=mythtv
#OPTIONS=
--- mythbackend.init.in DELETED ---
--- mythbackend.logrotate.in DELETED ---
--- mythbackend.sysconfig.in DELETED ---
13 years, 8 months
- 1
- 0
rpms/mythtv/devel mythplugins-0.24-fixes.patch, NONE, 1.1 mythtv-0.24-fixes.patch, NONE, 1.1 mythweb-0.24-fixes.patch, NONE, 1.1 mythtv.spec, 1.76, 1.77 mythplugins-compile_fixes_for_qt_4_7.patch, 1.1, NONE mythtv-0.22-svnfixes.patch, 1.1, NONE mythtv-compile_fixes_for_qt_4_7.patch, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22148
Modified Files:
mythtv.spec
Added Files:
mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch
mythweb-0.24-fixes.patch
Removed Files:
mythplugins-compile_fixes_for_qt_4_7.patch
mythtv-0.22-svnfixes.patch
mythtv-compile_fixes_for_qt_4_7.patch
Log Message:
* Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6
- Update to 0.24 fixes, git revision 4af46b1f5d
- Fix mythtv version output to properly show git revision
mythplugins-0.24-fixes.patch:
.gitignore | 6
mytharchive/i18n/.gitignore | 1
mytharchive/mytharchive/recordingselector.cpp | 2
mytharchive/mytharchivehelper/.gitignore | 1
mytharchive/mytharchivehelper/pxsup2dast.c | 2
mytharchive/mythburn/scripts/mythburn.py | 13 -
mytharchive/theme/default-wide/mytharchive-ui.xml | 12
mytharchive/theme/default-wide/mythburn-ui.xml | 7
mytharchive/theme/default/mytharchive-ui.xml | 12
mytharchive/theme/default/mythburn-ui.xml | 7
mythbrowser/i18n/.gitignore | 1
mythbrowser/theme/default-wide/browser-ui.xml | 15 -
mythbrowser/theme/default/browser-ui.xml | 15 -
mythgallery/dcrawplugin/.gitignore | 1
mythgallery/i18n/.gitignore | 1
mythgallery/mythgallery/.gitignore | 1
mythgallery/mythgallery/gallerysettings.cpp | 10
mythgallery/mythgallery/galleryutil.cpp | 4
mythgallery/mythgallery/main.cpp | 3
mythgame/i18n/.gitignore | 1
mythgame/mythgame/.gitignore | 1
mythmusic/i18n/.gitignore | 1
mythmusic/mythmusic/.gitignore | 1
mythmusic/mythmusic/cdrip.cpp | 2
mythmusic/mythmusic/filescanner.cpp | 40 +--
mythmusic/mythmusic/musicplayer.cpp | 5
mythnetvision/i18n/.gitignore | 1
mythnetvision/mythfillnetvision/.gitignore | 1
mythnews/i18n/.gitignore | 1
mythnews/mythnews/main.cpp | 2
mythvideo/i18n/.gitignore | 1
mythvideo/mtd/.gitignore | 1
mythvideo/mythvideo/.gitignore | 1
mythvideo/mythvideo/scripts/jamu.py | 14 -
mythweather/i18n/.gitignore | 1
mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 40 +--
mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl | 127 ++++++++++
mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 4
mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 4
mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl | 1
mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 1
mythzoneminder/i18n/.gitignore | 1
mythzoneminder/mythzmserver/.gitignore | 1
mythzoneminder/mythzoneminder/zmliveplayer.cpp | 4
mythzoneminder/theme/default-wide/zoneminder-ui.xml | 12
45 files changed, 278 insertions(+), 105 deletions(-)
--- NEW FILE mythplugins-0.24-fixes.patch ---
diff -Naurp mythplugins-0.24.orig/.gitignore mythplugins-0.24.fixes/.gitignore
--- mythplugins-0.24.orig/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1,6 @@
+Makefile
+themenop
+config.ep
+config.pro
+config.log
+mythconfig.mak
diff -Naurp mythplugins-0.24.orig/mytharchive/i18n/.gitignore mythplugins-0.24.fixes/mytharchive/i18n/.gitignore
--- mythplugins-0.24.orig/mytharchive/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mytharchive/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp
--- mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp 2010-10-06 06:38:18.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -116,7 +116,7 @@ bool RecordingSelector::Create(void)
void RecordingSelector::Init(void)
{
- QString message = tr("Retrieving Recording List. Please Wait...");
+ QString message = tr("Retrieving Recording List.\nPlease Wait...");
MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mytharchivehelper
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c 2011-02-28 22:42:02.000000000 -0500
@@ -1,6 +1,6 @@
/*
#
- # $Id: pxsup2dast.c 25914 2010-08-28 20:16:22Z xris $
+ # $Id$
#
# Project X sup to dvdauthor subtitle xml file.
# too ät iki piste fi
diff -Naurp mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py
--- mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py 2010-10-06 09:07:39.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py 2011-02-28 22:42:02.000000000 -0500
@@ -38,7 +38,7 @@
#******************************************************************************
# version of script - change after each update
-VERSION="0.1.20101006-1"
+VERSION="0.1.20101206-1"
# keep all temporary files for debugging purposes
# set this to True before a first run through when testing
@@ -400,7 +400,7 @@ def getThemeFile(theme,file):
# Returns the path where we can find our fonts
def getFontPathName(fontname):
- return os.path.join(sharepath, fontname)
+ return os.path.join(sharepath, "fonts", fontname)
#############################################################
# Creates a file path where the temp files for a video file can be created
@@ -2677,12 +2677,16 @@ def deMultiplexMPEG2File(folder, mediafi
command += "-a %d " % (audio1[AUDIO_ID])
elif audio1[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio1[AUDIO_ID])
+ elif audio1[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio1[AUDIO_ID])
if audio2[AUDIO_ID] != -1:
if audio2[AUDIO_CODEC] == 'MP2':
command += "-a %d " % (audio2[AUDIO_ID])
elif audio2[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio2[AUDIO_ID])
+ elif audio2[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio2[AUDIO_ID])
else:
command = "mythreplex --demux --fix_sync -o %s " % (folder + "/stream")
@@ -2693,12 +2697,17 @@ def deMultiplexMPEG2File(folder, mediafi
command += "-a %d " % (audio1[AUDIO_ID] & 255)
elif audio1[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio1[AUDIO_ID] & 255)
+ elif audio1[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio1[AUDIO_ID] & 255)
+
if audio2[AUDIO_ID] != -1:
if audio2[AUDIO_CODEC] == 'MP2':
command += "-a %d " % (audio2[AUDIO_ID] & 255)
elif audio2[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio2[AUDIO_ID] & 255)
+ elif audio2[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio2[AUDIO_ID] & 255)
mediafile = quoteFilename(mediafile)
command += mediafile
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -146,7 +146,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -154,7 +154,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -259,7 +259,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -267,7 +267,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -330,7 +330,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -338,7 +338,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
- <imagetype name="box">
- <filename>mz_function_popup.png</filename>
- </imagetype>
+ <shape name="background" from="basebackground">
+ <area>0,0,413,426</area>
+ <fill color="#000000" alpha="220" />
+ </shape>
<textarea name="title" from="basetextarea">
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -147,7 +147,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -155,7 +155,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -261,7 +261,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -269,7 +269,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -333,7 +333,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -341,7 +341,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
- <imagetype name="box">
- <filename>mz_function_popup.png</filename>
- </imagetype>
+ <shape name="background" from="basebackground">
+ <area>0,0,413,426</area>
+ <fill color="#000000" alpha="220" />
+ </shape>
<textarea name="title" from="basetextarea">
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mythbrowser/i18n/.gitignore mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore
--- mythplugins-0.24.orig/mythbrowser/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml
--- mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml 2010-10-09 15:44:27.000000000 -0400
+++ mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -53,9 +53,8 @@
<statetype name="buttonitem">
<area>0,0,180,40</area>
<state name="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector.png</filename>
- </imagetype>
+ <area>0,0,180,40</area>
+ <shape name="background" from="basewidgetshape" />
<textarea name="buttontext" from="basetextarea">
<area>0,0,180,40</area>
<font>basesmall</font>
@@ -63,14 +62,12 @@
</textarea>
</state>
<state name="selectedactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_selected.png</filename>
- </imagetype>
+ <shape name="background" from="baseselectedwidgetshape" />
</state>
<state name="selectedinactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_inactive.png</filename>
- </imagetype>
+ <textarea name="buttontext">
+ <font>basesmallgrey</font>
+ </textarea>
</state>
</statetype>
<statetype name="downscrollarrow">
diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml
--- mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml 2010-10-09 15:44:27.000000000 -0400
+++ mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -61,9 +61,8 @@
<statetype name="buttonitem">
<area>0,0,180,40</area>
<state name="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector.png</filename>
- </imagetype>
+ <area>0,0,180,40</area>
+ <shape name="background" from="basewidgetshape" />
<textarea name="buttontext" from="basetextarea">
<area>0,0,180,40</area>
<font>basesmall</font>
@@ -73,14 +72,12 @@
</textarea>
</state>
<state name="selectedactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_selected.png</filename>
- </imagetype>
+ <shape name="background" from="baseselectedwidgetshape" />
</state>
<state name="selectedinactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_inactive.png</filename>
- </imagetype>
+ <textarea name="buttontext">
+ <font>basesmallgrey</font>
+ </textarea>
</state>
</statetype>
<statetype name="downscrollarrow">
diff -Naurp mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore
--- mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythgallery/i18n/.gitignore mythplugins-0.24.fixes/mythgallery/i18n/.gitignore
--- mythplugins-0.24.orig/mythgallery/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgallery/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -78,6 +78,15 @@ static HostLineEdit *MythGalleryImportDi
return gc;
};
+static HostCheckBox *MythGalleryAutoLoad()
+{
+ HostCheckBox *gc = new HostCheckBox("GalleryAutoLoad");
+ gc->setLabel(QObject::tr("Automatically load MythGallery to display pictures"));
+ gc->setValue(false);
+ gc->setHelpText(QObject::tr("When a new CD-Rom or removable storage device containing pictures is detected then load MythGallery to display the content."));
+ return gc;
+}
+
#ifdef USING_OPENGL
static HostCheckBox *SlideshowUseOpenGL()
@@ -217,6 +226,7 @@ GallerySettings::GallerySettings()
general->addChild(MythGalleryThumbnailLocation());
general->addChild(MythGallerySortOrder());
general->addChild(MythGalleryImportDirs());
+ general->addChild(MythGalleryAutoLoad());
general->addChild(MythGalleryMoviePlayerCmd());
addChild(general);
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -98,7 +98,7 @@ bool GalleryUtil::IsImage(const QString
QStringList::const_iterator it = filt.begin();
for (; it != filt.end(); ++it)
{
- if ((*it).toLower().contains(fi.suffix()))
+ if ((*it).contains(fi.suffix().toLower()))
return true;
}
@@ -115,7 +115,7 @@ bool GalleryUtil::IsMovie(const QString
QStringList::const_iterator it = filt.begin();
for (; it != filt.end(); ++it)
{
- if ((*it).toLower().contains(fi.suffix()))
+ if ((*it).contains(fi.suffix().toLower()))
return true;
}
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore
--- mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp 2010-10-18 09:02:43.000000000 -0400
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -59,6 +59,9 @@ static void runGallery(void)
static void handleMedia(MythMediaDevice *dev)
{
+ if (! gCoreContext->GetNumSetting("GalleryAutoLoad", 0))
+ return;
+
if (dev && dev->isUsable())
run(dev);
}
diff -Naurp mythplugins-0.24.orig/mythgame/i18n/.gitignore mythplugins-0.24.fixes/mythgame/i18n/.gitignore
--- mythplugins-0.24.orig/mythgame/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgame/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythgame/mythgame/.gitignore mythplugins-0.24.fixes/mythgame/mythgame/.gitignore
--- mythplugins-0.24.orig/mythgame/mythgame/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgame/mythgame/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+gameui.moc
diff -Naurp mythplugins-0.24.orig/mythmusic/i18n/.gitignore mythplugins-0.24.fixes/mythmusic/i18n/.gitignore
--- mythplugins-0.24.orig/mythmusic/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythmusic/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp
--- mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp 2010-09-12 18:53:44.000000000 -0400
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -945,8 +945,6 @@ QString Ripper::filenameFromMetadata(Met
VERBOSE(VB_GENERAL, QString("Invalid file storage definition."));
}
- filename = QString(filename.toLocal8Bit().constData());
-
QStringList directoryList = filename.split("/");
for (int i = 0; i < (directoryList.size() - 1); i++)
{
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp
--- mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp 2010-05-13 00:18:15.000000000 -0400
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -22,7 +22,7 @@ FileScanner::FileScanner ()
MSqlQuery query(MSqlQuery::InitCon());
// Cache the directory ids from the database
- query.prepare("SELECT directory_id, LOWER(path) FROM music_directories");
+ query.prepare("SELECT directory_id, path FROM music_directories");
if (query.exec())
{
while(query.next())
@@ -109,12 +109,12 @@ void FileScanner::BuildFileList(QString
QString dir(filename);
dir.remove(0, m_startdir.length());
- newparentid = m_directoryid[QString(dir.toUtf8()).toLower()];
+ newparentid = m_directoryid[dir];
if (newparentid == 0)
{
int id = GetDirectoryId(dir, parentid);
- m_directoryid[QString(dir.toUtf8()).toLower()] = id;
+ m_directoryid[dir] = id;
if (id > 0)
{
@@ -252,8 +252,7 @@ void FileScanner::AddFileToDB(const QStr
query.prepare("INSERT INTO music_albumart SET filename = :FILE, "
"directory_id = :DIRID, imagetype = :TYPE;");
query.bindValue(":FILE", name);
- query.bindValue(":DIRID", m_directoryid[
- QString(directory.toUtf8()).toLower()]);
+ query.bindValue(":DIRID", m_directoryid[directory]);
query.bindValue(":TYPE", AlbumArtImages::guessImageType(name));
if (!query.exec() || query.numRowsAffected() <= 0)
@@ -274,24 +273,24 @@ void FileScanner::AddFileToDB(const QStr
QString album_cache_string;
// Set values from cache
- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
+ int did = m_directoryid[directory];
if (did > 0)
data->setDirectoryId(did);
- int aid = m_artistid[QString(data->Artist().toUtf8()).toLower()];
+ int aid = m_artistid[data->Artist().toLower()];
if (aid > 0)
{
data->setArtistId(aid);
// The album cache depends on the artist id
album_cache_string = data->getArtistId() + "#"
- + QString(data->Album().toUtf8()).toLower();
+ + data->Album().toLower();
if (m_albumid[album_cache_string] > 0)
data->setAlbumId(m_albumid[album_cache_string]);
}
- int gid = m_genreid[QString(data->Genre().toUtf8()).toLower()];
+ int gid = m_genreid[data->Genre().toLower()];
if (gid > 0)
data->setGenreId(gid);
@@ -299,14 +298,14 @@ void FileScanner::AddFileToDB(const QStr
data->dumpToDatabase();
// Update the cache
- m_artistid[QString(data->Artist().toUtf8()).toLower()] =
+ m_artistid[data->Artist().toLower()] =
data->getArtistId();
- m_genreid[QString(data->Genre().toUtf8()).toLower()] =
+ m_genreid[data->Genre().toLower()] =
data->getGenreId();
album_cache_string = data->getArtistId() + "#"
- + QString(data->Album().toUtf8()).toLower();
+ + data->Album().toLower();
m_albumid[album_cache_string] = data->getAlbumId();
delete data;
}
@@ -445,8 +444,7 @@ void FileScanner::RemoveFileFromDB (cons
query.prepare("DELETE FROM music_albumart WHERE filename= :FILE AND "
"directory_id= :DIRID;");
query.bindValue(":FILE", sqlfilename);
- query.bindValue(":DIRID", m_directoryid[
- QString(directory.toUtf8()).toLower()]);
+ query.bindValue(":DIRID", m_directoryid[directory]);
if (!query.exec() || query.numRowsAffected() <= 0)
{
@@ -491,24 +489,24 @@ void FileScanner::UpdateFileInDB(const Q
QString album_cache_string;
// Set values from cache
- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
+ int did = m_directoryid[directory];
if (did > 0)
disk_meta->setDirectoryId(did);
- int aid = m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()];
+ int aid = m_artistid[disk_meta->Artist().toLower()];
if (aid > 0)
{
disk_meta->setArtistId(aid);
// The album cache depends on the artist id
album_cache_string = disk_meta->getArtistId() + "#" +
- QString(disk_meta->Album().toUtf8()).toLower();
+ disk_meta->Album().toLower();
if (m_albumid[album_cache_string] > 0)
disk_meta->setAlbumId(m_albumid[album_cache_string]);
}
- int gid = m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()];
+ int gid = m_genreid[disk_meta->Genre().toLower()];
if (gid > 0)
disk_meta->setGenreId(gid);
@@ -516,12 +514,12 @@ void FileScanner::UpdateFileInDB(const Q
disk_meta->dumpToDatabase();
// Update the cache
- m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()]
+ m_artistid[disk_meta->Artist().toLower()]
= disk_meta->getArtistId();
- m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()]
+ m_genreid[disk_meta->Genre().toLower()]
= disk_meta->getGenreId();
album_cache_string = disk_meta->getArtistId() + "#" +
- QString(disk_meta->Album().toUtf8()).toLower();
+ disk_meta->Album().toLower();
m_albumid[album_cache_string] = disk_meta->getAlbumId();
}
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore
--- mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp
--- mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp 2010-10-10 17:59:02.000000000 -0400
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -993,8 +993,9 @@ void MusicPlayer::decoderHandlerReady(vo
VERBOSE(VB_PLAYBACK, QString ("decoder handler is ready, decoding %1").
arg(getDecoder()->getFilename()));
- if (getDecoder()->getFilename().contains("cda") == 1)
- dynamic_cast<CdDecoder*>(getDecoder())->setDevice(m_CDdevice);
+ CdDecoder *cddecoder = dynamic_cast<CdDecoder*>(getDecoder());
+ if (cddecoder)
+ cddecoder->setDevice(m_CDdevice);
getDecoder()->setOutput(m_output);
//getDecoder()-> setBlockSize(2 * 1024);
diff -Naurp mythplugins-0.24.orig/mythnetvision/i18n/.gitignore mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore
--- mythplugins-0.24.orig/mythnetvision/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore
--- mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythfillnetvision
diff -Naurp mythplugins-0.24.orig/mythnews/i18n/.gitignore mythplugins-0.24.fixes/mythnews/i18n/.gitignore
--- mythplugins-0.24.orig/mythnews/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythnews/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythnews/mythnews/main.cpp mythplugins-0.24.fixes/mythnews/mythnews/main.cpp
--- mythplugins-0.24.orig/mythnews/mythnews/main.cpp 2010-08-29 18:21:36.000000000 -0400
+++ mythplugins-0.24.fixes/mythnews/mythnews/main.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -69,7 +69,7 @@ int mythplugin_init(const char *libversi
"Couldn't upgrade database to new schema, exiting.");
return -1;
}
- gCoreContext->ActivateSettingsCache(false);
+ gCoreContext->ActivateSettingsCache(true);
setupKeys();
diff -Naurp mythplugins-0.24.orig/mythvideo/i18n/.gitignore mythplugins-0.24.fixes/mythvideo/i18n/.gitignore
--- mythplugins-0.24.orig/mythvideo/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythvideo/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythvideo/mtd/.gitignore mythplugins-0.24.fixes/mythvideo/mtd/.gitignore
--- mythplugins-0.24.orig/mythvideo/mtd/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythvideo/mtd/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mtd
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore
--- mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+*.moc
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py
--- mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py 2010-09-12 12:10:46.000000000 -0400
+++ mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py 2011-02-28 22:42:02.000000000 -0500
@@ -306,6 +306,8 @@ __version__=u"v0.7.7"
# 0.7.5 Added the TMDB MovieRating as videometadata table "rating" field
# 0.7.6 Modifications to support MythTV python bindings changes
# 0.7.7 Pull hostname from python bindings instead of socket libraries
+ # Added support of unicode characters within a jamu.conf file
+ # Replace 'xml' module version check with generic Python version, to correct failure in Python 2.7
usage_txt=u'''
@@ -476,14 +478,10 @@ class OutStreamEncoder(object):
sys.stdout = OutStreamEncoder(sys.stdout, 'utf8')
sys.stderr = OutStreamEncoder(sys.stderr, 'utf8')
-try:
- import xml
-except Exception, e:
- print '''The python module xml must be installed. error(%s)''' % e
+if sys.version_info <= (2,5):
+ print '''JAMU requires Python 2.5 or newer to run.'''
sys.exit(1)
-if xml.__version__ < u'41660':
- print '''
-\n! Warning - The module xml (v41660 or greater) must be installed. Your version is different (v%s) than what Jamu was tested with. Jamu may not work on your installation.\nIt is recommended that you upgrade.\n''' % xml.__version__
+
import xml.etree.cElementTree as ElementTree
@@ -1246,7 +1244,7 @@ class Configuration(object):
)
sys.exit(1)
cfg = ConfigParser.SafeConfigParser()
- cfg.read(useroptions)
+ cfg.readfp(codecs.open(useroptions, "r", "utf8"))
for section in cfg.sections():
if section[:5] == 'File ':
self.config['config_file'] = section[5:]
diff -Naurp mythplugins-0.24.orig/mythweather/i18n/.gitignore mythplugins-0.24.fixes/mythweather/i18n/.gitignore
--- mythplugins-0.24.orig/mythweather/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythweather/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2010-06-22 00:11:23.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -1,4 +1,5 @@
#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
#
# Animated satellite map grabber for Environment Canada.
#
@@ -13,6 +14,7 @@ use strict;
use warnings;
use English;
+use File::Path;
use File::Basename;
use Cwd 'abs_path';
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
@@ -23,17 +25,18 @@ use Getopt::Std;
use LWP::Simple;
use Date::Manip;
use ENVCANMapSearch;
+use Image::Magick;
our ($opt_v, $opt_t, $opt_T, $opt_l, $opt_u, $opt_d);
my $name = 'ENVCAN-Animated-Map';
-my $version = 0.3;
+my $version = 0.4;
my $author = 'Joe Ripley';
my $email = 'vitaminjoe(a)gmail.com';
my $updateTimeout = 10*60;
my $retrieveTimeout = 30;
-my @types = ('amdesc', 'updatetime', 'animatedimage');
-my $dir = "./";
+my @types = ('amdesc', 'updatetime', 'animatedimage', 'copyright');
+my $dir = "/tmp/envcan";
getopts('Tvtlu:d:');
@@ -66,6 +69,10 @@ if (defined $opt_d) {
$dir = $opt_d;
}
+if (!-d $dir) {
+ mkpath( $dir, {mode => 0755} );
+}
+
my $loc = shift;
if (!defined $loc || $loc eq "") {
@@ -97,24 +104,27 @@ foreach my $line (split(/\n/, $response)
# Download map files, if necessary (maps are stale after 15 minutes)
my $i = 0;
+my $outimage = Image::Magick->new;
foreach my $image (@image_list) {
my $getImage = 1;
- if (-f $path . $i) {
+ if (-f "$path$i" ) {
my @stats = stat(_);
- if ($stats[9] > (time - 900)) { $i++; next; }
+ if ($stats[9] > (time - 900)) {
+ $outimage->Read( "$path$i" );
+ $i++;
+ next;
+ }
}
- getstore($base_url . $image, $path . $i);
+ getstore($base_url . $image, "$path$i");
+ $outimage->Read( "$path$i" );
$i++;
}
-# Determine image size
-if (!$size) {
- use Image::Size;
- my ($x, $y) = imgsize("${path}0");
- $size = "${x}x$y" if ($x && $y);
-}
+$outimage->Write( filename => "$dir/$file.gif", delay => 75 );
-print "amdesc::$desc\n";
-printf "animatedimage::${path}%%1-$i%s\n", ($size && "-$size" || '');
-print "updatetime::Last Updated on " . UnixDate("now", "%b %d, %I:%M %p %Z") . "\n";
+print "amdesc::$desc\n";
+print "animatedimage::$dir/$file.gif\n";
+print "updatetime::Last Updated on " .
+ UnixDate("now", "%b %d, %I:%M %p %Z") . "\n";
+print "copyright::Environment Canada\n";
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1,127 @@
+#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
+#
+# Static satellite map grabber for Environment Canada.
+#
+# This script downloads satellite map data from the Environment Canada
+# website. It uses the lists of JPEG images supplied by the page at
+# http://www.weatheroffice.gc.ca/satellite/index_e.html.
+#
+# The bulk of the code in this script was originally authored by
+# Lucien Dunning (ldunning(a)gmail.com).
+# Based on envcan_animaps.pl by Joe Ripley <vitaminjoe(a)gmail.com>
+
+use strict;
+use warnings;
+
+use English;
+use File::Path;
+use File::Basename;
+use Cwd 'abs_path';
+use lib dirname(abs_path($0 or $PROGRAM_NAME)),
+ '/usr/share/mythtv/mythweather/scripts/ca_envcan',
+ '/usr/local/share/mythtv/mythweather/scripts/ca_envcan';
+
+use Getopt::Std;
+use LWP::Simple;
+use Date::Manip;
+use ENVCANMapSearch;
+use Image::Magick;
+
+our ($opt_v, $opt_t, $opt_T, $opt_l, $opt_u, $opt_d);
+
+my $name = 'ENVCAN-Static-Map';
+my $version = 0.1;
+my $author = 'Gavin Hurlbut';
+my $email = 'gjhurlbu(a)gmail.com';
+my $updateTimeout = 10*60;
+my $retrieveTimeout = 30;
+my @types = ('smdesc', 'updatetime', 'map', 'copyright');
+my $dir = "/tmp/envcan";
+
+getopts('Tvtlu:d:');
+
+if (defined $opt_v) {
+ print "$name,$version,$author,$email\n";
+ exit 0;
+}
+
+if (defined $opt_T) {
+ print "$updateTimeout,$retrieveTimeout\n";
+ exit 0;
+}
+if (defined $opt_l) {
+ my $search = shift;
+ ENVCANMapSearch::AddSatSearch($search);
+ ENVCANMapSearch::AddSatClassSearch($search);
+ ENVCANMapSearch::AddImageTypeSearch($search);
+ foreach my $result (@{ENVCANMapSearch::doSearch()}) {
+ print "$result->{entry_id}::($result->{satellite_class}) $result->{satellite} $result->{image_type}\n";
+ }
+ exit 0;
+}
+
+if (defined $opt_t) {
+ foreach (@types) {print; print "\n";}
+ exit 0;
+}
+
+if (defined $opt_d) {
+ $dir = $opt_d;
+}
+
+if (!-d $dir) {
+ mkpath( $dir, {mode => 0755} );
+}
+
+my $loc = shift;
+
+if (!defined $loc || $loc eq "") {
+ die "Invalid usage";
+}
+
+# Get map info
+ENVCANMapSearch::AddAniSearch($loc);
+my $results = ENVCANMapSearch::doSearch();
+my $desc = $results->[0]->{satellite};
+
+# Get HTML and find image list
+my $response = get $results->[0]->{animated_url};
+die unless defined $response;
+
+my @image_list;
+my $size;
+my $base_url = "http://www.weatheroffice.gc.ca";
+my $file = $loc;
+my $path = "$dir/$file";
+
+# Get list of images (at most 10)
+foreach my $line (split(/\n/, $response)) {
+ if ($line =~ /theImagesComplete\[\d*\] \= \"(.*)\"\;/) {
+ push (@image_list, $1);
+ if ($#image_list >= 1) { shift @image_list; }
+ }
+}
+
+# Download map file, if necessary (maps are stale after 15 minutes)
+my $image = shift @image_list;
+my $ext = $image;
+$ext =~ s/.*\.(.*?)$/$1/;
+
+my $cached = 0;
+if (-f "$path.$ext" ) {
+ my @stats = stat(_);
+ if ($stats[9] > (time - 900)) {
+ $cached = 1;
+ }
+}
+
+if (!$cached) {
+ getstore($base_url . $image, "$path.$ext");
+}
+
+print "smdesc::$desc\n";
+print "map::$path.$ext\n";
+print "updatetime::Last Updated on " .
+ UnixDate("now", "%b %d, %I:%M %p %Z") . "\n";
+print "copyright::Environment Canada\n";
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2010-06-22 00:11:23.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2011-02-28 22:42:02.000000000 -0500
@@ -154,14 +154,14 @@ elsif ($weather_string =~ /^heavy rain$/
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "weather_icon::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "weather_icon::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "weather_icon::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2010-06-22 00:11:23.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2011-02-28 22:42:02.000000000 -0500
@@ -179,14 +179,14 @@ foreach $item (@{$xml->{channel}->{item}
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "icon-" . $i . "::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "icon-" . $i . "::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "icon-" . $i . "::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2010-10-10 17:47:57.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
+use File::Path;
use File::Basename;
use Cwd 'abs_path';
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2010-10-10 17:47:57.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
+use File::Path;
use File::Basename;
use Cwd 'abs_path';
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythzmserver
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp
--- mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2010-08-15 06:52:05.000000000 -0400
+++ mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -12,10 +12,6 @@
*
* ============================================================ */
-#include <iostream>
-#include <sys/shm.h>
-#include <cstdlib>
-
// qt
#include <QDateTime>
#include <QTimer>
diff -Naurp mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml
--- mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2010-10-06 11:44:50.000000000 -0400
+++ mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -652,23 +652,23 @@
<window name="zmplayer">
- <font name="label" from="basesmall">
+ <fontdef name="label" from="basesmall">
<color>#ffff00</color>
<size>16</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="data" from="basesmall">
+ <fontdef name="data" from="basesmall">
<color>#ffffff</color>
<size>14</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="buttons" from="basesmall">
+ <fontdef name="buttons" from="basesmall">
<color>#ffffff</color>
<size>12</size>
<weight>bold</weight>
- </font>
+ </fontdef>
<textarea name="pagetitle" from="basetextarea">
<area>30,10,570,40</area>
mythtv-0.24-fixes.patch:
.gitignore | 3
Makefile | 6
VERSION | 1
bindings/perl/.gitignore | 4
bindings/perl/IO/Socket/INET/MythTV.pm | 8
bindings/perl/MythTV.pm | 8
bindings/perl/MythTV/Channel.pm | 8
bindings/perl/MythTV/Program.pm | 8
bindings/perl/MythTV/Recording.pm | 8
bindings/perl/MythTV/StorageGroup.pm | 8
bindings/python/.gitignore | 1
bindings/python/MythTV/__init__.py | 4
bindings/python/MythTV/dataheap.py | 2
bindings/python/MythTV/methodheap.py | 7
bindings/python/MythTV/mythproto.py | 2
bindings/python/MythTV/static.py | 2
bindings/python/MythTV/system.py | 24
bindings/python/MythTV/utility.py | 4
configure | 9
contrib/icons/master_iconmap/channel_icons.pl | 8
contrib/maintenance/flush_deleted_recgroup.pl | 8
contrib/maintenance/optimize_mythdb.pl | 8
contrib/user_jobs/mythlink.pl | 8
docs/mythtv-HOWTO.sgml | 123 +
external/.gitignore | 16
external/FFmpeg/Makefile | 11
external/FFmpeg/libavcodec/dvbsubdec.c | 1
external/FFmpeg/libavformat/mpegts.c | 1
external/FFmpeg/libavformat/rmdec.c | 7
filters/quickdnr/quickdnr.pro | 2
i18n/.gitignore | 1
i18n/mythfrontend_en_gb.qm | 52
i18n/mythfrontend_en_gb.ts | 2
i18n/mythfrontend_fr.qm | 468 +++---
i18n/mythfrontend_fr.ts | 2
i18n/mythfrontend_pt.qm | 375 ++--
i18n/mythfrontend_pt.ts | 2
libs/libavutil/.gitignore | 1
libs/libmyth/audiooutput.cpp | 40
libs/libmyth/audiooutput.h | 3
libs/libmyth/audiooutputalsa.cpp | 169 +-
libs/libmyth/audiooutputalsa.h | 7
libs/libmyth/audiooutputbase.cpp | 395 +++--
libs/libmyth/audiooutputbase.h | 9
libs/libmyth/audiooutputca.cpp | 4
libs/libmyth/audiooutputdigitalencoder.h | 1
libs/libmyth/audiooutputdx.cpp | 2
libs/libmyth/audiooutputpulse.cpp | 7
libs/libmyth/audiooutputsettings.cpp | 14
libs/libmyth/audiooutpututil.cpp | 26
libs/libmyth/audiooutpututil.h | 3
libs/libmyth/audiosettings.cpp | 4
libs/libmyth/mediamonitor-darwin.cpp | 2
libs/libmythdb/.gitignore | 2
libs/libmythdb/mythcorecontext.cpp | 5
libs/libmythdb/mythdownloadmanager.cpp | 51
libs/libmythdb/mythsystem.cpp | 14
libs/libmythdb/mythversion.h | 2
libs/libmythdb/storagegroup.cpp | 3
libs/libmythfreesurround/freesurround.cpp | 4
libs/libmythfreesurround/freesurround.h | 2
libs/libmythmetadata/.gitignore | 2
libs/libmythmetadata/videometadata.cpp | 16
libs/libmythsoundtouch/AAFilter.cpp | 6
libs/libmythsoundtouch/AAFilter.h | 6
libs/libmythsoundtouch/BPMDetect.h | 6
libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 6
libs/libmythsoundtouch/FIFOSampleBuffer.h | 6
libs/libmythsoundtouch/FIFOSamplePipe.h | 6
libs/libmythsoundtouch/FIRFilter.cpp | 6
libs/libmythsoundtouch/FIRFilter.h | 6
libs/libmythsoundtouch/RateTransposer.cpp | 6
libs/libmythsoundtouch/RateTransposer.h | 6
libs/libmythsoundtouch/STTypes.h | 6
libs/libmythsoundtouch/SoundTouch.cpp | 6
libs/libmythsoundtouch/SoundTouch.h | 6
libs/libmythsoundtouch/TDStretch.cpp | 6
libs/libmythsoundtouch/TDStretch.h | 6
libs/libmythsoundtouch/cpu_detect.h | 14
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 6
libs/libmythsoundtouch/mmx_gcc.cpp | 6
libs/libmythtv/RingBuffer.cpp | 39
libs/libmythtv/audioplayer.cpp | 51
libs/libmythtv/audioplayer.h | 3
libs/libmythtv/avformatdecoder.cpp | 257 ++-
libs/libmythtv/avformatdecoder.h | 8
libs/libmythtv/bswap.h | 19
libs/libmythtv/cc608reader.cpp | 1
libs/libmythtv/decoderbase.cpp | 2
libs/libmythtv/decoderbase.h | 4
libs/libmythtv/dtvrecorder.cpp | 30
libs/libmythtv/dtvrecorder.h | 2
libs/libmythtv/eithelper.cpp | 16
libs/libmythtv/fourcc.h | 2
libs/libmythtv/frame.h | 2
libs/libmythtv/frequencies.c | 15
libs/libmythtv/frequencytables.cpp | 4
libs/libmythtv/libmythtv.pro | 6
libs/libmythtv/minilzo.cpp | 2
libs/libmythtv/mpeg/H264Parser.cpp | 424 ++++-
libs/libmythtv/mpeg/H264Parser.h | 27
libs/libmythtv/mythcommflagplayer.cpp | 2
libs/libmythtv/mythdvdplayer.cpp | 10
libs/libmythtv/mythplayer.cpp | 336 ++--
libs/libmythtv/mythplayer.h | 36
libs/libmythtv/nuppeldecoder.cpp | 18
libs/libmythtv/playercontext.cpp | 2
libs/libmythtv/recordingprofile.cpp | 8
libs/libmythtv/recordingprofile.h | 1
libs/libmythtv/subtitlescreen.cpp | 33
libs/libmythtv/teletextdecoder.cpp | 51
libs/libmythtv/teletextdecoder.h | 42
libs/libmythtv/teletextreader.cpp | 609 ++++++++
libs/libmythtv/teletextreader.h | 162 ++
libs/libmythtv/teletextscreen.cpp | 754 +---------
libs/libmythtv/teletextscreen.h | 154 --
libs/libmythtv/textsubtitleparser.h | 6
libs/libmythtv/transporteditor.cpp | 2
libs/libmythtv/transporteditor.h | 2
libs/libmythtv/tv_play.cpp | 286 +--
libs/libmythtv/tv_play.h | 23
libs/libmythtv/tv_rec.cpp | 4
libs/libmythtv/videodisplayprofile.h | 1
libs/libmythtv/videoout_d3d.h | 2
libs/libmythtv/videoout_opengl.h | 2
libs/libmythtv/videoout_quartz.cpp | 2
libs/libmythtv/videoout_vdpau.h | 2
libs/libmythtv/videoout_xv.cpp | 4
libs/libmythtv/videoout_xv.h | 6
libs/libmythtv/videooutbase.cpp | 9
libs/libmythtv/videooutbase.h | 1
libs/libmythui/mythmainwindow.cpp | 2
libs/libmythui/mythrender_opengl.cpp | 21
libs/libmythui/mythrender_opengl.h | 4
libs/libmythui/mythscreentype.cpp | 4
libs/libmythui/mythuibuttonlist.cpp | 2
libs/libmythui/mythuiimage.cpp | 16
libs/libmythui/mythuistatetype.cpp | 16
libs/libmythui/mythuiwebbrowser.cpp | 6
libs/libmythui/util-osx.cpp | 2
libs/libmythupnp/httprequest.cpp | 28
libs/libmythupnp/soapclient.cpp | 6
libs/libmythupnp/threadpool.cpp | 59
libs/libmythupnp/upnpcds.cpp | 2
libs/libmythupnp/upnpcdsobjects.cpp | 2
locales/.gitignore | 1
programs/mythavtest/.gitignore | 1
programs/mythbackend/.gitignore | 1
programs/mythbackend/mainserver.cpp | 20
programs/mythbackend/playbacksock.cpp | 2
programs/mythbackend/scheduler.cpp | 15
programs/mythcommflag/.gitignore | 1
programs/mythfilldatabase/.gitignore | 1
programs/mythfrontend/.gitignore | 1
programs/mythfrontend/exitprompt.cpp | 25
programs/mythfrontend/globalsettings.cpp | 115 -
programs/mythfrontend/globalsettings.h | 5
programs/mythfrontend/guidegrid.cpp | 7
programs/mythfrontend/playbackbox.cpp | 13
programs/mythfrontend/playbackbox.h | 1
programs/mythfrontend/progfind.cpp | 84 -
programs/mythfrontend/proglist.cpp | 46
programs/mythfrontend/proglist.h | 2
programs/mythfrontend/programrecpriority.cpp | 24
programs/mythjobqueue/.gitignore | 1
programs/mythlcdserver/.gitignore | 1
programs/mythpreviewgen/.gitignore | 1
programs/mythshutdown/.gitignore | 1
programs/mythtranscode/.gitignore | 1
programs/mythtranscode/mpeg2fix.cpp | 2
programs/mythtranscode/mpeg2fix.h | 2
programs/mythtranscode/replex/.gitignore | 1
programs/mythtranscode/transcode.cpp | 9
programs/mythtv-setup/.gitignore | 1
programs/mythtvosd/.gitignore | 1
programs/mythwelcome/.gitignore | 1
programs/scripts/.gitignore | 1
programs/scripts/database/mythconverg_restore.pl | 8
programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py | 18
programs/scripts/internetcontent/nv_python_libs/common/common_api.py | 17
programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html | 39
programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml | 5
programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml | 2
programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl | 100 -
programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py | 18
programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py | 39
themes/.gitignore | 1
themes/DVR/util_menu.xml | 7
themes/MythCenter-wide/base.xml | 1
themes/MythCenter-wide/osd.xml | 16
themes/MythCenter-wide/schedule-ui.xml | 2
themes/MythCenter-wide/zoneminder-ui.xml | 12
themes/MythCenter/base.xml | 1
version.sh | 23
194 files changed, 3611 insertions(+), 2856 deletions(-)
--- NEW FILE mythtv-0.24-fixes.patch ---
diff -Naurp mythtv-0.24.orig/bindings/perl/.gitignore mythtv-0.24.fixes/bindings/perl/.gitignore
--- mythtv-0.24.orig/bindings/perl/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1,4 @@
+Makefile.perl
+Makefile.perl.*
+blib/
+pm_to_blib
diff -Naurp mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
# 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-24/mythtv/bindings/perl/IO/Socke... $
-# @date $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
-# @version $Revision: 20349 $
-# @author $Author: xris $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
# @copyright Silicon Mechanics
#
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm 2010-05-22 20:48:40.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV channel.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/C... $
-# @date $Date: 2010-05-22 17:48:40 -0700 (Sat, 22 May 2010) $
-# @version $Revision: 24799 $
-# @author $Author: mdean $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Program.pm mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Program.pm 2010-09-10 22:23:32.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV program.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/P... $
-# @date $Date: 2010-09-10 19:23:32 -0700 (Fri, 10 Sep 2010) $
-# @version $Revision: 26207 $
-# @author $Author: mdean $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
package MythTV::Program;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm 2010-09-03 15:55:56.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV recording.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/R... $
-# @date $Date: 2010-09-03 12:55:56 -0700 (Fri, 03 Sep 2010) $
-# @version $Revision: 26106 $
-# @author $Author: danielk $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
package MythTV::Recording;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV Storage Group.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/S... $
-# @date $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
-# @version $Revision: 20349 $
-# @author $Author: xris $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV.pm mythtv-0.24.fixes/bindings/perl/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/MythTV.pm 2010-09-29 13:08:29.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-02-28 22:42:43.000000000 -0500
@@ -1,10 +1,10 @@
#
# MythTV bindings for perl.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV.pm $
-# @date $Date: 2010-09-29 10:08:29 -0700 (Wed, 29 Sep 2010) $
-# @version $Revision: 26574 $
-# @author $Author: wagnerrp $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
# Version
diff -Naurp mythtv-0.24.orig/bindings/python/.gitignore mythtv-0.24.fixes/bindings/python/.gitignore
--- mythtv-0.24.orig/bindings/python/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+build/
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/dataheap.py mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/dataheap.py 2010-11-02 23:15:16.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-02-28 22:42:43.000000000 -0500
@@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C
return vid
def _playOnFe(self, fe):
- return fe.send('play','filename myth://Videos@%s/%s' %
+ return fe.send('play','file myth://Videos@%s/%s' %
(self.host, self.filename))
class VideoGrabber( Grabber ):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/__init__.py mythtv-0.24.fixes/bindings/python/MythTV/__init__.py
--- mythtv-0.24.orig/bindings/python/MythTV/__init__.py 2010-09-09 01:11:01.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-02-28 22:42:43.000000000 -0500
@@ -53,8 +53,10 @@ from methodheap import *
from sys import version_info
if version_info >= (2, 6): # 2.6 or newer
exec(import26)
-else:
+elif version_info >= (2, 5):
exec(importall)
+else:
+ raise Exception("The MythTV Python bindings will only operate against Python 2.5 or later.")
__version__ = OWN_VERSION
static.mysqldb = MySQLdb.version_info
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/methodheap.py mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/methodheap.py 2010-09-23 00:01:58.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-02-28 22:42:43.000000000 -0500
@@ -625,9 +625,9 @@ class MythDB( DBCache ):
return ('recorded.%s=%%s' % key, datetime.duck(value), 0)
if key == 'olderthan':
- return ('recorded.starttime>%s', datetime.duck(value), 0)
- if key == 'newerthan':
return ('recorded.starttime<%s', datetime.duck(value), 0)
+ if key == 'newerthan':
+ return ('recorded.starttime>%s', datetime.duck(value), 0)
# recordedprogram matches
@@ -641,8 +641,9 @@ class MythDB( DBCache ):
return ('people.name', 'recordedcredits', 4, 1)
if key == 'livetv':
- if value is None:
+ if (value is None) or (value == False):
return ('recorded.recgroup!=%s', 'LiveTV', 0)
+ return ()
return None
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/mythproto.py mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py
--- mythtv-0.24.orig/bindings/python/MythTV/mythproto.py 2010-10-14 11:36:31.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py 2011-02-28 22:42:43.000000000 -0500
@@ -188,7 +188,7 @@ def ftopen(file, mode, forceremote=False
db = DBCache(db)
log = MythLog('Python File Transfer', db=db)
reuri = re.compile(\
- 'myth://((?P<group>.*)@)?(?P<host>[a-zA-Z0-9_\.]*)(:[0-9]*)?/(?P<file>.*)')
+ 'myth://((?P<group>.*)@)?(?P<host>[a-zA-Z0-9_\-\.]*)(:[0-9]*)?/(?P<file>.*)')
reip = re.compile('(?:\d{1,3}\.){3}\d{1,3}')
if mode not in ('r','w'):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/static.py mythtv-0.24.fixes/bindings/python/MythTV/static.py
--- mythtv-0.24.orig/bindings/python/MythTV/static.py 2010-10-08 13:55:04.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/static.py 2011-02-28 22:42:43.000000000 -0500
@@ -4,7 +4,7 @@
Contains any static and global variables for MythTV Python Bindings
"""
-OWN_VERSION = (0,24,0,0)
+OWN_VERSION = (0,24,0,2)
SCHEMA_VERSION = 1264
MVSCHEMA_VERSION = 1038
NVSCHEMA_VERSION = 1007
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/system.py mythtv-0.24.fixes/bindings/python/MythTV/system.py
[...11679 lines suppressed...]
+
+ def tributecaDebug(self, context, *arg):
+ ''' Routine only used for debugging. Prints out the node
+ passed as an argument. Not to be used in production.
+ Call example: mnvXpath:tributecaDebug(//a)
+ '''
+ testpath = etree.XPath(".//a", namespaces=common.namespaces)
+ print arg
+ count = 0
+ for x in arg:
+ sys.stdout.write(u'\nElement Count (%s):\n' % count)
+# for y in testpath(x):
+# sys.stdout.write(etree.tostring(y, encoding='UTF-8', pretty_print=True))
+ print "testpath(%s)" % testpath(x)
+ count+=1
+ print
+# sys.stdout.write(etree.tostring(arg[0], encoding='UTF-8', pretty_print=True))
+ return u"========tributecaDebug Called========="
+ # end tributecaDebug()
+
######################################################################################################
#
# End of XPath extension functions
diff -Naurp mythtv-0.24.orig/themes/DVR/util_menu.xml mythtv-0.24.fixes/themes/DVR/util_menu.xml
--- mythtv-0.24.orig/themes/DVR/util_menu.xml 2010-08-13 15:45:54.000000000 -0400
+++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-02-28 22:42:43.000000000 -0500
@@ -8,6 +8,13 @@
</button>
<button>
+ <type>NET_VIDEO</type>
+ <text>Internet Video</text>
+ <action>MENU netvisionmenu.xml</action>
+ <depends>mythnetvision</depends>
+ </button>
+
+ <button>
<type>MUSIC</type>
<text>Music</text>
<action>PLUGIN mythmusic</action>
diff -Naurp mythtv-0.24.orig/themes/.gitignore mythtv-0.24.fixes/themes/.gitignore
--- mythtv-0.24.orig/themes/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythtv-0.24.fixes/themes/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+themes
diff -Naurp mythtv-0.24.orig/themes/MythCenter/base.xml mythtv-0.24.fixes/themes/MythCenter/base.xml
--- mythtv-0.24.orig/themes/MythCenter/base.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-02-28 22:42:43.000000000 -0500
@@ -766,6 +766,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,125</area>
<align>allcenter</align>
+ <multiline>yes</multiline>
</textarea>
</window>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/base.xml mythtv-0.24.fixes/themes/MythCenter-wide/base.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/base.xml 2010-10-06 10:17:51.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-02-28 22:42:43.000000000 -0500
@@ -881,6 +881,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,126</area>
<align>allcenter</align>
+ <multiline>yes</multiline>
</textarea>
</window>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/osd.xml mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/osd.xml 2010-11-09 21:44:09.000000000 -0500
+++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-02-28 22:42:43.000000000 -0500
@@ -429,6 +429,22 @@
<fill color="#FFFFFF" alpha="255" />
<alphapulse min="180" max="255" change="4" />
</shape>
+ <shape name="cuttoright">
+ <area>0,4,3,30</area>
+ <fill color="#FF0000" alpha="255" />
+ </shape>
+ <shape name="cuttoleft">
+ <area>0,4,3,30</area>
+ <fill color="#FF0000" alpha="255" />
+ </shape>
+ <shape name="keeptoright">
+ <area>0,4,3,30</area>
+ <fill color="#00FF00" alpha="255" />
+ </shape>
+ <shape name="keeptoleft">
+ <area>0,4,3,30</area>
+ <fill color="#00FF00" alpha="255" />
+ </shape>
</editbar>
</window>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml 2010-10-06 10:17:51.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-02-28 22:42:43.000000000 -0500
@@ -532,7 +532,7 @@
<area>240,2,220,24</area>
</textarea>
<textarea name="title" from="shortstarttimedate">
- <area>475,2,675,24</area>
+ <area>480,2,675,24</area>
</textarea>
<textarea name="card" from="shortstarttimedate">
<area>1165,2,30,24</area>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml 2010-10-06 11:37:20.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-02-28 22:42:43.000000000 -0500
@@ -652,23 +652,23 @@
<window name="zmplayer">
- <font name="label" from="basesmall">
+ <fontdef name="label" from="basesmall">
<color>#ffff00</color>
<size>16</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="data" from="basesmall">
+ <fontdef name="data" from="basesmall">
<color>#ffffff</color>
<size>14</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="buttons" from="basesmall">
+ <fontdef name="buttons" from="basesmall">
<color>#ffffff</color>
<size>12</size>
<weight>bold</weight>
- </font>
+ </fontdef>
<textarea name="pagetitle" from="basetextarea">
<area>30,10,570,40</area>
diff -Naurp mythtv-0.24.orig/VERSION mythtv-0.24.fixes/VERSION
--- mythtv-0.24.orig/VERSION 2010-11-10 12:31:31.000000000 -0500
+++ mythtv-0.24.fixes/VERSION 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-SOURCE_VERSION="0.24"
diff -Naurp mythtv-0.24.orig/version.sh mythtv-0.24.fixes/version.sh
--- mythtv-0.24.orig/version.sh 2010-08-29 18:22:54.000000000 -0400
+++ mythtv-0.24.fixes/version.sh 2011-02-28 22:42:43.000000000 -0500
@@ -1,12 +1,11 @@
#!/bin/sh
#
# small shell script to generate version.cpp
-# it expects two parameters
+# it expects one parameter
# first parameter is the root of the source directory
-# second parameter is the svn base folder (trunk, branches/release-0-21-fixes)
if test $# -ne 1; then
- echo "Usage: version.sh SVN_TREE_DIR"
+ echo "Usage: version.sh GIT_TREE_DIR"
exit 1
fi
@@ -18,21 +17,21 @@ else
exit 0
fi
-SVNTREEDIR=$1
-SVNREPOPATH="exported"
+GITTREEDIR=$1
+GITREPOPATH="exported"
-SOURCE_VERSION=$(svnversion ${SVNTREEDIR} 2>/dev/null || echo Unknown)
+cd ${GITTREEDIR}
+
+SOURCE_VERSION=$(git describe --dirty || git describe || echo Unknown)
case "${SOURCE_VERSION}" in
exported|Unknown)
- if test -e $SVNTREEDIR/VERSION ; then
- . $SVNTREEDIR/VERSION
+ if test -e $GITTREEDIR/VERSION ; then
+ . $GITTREEDIR/VERSION
fi
;;
*)
- SVNREPOPATH=$(echo "$$URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/version.sh $$" | sed -e 's,.*/svn/,,' \
- -e 's,/mythtv/version\.sh.*,,' \
- -e 's,/version\.sh.*,,')
+ BRANCH=$(git branch --no-color | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/')
;;
esac
@@ -41,7 +40,7 @@ cat > .vers.new <<EOF
#include "mythversion.h"
const MPUBLIC char *myth_source_version = "${SOURCE_VERSION}";
-const MPUBLIC char *myth_source_path = "${SVNREPOPATH}";
+const MPUBLIC char *myth_source_path = "${BRANCH}";
const MPUBLIC char *myth_binary_version = MYTH_BINARY_VERSION;
EOF
mythweb-0.24-fixes.patch:
mythplugins-0.24.fixes/mythweb/.gitignore | 3
mythplugins-0.24.fixes/mythweb/classes/Database.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/Query.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysql.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysqlicompat.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/mysql.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/mysqlicompat.php | 8
mythplugins-0.24.fixes/mythweb/classes/JSON.php | 8
mythplugins-0.24.fixes/mythweb/classes/Modules.php | 8
mythplugins-0.24.fixes/mythweb/classes/MythBackend.php | 8
mythplugins-0.24.fixes/mythweb/classes/MythBase.php | 8
mythplugins-0.24.fixes/mythweb/classes/MythFrontend.php | 8
mythplugins-0.24.fixes/mythweb/classes/Services/JSON.php | 2
mythplugins-0.24.fixes/mythweb/classes/Translate.php | 8
mythplugins-0.24.fixes/mythweb/includes/class_autoload.php | 8
mythplugins-0.24.fixes/mythweb/includes/cleanup.php | 8
mythplugins-0.24.fixes/mythweb/includes/config.php | 8
mythplugins-0.24.fixes/mythweb/includes/css.php | 8
mythplugins-0.24.fixes/mythweb/includes/data_dir.php | 8
mythplugins-0.24.fixes/mythweb/includes/database.php | 8
mythplugins-0.24.fixes/mythweb/includes/db_update.php | 14
mythplugins-0.24.fixes/mythweb/includes/defines.php | 8
mythplugins-0.24.fixes/mythweb/includes/errordisplay.php | 8
mythplugins-0.24.fixes/mythweb/includes/errors.php | 8
mythplugins-0.24.fixes/mythweb/includes/init.php | 8
mythplugins-0.24.fixes/mythweb/includes/jobqueue.php | 8
mythplugins-0.24.fixes/mythweb/includes/lockdown.php | 8
mythplugins-0.24.fixes/mythweb/includes/mobile.php | 8
mythplugins-0.24.fixes/mythweb/includes/mouseovers.php | 8
mythplugins-0.24.fixes/mythweb/includes/php_version_check.php | 8
mythplugins-0.24.fixes/mythweb/includes/session.php | 8
mythplugins-0.24.fixes/mythweb/includes/skin.php | 12
mythplugins-0.24.fixes/mythweb/includes/sorting.php | 8
mythplugins-0.24.fixes/mythweb/includes/translate.php | 8
mythplugins-0.24.fixes/mythweb/includes/utils.php | 13
mythplugins-0.24.fixes/mythweb/js/pngbehavior.htc | 6
mythplugins-0.24.fixes/mythweb/js/table_sort.js | 8
mythplugins-0.24.fixes/mythweb/js/utils.js | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/lang/Finnish.lang | 288 ++++++----
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/db_access_denied.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/db_vars_error.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/error.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/fatal.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/lockdown.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/no_modules.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/site_down.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/unknown_module.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/default/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/default/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/iPod/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/iPod/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/iPod/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/lite/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/lite/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/tmpl/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/wap/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/wap/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/wap/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/default/backend_log.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/lite/backend_log.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/coverart/handler.pl | 8
mythplugins-0.24.fixes/mythweb/modules/coverart/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/database/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/database/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/database/tmpl/default/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/mp3act_functions.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/stream.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/set_keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/default/set_keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/default/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/lite/set_keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/lite/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/set_defaults.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/set_flvplayer.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/default/set_defaults.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/default/set_flvplayer.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/default/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/lite/set_defaults.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/lite/set_flvplayer.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/lite/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/do.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/play_program_on_frontend.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/screenshot.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/default/keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/default/remote.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/iPod/play_program_on_frontend.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/iPod/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/default/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/lite/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/lite/mythweb.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/default/stats.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/lite/stats.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/default/status.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/lite/status.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/wap/status.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/handler.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/set_protocol.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_asx.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_flv.pl | 10
mythplugins-0.24.fixes/mythweb/modules/stream/stream_flvp.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_mp4.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_raw.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/tmpl/default/set_protocol.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/tmpl/lite/set_protocol.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/tv.pl | 8
mythplugins-0.24.fixes/mythweb/modules/tv/canned_searches.conf.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Program.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Recording.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Schedule.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/detail.php | 15
mythplugins-0.24.fixes/mythweb/modules/tv/get_pixmap.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/includes/programs.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/includes/recording_schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/includes/schedule_utils.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list_recording_groups.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list_shows_in_title_and_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list_titles_in_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/opensearch.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/schedules_custom.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/schedules_manual.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/searches.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_channels.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_playgroup.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_screens.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/submenu.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/list_data.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/schedules_custom.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/schedules_manual.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/searches.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_channels.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_playgroup.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_screens.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/list_recording_groups.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/list_shows_in_title_and_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/list_titles_in_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/submenu.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/ical/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/schedules_custom.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/schedules_manual.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/searches.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/set_channels.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/rss/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/edit.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/imdb.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/scan.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/tmpl/default/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/tmpl/default/video.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/classes/WeatherScreen.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/set_screen.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/set_screen.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.18h.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.3d.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.6d.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.am.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.cc.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.sm.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/welcome.php | 8
mythplugins-0.24.fixes/mythweb/mythweb.php | 8
mythplugins-0.24.fixes/mythweb/mythweb.pl | 8
mythplugins-0.24.fixes/mythweb/skins/iPod-default/AppPanel.css | 35 -
mythplugins-0.24.fixes/mythweb/skins/iPod-default/ListPanel.css | 157 -----
mythplugins-0.24.fixes/mythweb/skins/iPod-default/header.css | 91 ---
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/cal.png | 16
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/clock.png | 19
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/logs.png | 20
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/music.png | 21
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/photos.png | 22
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/remote.png | 26
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/status.png | 24
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/tv.png | 18
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/video.png | 26
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/weather.png | 25
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/back_button.png | 23
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/back_button_clicked.png | 11
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/button_darkgray.png | 5
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/button_darkgray_pressed.png | 10
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/chevron.png | 5
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/chevron_touched.png | 3
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/favicon.ico | 3
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/header_middle.png | 5
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/item_background_touched.png | 4
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/off.png | 13
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/on.png | 14
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/pinstripes.png | 4
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/spinner.gif | 32 -
mythplugins-0.24.fixes/mythweb/skins/iPod-default/style.css | 19
mythweb/skins/iPod-default/img/Search Background.tiff | 2
263 files changed, 1138 insertions(+), 1686 deletions(-)
--- NEW FILE mythweb-0.24-fixes.patch ---
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/mysqlicompat.php mythplugins-0.24.fixes/mythweb/classes/Database/mysqlicompat.php
--- mythplugins-0.24.orig/mythweb/classes/Database/mysqlicompat.php 2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.24.fixes/mythweb/classes/Database/mysqlicompat.php 2011-01-22 18:44:18.000000000 -0500
@@ -20,10 +20,10 @@
* 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-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2008-11-08 18:42:14 -0800 (Sat, 08 Nov 2008) $
- * @version $Revision: 19023 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/mysql.php mythplugins-0.24.fixes/mythweb/classes/Database/mysql.php
--- mythplugins-0.24.orig/mythweb/classes/Database/mysql.php 2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.24.fixes/mythweb/classes/Database/mysql.php 2011-01-22 18:44:18.000000000 -0500
@@ -13,10 +13,10 @@
*
* MySQL Database connection class.
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2008-11-08 18:42:14 -0800 (Sat, 08 Nov 2008) $
- * @version $Revision: 19023 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/Query/mysqlicompat.php mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysqlicompat.php
--- mythplugins-0.24.orig/mythweb/classes/Database/Query/mysqlicompat.php 2010-06-09 23:05:34.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysqlicompat.php 2011-01-22 18:44:18.000000000 -0500
@@ -15,10 +15,10 @@
* 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-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2010-06-09 20:05:34 -0700 (Wed, 09 Jun 2010) $
- * @version $Revision: 25070 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/Query/mysql.php mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysql.php
--- mythplugins-0.24.orig/mythweb/classes/Database/Query/mysql.php 2010-06-09 23:05:34.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysql.php 2011-01-22 18:44:18.000000000 -0500
@@ -13,10 +13,10 @@
*
* Query handler for MySQL
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2010-06-09 20:05:34 -0700 (Wed, 09 Jun 2010) $
- * @version $Revision: 25070 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/Query.php mythplugins-0.24.fixes/mythweb/classes/Database/Query.php
--- mythplugins-0.24.orig/mythweb/classes/Database/Query.php 2009-10-09 01:29:02.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database/Query.php 2011-01-22 18:44:18.000000000 -0500
@@ -14,10 +14,10 @@
* 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-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2009-10-08 22:29:02 -0700 (Thu, 08 Oct 2009) $
- * @version $Revision: 22328 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database.php mythplugins-0.24.fixes/mythweb/classes/Database.php
--- mythplugins-0.24.orig/mythweb/classes/Database.php 2008-06-01 19:52:54.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database.php 2011-01-22 18:44:18.000000000 -0500
@@ -24,10 +24,10 @@
* define _errstr() and _errno() methods to return the appropriate database
* engine error string/number.
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2008-06-01 16:52:54 -0700 (Sun, 01 Jun 2008) $
- * @version $Revision: 17434 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/JSON.php mythplugins-0.24.fixes/mythweb/classes/JSON.php
--- mythplugins-0.24.orig/mythweb/classes/JSON.php 2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.24.fixes/mythweb/classes/JSON.php 2011-01-22 18:44:18.000000000 -0500
@@ -3,10 +3,10 @@
* 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-24/mythplugins/mythweb/classes/J... $
- * @date $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
- * @version $Revision: 16202 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythWeb
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Modules.php mythplugins-0.24.fixes/mythweb/classes/Modules.php
--- mythplugins-0.24.orig/mythweb/classes/Modules.php 2010-09-12 04:52:48.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Modules.php 2011-01-22 18:44:18.000000000 -0500
@@ -2,10 +2,10 @@
/**
* Handling Modules
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-09-12 01:52:48 -0700 (Sun, 12 Sep 2010) $
- * @version $Revision: 26245 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythTV
diff -Naurp mythplugins-0.24.orig/mythweb/classes/MythBackend.php mythplugins-0.24.fixes/mythweb/classes/MythBackend.php
--- mythplugins-0.24.orig/mythweb/classes/MythBackend.php 2010-10-06 23:35:10.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/MythBackend.php 2011-01-22 18:44:18.000000000 -0500
@@ -1,10 +1,10 @@
<?php
/**
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-10-06 20:35:10 -0700 (Wed, 06 Oct 2010) $
- * @version $Revision: 26688 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythTV
diff -Naurp mythplugins-0.24.orig/mythweb/classes/MythBase.php mythplugins-0.24.fixes/mythweb/classes/MythBase.php
--- mythplugins-0.24.orig/mythweb/classes/MythBase.php 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/MythBase.php 2011-01-22 18:44:18.000000000 -0500
@@ -2,10 +2,10 @@
/**
* This is the base object to handle all the common features for all myth classes
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-08-28 13:16:22 -0700 (Sat, 28 Aug 2010) $
- * @version $Revision: 25914 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythWeb
diff -Naurp mythplugins-0.24.orig/mythweb/classes/MythFrontend.php mythplugins-0.24.fixes/mythweb/classes/MythFrontend.php
--- mythplugins-0.24.orig/mythweb/classes/MythFrontend.php 2010-09-12 02:55:38.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/MythFrontend.php 2011-01-22 18:44:18.000000000 -0500
@@ -2,10 +2,10 @@
/**
* Connection routines for the new socket interface to mythfrontend.
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-09-11 23:55:38 -0700 (Sat, 11 Sep 2010) $
- * @version $Revision: 26244 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythTV
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Services/JSON.php mythplugins-0.24.fixes/mythweb/classes/Services/JSON.php
[...5566 lines suppressed...]
-1- Ea5l)+!
13 years, 8 months
- 1
- 0
rpms/mythtv/F-13 mythplugins-0.24-fixes.patch, NONE, 1.1 mythtv-0.24-fixes.patch, NONE, 1.1 mythweb-0.24-fixes.patch, NONE, 1.1 mythtv.spec, 1.94, 1.95 0001-Tweaking-in-recording-seektable-building.patch, 1.1, NONE alsa-fixes-1.patch, 1.1, NONE alsa-fixes-2.patch, 1.1, NONE mythplugins-0.23.1-svnfixes.patch, 1.3, NONE mythplugins-0.24-svnfixes.patch, 1.1, NONE mythtv-0.23.1-svnfixes.patch, 1.3, NONE mythtv-0.24-svnfixes.patch, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20924
Modified Files:
mythtv.spec
Added Files:
mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch
mythweb-0.24-fixes.patch
Removed Files:
0001-Tweaking-in-recording-seektable-building.patch
alsa-fixes-1.patch alsa-fixes-2.patch
mythplugins-0.23.1-svnfixes.patch
mythplugins-0.24-svnfixes.patch mythtv-0.23.1-svnfixes.patch
mythtv-0.24-svnfixes.patch
Log Message:
* Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6
- Update to 0.24 fixes, git revision 4af46b1f5d
- Fix mythtv version output to properly show git revision
mythplugins-0.24-fixes.patch:
.gitignore | 6
mytharchive/i18n/.gitignore | 1
mytharchive/mytharchive/recordingselector.cpp | 2
mytharchive/mytharchivehelper/.gitignore | 1
mytharchive/mytharchivehelper/pxsup2dast.c | 2
mytharchive/mythburn/scripts/mythburn.py | 13 -
mytharchive/theme/default-wide/mytharchive-ui.xml | 12
mytharchive/theme/default-wide/mythburn-ui.xml | 7
mytharchive/theme/default/mytharchive-ui.xml | 12
mytharchive/theme/default/mythburn-ui.xml | 7
mythbrowser/i18n/.gitignore | 1
mythbrowser/theme/default-wide/browser-ui.xml | 15 -
mythbrowser/theme/default/browser-ui.xml | 15 -
mythgallery/dcrawplugin/.gitignore | 1
mythgallery/i18n/.gitignore | 1
mythgallery/mythgallery/.gitignore | 1
mythgallery/mythgallery/gallerysettings.cpp | 10
mythgallery/mythgallery/galleryutil.cpp | 4
mythgallery/mythgallery/main.cpp | 3
mythgame/i18n/.gitignore | 1
mythgame/mythgame/.gitignore | 1
mythmusic/i18n/.gitignore | 1
mythmusic/mythmusic/.gitignore | 1
mythmusic/mythmusic/cdrip.cpp | 2
mythmusic/mythmusic/filescanner.cpp | 40 +--
mythmusic/mythmusic/musicplayer.cpp | 5
mythnetvision/i18n/.gitignore | 1
mythnetvision/mythfillnetvision/.gitignore | 1
mythnews/i18n/.gitignore | 1
mythnews/mythnews/main.cpp | 2
mythvideo/i18n/.gitignore | 1
mythvideo/mtd/.gitignore | 1
mythvideo/mythvideo/.gitignore | 1
mythvideo/mythvideo/scripts/jamu.py | 14 -
mythweather/i18n/.gitignore | 1
mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 40 +--
mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl | 127 ++++++++++
mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 4
mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 4
mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl | 1
mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 1
mythzoneminder/i18n/.gitignore | 1
mythzoneminder/mythzmserver/.gitignore | 1
mythzoneminder/mythzoneminder/zmliveplayer.cpp | 4
mythzoneminder/theme/default-wide/zoneminder-ui.xml | 12
45 files changed, 278 insertions(+), 105 deletions(-)
--- NEW FILE mythplugins-0.24-fixes.patch ---
diff -Naurp mythplugins-0.24.orig/.gitignore mythplugins-0.24.fixes/.gitignore
--- mythplugins-0.24.orig/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1,6 @@
+Makefile
+themenop
+config.ep
+config.pro
+config.log
+mythconfig.mak
diff -Naurp mythplugins-0.24.orig/mytharchive/i18n/.gitignore mythplugins-0.24.fixes/mytharchive/i18n/.gitignore
--- mythplugins-0.24.orig/mytharchive/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mytharchive/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp
--- mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp 2010-10-06 06:38:18.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -116,7 +116,7 @@ bool RecordingSelector::Create(void)
void RecordingSelector::Init(void)
{
- QString message = tr("Retrieving Recording List. Please Wait...");
+ QString message = tr("Retrieving Recording List.\nPlease Wait...");
MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mytharchivehelper
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c 2011-02-28 22:42:02.000000000 -0500
@@ -1,6 +1,6 @@
/*
#
- # $Id: pxsup2dast.c 25914 2010-08-28 20:16:22Z xris $
+ # $Id$
#
# Project X sup to dvdauthor subtitle xml file.
# too ät iki piste fi
diff -Naurp mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py
--- mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py 2010-10-06 09:07:39.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py 2011-02-28 22:42:02.000000000 -0500
@@ -38,7 +38,7 @@
#******************************************************************************
# version of script - change after each update
-VERSION="0.1.20101006-1"
+VERSION="0.1.20101206-1"
# keep all temporary files for debugging purposes
# set this to True before a first run through when testing
@@ -400,7 +400,7 @@ def getThemeFile(theme,file):
# Returns the path where we can find our fonts
def getFontPathName(fontname):
- return os.path.join(sharepath, fontname)
+ return os.path.join(sharepath, "fonts", fontname)
#############################################################
# Creates a file path where the temp files for a video file can be created
@@ -2677,12 +2677,16 @@ def deMultiplexMPEG2File(folder, mediafi
command += "-a %d " % (audio1[AUDIO_ID])
elif audio1[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio1[AUDIO_ID])
+ elif audio1[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio1[AUDIO_ID])
if audio2[AUDIO_ID] != -1:
if audio2[AUDIO_CODEC] == 'MP2':
command += "-a %d " % (audio2[AUDIO_ID])
elif audio2[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio2[AUDIO_ID])
+ elif audio2[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio2[AUDIO_ID])
else:
command = "mythreplex --demux --fix_sync -o %s " % (folder + "/stream")
@@ -2693,12 +2697,17 @@ def deMultiplexMPEG2File(folder, mediafi
command += "-a %d " % (audio1[AUDIO_ID] & 255)
elif audio1[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio1[AUDIO_ID] & 255)
+ elif audio1[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio1[AUDIO_ID] & 255)
+
if audio2[AUDIO_ID] != -1:
if audio2[AUDIO_CODEC] == 'MP2':
command += "-a %d " % (audio2[AUDIO_ID] & 255)
elif audio2[AUDIO_CODEC] == 'AC3':
command += "-c %d " % (audio2[AUDIO_ID] & 255)
+ elif audio2[AUDIO_CODEC] == 'EAC3':
+ command += "-c %d " % (audio2[AUDIO_ID] & 255)
mediafile = quoteFilename(mediafile)
command += mediafile
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -146,7 +146,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -154,7 +154,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -259,7 +259,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -267,7 +267,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -330,7 +330,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -338,7 +338,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
- <imagetype name="box">
- <filename>mz_function_popup.png</filename>
- </imagetype>
+ <shape name="background" from="basebackground">
+ <area>0,0,413,426</area>
+ <fill color="#000000" alpha="220" />
+ </shape>
<textarea name="title" from="basetextarea">
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -147,7 +147,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -155,7 +155,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -261,7 +261,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -269,7 +269,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
@@ -333,7 +333,7 @@ Common MythArchive window definitions
</statetype>
</state>
<state name="selectedactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" />
@@ -341,7 +341,7 @@ Common MythArchive window definitions
</shape>
</state>
<state name="selectedinactive" from="active">
- <shape name="buttonbackground">
+ <shape name="background">
<area>0,0,100%,100%</area>
<fill style="gradient">
<gradient start="#52CA38" end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
- <imagetype name="box">
- <filename>mz_function_popup.png</filename>
- </imagetype>
+ <shape name="background" from="basebackground">
+ <area>0,0,413,426</area>
+ <fill color="#000000" alpha="220" />
+ </shape>
<textarea name="title" from="basetextarea">
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mythbrowser/i18n/.gitignore mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore
--- mythplugins-0.24.orig/mythbrowser/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml
--- mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml 2010-10-09 15:44:27.000000000 -0400
+++ mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -53,9 +53,8 @@
<statetype name="buttonitem">
<area>0,0,180,40</area>
<state name="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector.png</filename>
- </imagetype>
+ <area>0,0,180,40</area>
+ <shape name="background" from="basewidgetshape" />
<textarea name="buttontext" from="basetextarea">
<area>0,0,180,40</area>
<font>basesmall</font>
@@ -63,14 +62,12 @@
</textarea>
</state>
<state name="selectedactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_selected.png</filename>
- </imagetype>
+ <shape name="background" from="baseselectedwidgetshape" />
</state>
<state name="selectedinactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_inactive.png</filename>
- </imagetype>
+ <textarea name="buttontext">
+ <font>basesmallgrey</font>
+ </textarea>
</state>
</statetype>
<statetype name="downscrollarrow">
diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml
--- mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml 2010-10-09 15:44:27.000000000 -0400
+++ mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -61,9 +61,8 @@
<statetype name="buttonitem">
<area>0,0,180,40</area>
<state name="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector.png</filename>
- </imagetype>
+ <area>0,0,180,40</area>
+ <shape name="background" from="basewidgetshape" />
<textarea name="buttontext" from="basetextarea">
<area>0,0,180,40</area>
<font>basesmall</font>
@@ -73,14 +72,12 @@
</textarea>
</state>
<state name="selectedactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_selected.png</filename>
- </imagetype>
+ <shape name="background" from="baseselectedwidgetshape" />
</state>
<state name="selectedinactive" from="active">
- <imagetype name="buttonbackground">
- <filename>horiz_selector_inactive.png</filename>
- </imagetype>
+ <textarea name="buttontext">
+ <font>basesmallgrey</font>
+ </textarea>
</state>
</statetype>
<statetype name="downscrollarrow">
diff -Naurp mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore
--- mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythgallery/i18n/.gitignore mythplugins-0.24.fixes/mythgallery/i18n/.gitignore
--- mythplugins-0.24.orig/mythgallery/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgallery/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -78,6 +78,15 @@ static HostLineEdit *MythGalleryImportDi
return gc;
};
+static HostCheckBox *MythGalleryAutoLoad()
+{
+ HostCheckBox *gc = new HostCheckBox("GalleryAutoLoad");
+ gc->setLabel(QObject::tr("Automatically load MythGallery to display pictures"));
+ gc->setValue(false);
+ gc->setHelpText(QObject::tr("When a new CD-Rom or removable storage device containing pictures is detected then load MythGallery to display the content."));
+ return gc;
+}
+
#ifdef USING_OPENGL
static HostCheckBox *SlideshowUseOpenGL()
@@ -217,6 +226,7 @@ GallerySettings::GallerySettings()
general->addChild(MythGalleryThumbnailLocation());
general->addChild(MythGallerySortOrder());
general->addChild(MythGalleryImportDirs());
+ general->addChild(MythGalleryAutoLoad());
general->addChild(MythGalleryMoviePlayerCmd());
addChild(general);
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -98,7 +98,7 @@ bool GalleryUtil::IsImage(const QString
QStringList::const_iterator it = filt.begin();
for (; it != filt.end(); ++it)
{
- if ((*it).toLower().contains(fi.suffix()))
+ if ((*it).contains(fi.suffix().toLower()))
return true;
}
@@ -115,7 +115,7 @@ bool GalleryUtil::IsMovie(const QString
QStringList::const_iterator it = filt.begin();
for (; it != filt.end(); ++it)
{
- if ((*it).toLower().contains(fi.suffix()))
+ if ((*it).contains(fi.suffix().toLower()))
return true;
}
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore
--- mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp 2010-10-18 09:02:43.000000000 -0400
+++ mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -59,6 +59,9 @@ static void runGallery(void)
static void handleMedia(MythMediaDevice *dev)
{
+ if (! gCoreContext->GetNumSetting("GalleryAutoLoad", 0))
+ return;
+
if (dev && dev->isUsable())
run(dev);
}
diff -Naurp mythplugins-0.24.orig/mythgame/i18n/.gitignore mythplugins-0.24.fixes/mythgame/i18n/.gitignore
--- mythplugins-0.24.orig/mythgame/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgame/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythgame/mythgame/.gitignore mythplugins-0.24.fixes/mythgame/mythgame/.gitignore
--- mythplugins-0.24.orig/mythgame/mythgame/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythgame/mythgame/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+gameui.moc
diff -Naurp mythplugins-0.24.orig/mythmusic/i18n/.gitignore mythplugins-0.24.fixes/mythmusic/i18n/.gitignore
--- mythplugins-0.24.orig/mythmusic/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythmusic/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp
--- mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp 2010-09-12 18:53:44.000000000 -0400
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -945,8 +945,6 @@ QString Ripper::filenameFromMetadata(Met
VERBOSE(VB_GENERAL, QString("Invalid file storage definition."));
}
- filename = QString(filename.toLocal8Bit().constData());
-
QStringList directoryList = filename.split("/");
for (int i = 0; i < (directoryList.size() - 1); i++)
{
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp
--- mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp 2010-05-13 00:18:15.000000000 -0400
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -22,7 +22,7 @@ FileScanner::FileScanner ()
MSqlQuery query(MSqlQuery::InitCon());
// Cache the directory ids from the database
- query.prepare("SELECT directory_id, LOWER(path) FROM music_directories");
+ query.prepare("SELECT directory_id, path FROM music_directories");
if (query.exec())
{
while(query.next())
@@ -109,12 +109,12 @@ void FileScanner::BuildFileList(QString
QString dir(filename);
dir.remove(0, m_startdir.length());
- newparentid = m_directoryid[QString(dir.toUtf8()).toLower()];
+ newparentid = m_directoryid[dir];
if (newparentid == 0)
{
int id = GetDirectoryId(dir, parentid);
- m_directoryid[QString(dir.toUtf8()).toLower()] = id;
+ m_directoryid[dir] = id;
if (id > 0)
{
@@ -252,8 +252,7 @@ void FileScanner::AddFileToDB(const QStr
query.prepare("INSERT INTO music_albumart SET filename = :FILE, "
"directory_id = :DIRID, imagetype = :TYPE;");
query.bindValue(":FILE", name);
- query.bindValue(":DIRID", m_directoryid[
- QString(directory.toUtf8()).toLower()]);
+ query.bindValue(":DIRID", m_directoryid[directory]);
query.bindValue(":TYPE", AlbumArtImages::guessImageType(name));
if (!query.exec() || query.numRowsAffected() <= 0)
@@ -274,24 +273,24 @@ void FileScanner::AddFileToDB(const QStr
QString album_cache_string;
// Set values from cache
- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
+ int did = m_directoryid[directory];
if (did > 0)
data->setDirectoryId(did);
- int aid = m_artistid[QString(data->Artist().toUtf8()).toLower()];
+ int aid = m_artistid[data->Artist().toLower()];
if (aid > 0)
{
data->setArtistId(aid);
// The album cache depends on the artist id
album_cache_string = data->getArtistId() + "#"
- + QString(data->Album().toUtf8()).toLower();
+ + data->Album().toLower();
if (m_albumid[album_cache_string] > 0)
data->setAlbumId(m_albumid[album_cache_string]);
}
- int gid = m_genreid[QString(data->Genre().toUtf8()).toLower()];
+ int gid = m_genreid[data->Genre().toLower()];
if (gid > 0)
data->setGenreId(gid);
@@ -299,14 +298,14 @@ void FileScanner::AddFileToDB(const QStr
data->dumpToDatabase();
// Update the cache
- m_artistid[QString(data->Artist().toUtf8()).toLower()] =
+ m_artistid[data->Artist().toLower()] =
data->getArtistId();
- m_genreid[QString(data->Genre().toUtf8()).toLower()] =
+ m_genreid[data->Genre().toLower()] =
data->getGenreId();
album_cache_string = data->getArtistId() + "#"
- + QString(data->Album().toUtf8()).toLower();
+ + data->Album().toLower();
m_albumid[album_cache_string] = data->getAlbumId();
delete data;
}
@@ -445,8 +444,7 @@ void FileScanner::RemoveFileFromDB (cons
query.prepare("DELETE FROM music_albumart WHERE filename= :FILE AND "
"directory_id= :DIRID;");
query.bindValue(":FILE", sqlfilename);
- query.bindValue(":DIRID", m_directoryid[
- QString(directory.toUtf8()).toLower()]);
+ query.bindValue(":DIRID", m_directoryid[directory]);
if (!query.exec() || query.numRowsAffected() <= 0)
{
@@ -491,24 +489,24 @@ void FileScanner::UpdateFileInDB(const Q
QString album_cache_string;
// Set values from cache
- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
+ int did = m_directoryid[directory];
if (did > 0)
disk_meta->setDirectoryId(did);
- int aid = m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()];
+ int aid = m_artistid[disk_meta->Artist().toLower()];
if (aid > 0)
{
disk_meta->setArtistId(aid);
// The album cache depends on the artist id
album_cache_string = disk_meta->getArtistId() + "#" +
- QString(disk_meta->Album().toUtf8()).toLower();
+ disk_meta->Album().toLower();
if (m_albumid[album_cache_string] > 0)
disk_meta->setAlbumId(m_albumid[album_cache_string]);
}
- int gid = m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()];
+ int gid = m_genreid[disk_meta->Genre().toLower()];
if (gid > 0)
disk_meta->setGenreId(gid);
@@ -516,12 +514,12 @@ void FileScanner::UpdateFileInDB(const Q
disk_meta->dumpToDatabase();
// Update the cache
- m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()]
+ m_artistid[disk_meta->Artist().toLower()]
= disk_meta->getArtistId();
- m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()]
+ m_genreid[disk_meta->Genre().toLower()]
= disk_meta->getGenreId();
album_cache_string = disk_meta->getArtistId() + "#" +
- QString(disk_meta->Album().toUtf8()).toLower();
+ disk_meta->Album().toLower();
m_albumid[album_cache_string] = disk_meta->getAlbumId();
}
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore
--- mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp
--- mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp 2010-10-10 17:59:02.000000000 -0400
+++ mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -993,8 +993,9 @@ void MusicPlayer::decoderHandlerReady(vo
VERBOSE(VB_PLAYBACK, QString ("decoder handler is ready, decoding %1").
arg(getDecoder()->getFilename()));
- if (getDecoder()->getFilename().contains("cda") == 1)
- dynamic_cast<CdDecoder*>(getDecoder())->setDevice(m_CDdevice);
+ CdDecoder *cddecoder = dynamic_cast<CdDecoder*>(getDecoder());
+ if (cddecoder)
+ cddecoder->setDevice(m_CDdevice);
getDecoder()->setOutput(m_output);
//getDecoder()-> setBlockSize(2 * 1024);
diff -Naurp mythplugins-0.24.orig/mythnetvision/i18n/.gitignore mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore
--- mythplugins-0.24.orig/mythnetvision/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore
--- mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythfillnetvision
diff -Naurp mythplugins-0.24.orig/mythnews/i18n/.gitignore mythplugins-0.24.fixes/mythnews/i18n/.gitignore
--- mythplugins-0.24.orig/mythnews/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythnews/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythnews/mythnews/main.cpp mythplugins-0.24.fixes/mythnews/mythnews/main.cpp
--- mythplugins-0.24.orig/mythnews/mythnews/main.cpp 2010-08-29 18:21:36.000000000 -0400
+++ mythplugins-0.24.fixes/mythnews/mythnews/main.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -69,7 +69,7 @@ int mythplugin_init(const char *libversi
"Couldn't upgrade database to new schema, exiting.");
return -1;
}
- gCoreContext->ActivateSettingsCache(false);
+ gCoreContext->ActivateSettingsCache(true);
setupKeys();
diff -Naurp mythplugins-0.24.orig/mythvideo/i18n/.gitignore mythplugins-0.24.fixes/mythvideo/i18n/.gitignore
--- mythplugins-0.24.orig/mythvideo/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythvideo/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythvideo/mtd/.gitignore mythplugins-0.24.fixes/mythvideo/mtd/.gitignore
--- mythplugins-0.24.orig/mythvideo/mtd/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythvideo/mtd/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mtd
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore
--- mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+*.moc
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py
--- mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py 2010-09-12 12:10:46.000000000 -0400
+++ mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py 2011-02-28 22:42:02.000000000 -0500
@@ -306,6 +306,8 @@ __version__=u"v0.7.7"
# 0.7.5 Added the TMDB MovieRating as videometadata table "rating" field
# 0.7.6 Modifications to support MythTV python bindings changes
# 0.7.7 Pull hostname from python bindings instead of socket libraries
+ # Added support of unicode characters within a jamu.conf file
+ # Replace 'xml' module version check with generic Python version, to correct failure in Python 2.7
usage_txt=u'''
@@ -476,14 +478,10 @@ class OutStreamEncoder(object):
sys.stdout = OutStreamEncoder(sys.stdout, 'utf8')
sys.stderr = OutStreamEncoder(sys.stderr, 'utf8')
-try:
- import xml
-except Exception, e:
- print '''The python module xml must be installed. error(%s)''' % e
+if sys.version_info <= (2,5):
+ print '''JAMU requires Python 2.5 or newer to run.'''
sys.exit(1)
-if xml.__version__ < u'41660':
- print '''
-\n! Warning - The module xml (v41660 or greater) must be installed. Your version is different (v%s) than what Jamu was tested with. Jamu may not work on your installation.\nIt is recommended that you upgrade.\n''' % xml.__version__
+
import xml.etree.cElementTree as ElementTree
@@ -1246,7 +1244,7 @@ class Configuration(object):
)
sys.exit(1)
cfg = ConfigParser.SafeConfigParser()
- cfg.read(useroptions)
+ cfg.readfp(codecs.open(useroptions, "r", "utf8"))
for section in cfg.sections():
if section[:5] == 'File ':
self.config['config_file'] = section[5:]
diff -Naurp mythplugins-0.24.orig/mythweather/i18n/.gitignore mythplugins-0.24.fixes/mythweather/i18n/.gitignore
--- mythplugins-0.24.orig/mythweather/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythweather/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2010-06-22 00:11:23.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -1,4 +1,5 @@
#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
#
# Animated satellite map grabber for Environment Canada.
#
@@ -13,6 +14,7 @@ use strict;
use warnings;
use English;
+use File::Path;
use File::Basename;
use Cwd 'abs_path';
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
@@ -23,17 +25,18 @@ use Getopt::Std;
use LWP::Simple;
use Date::Manip;
use ENVCANMapSearch;
+use Image::Magick;
our ($opt_v, $opt_t, $opt_T, $opt_l, $opt_u, $opt_d);
my $name = 'ENVCAN-Animated-Map';
-my $version = 0.3;
+my $version = 0.4;
my $author = 'Joe Ripley';
my $email = 'vitaminjoe(a)gmail.com';
my $updateTimeout = 10*60;
my $retrieveTimeout = 30;
-my @types = ('amdesc', 'updatetime', 'animatedimage');
-my $dir = "./";
+my @types = ('amdesc', 'updatetime', 'animatedimage', 'copyright');
+my $dir = "/tmp/envcan";
getopts('Tvtlu:d:');
@@ -66,6 +69,10 @@ if (defined $opt_d) {
$dir = $opt_d;
}
+if (!-d $dir) {
+ mkpath( $dir, {mode => 0755} );
+}
+
my $loc = shift;
if (!defined $loc || $loc eq "") {
@@ -97,24 +104,27 @@ foreach my $line (split(/\n/, $response)
# Download map files, if necessary (maps are stale after 15 minutes)
my $i = 0;
+my $outimage = Image::Magick->new;
foreach my $image (@image_list) {
my $getImage = 1;
- if (-f $path . $i) {
+ if (-f "$path$i" ) {
my @stats = stat(_);
- if ($stats[9] > (time - 900)) { $i++; next; }
+ if ($stats[9] > (time - 900)) {
+ $outimage->Read( "$path$i" );
+ $i++;
+ next;
+ }
}
- getstore($base_url . $image, $path . $i);
+ getstore($base_url . $image, "$path$i");
+ $outimage->Read( "$path$i" );
$i++;
}
-# Determine image size
-if (!$size) {
- use Image::Size;
- my ($x, $y) = imgsize("${path}0");
- $size = "${x}x$y" if ($x && $y);
-}
+$outimage->Write( filename => "$dir/$file.gif", delay => 75 );
-print "amdesc::$desc\n";
-printf "animatedimage::${path}%%1-$i%s\n", ($size && "-$size" || '');
-print "updatetime::Last Updated on " . UnixDate("now", "%b %d, %I:%M %p %Z") . "\n";
+print "amdesc::$desc\n";
+print "animatedimage::$dir/$file.gif\n";
+print "updatetime::Last Updated on " .
+ UnixDate("now", "%b %d, %I:%M %p %Z") . "\n";
+print "copyright::Environment Canada\n";
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1,127 @@
+#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
+#
+# Static satellite map grabber for Environment Canada.
+#
+# This script downloads satellite map data from the Environment Canada
+# website. It uses the lists of JPEG images supplied by the page at
+# http://www.weatheroffice.gc.ca/satellite/index_e.html.
+#
+# The bulk of the code in this script was originally authored by
+# Lucien Dunning (ldunning(a)gmail.com).
+# Based on envcan_animaps.pl by Joe Ripley <vitaminjoe(a)gmail.com>
+
+use strict;
+use warnings;
+
+use English;
+use File::Path;
+use File::Basename;
+use Cwd 'abs_path';
+use lib dirname(abs_path($0 or $PROGRAM_NAME)),
+ '/usr/share/mythtv/mythweather/scripts/ca_envcan',
+ '/usr/local/share/mythtv/mythweather/scripts/ca_envcan';
+
+use Getopt::Std;
+use LWP::Simple;
+use Date::Manip;
+use ENVCANMapSearch;
+use Image::Magick;
+
+our ($opt_v, $opt_t, $opt_T, $opt_l, $opt_u, $opt_d);
+
+my $name = 'ENVCAN-Static-Map';
+my $version = 0.1;
+my $author = 'Gavin Hurlbut';
+my $email = 'gjhurlbu(a)gmail.com';
+my $updateTimeout = 10*60;
+my $retrieveTimeout = 30;
+my @types = ('smdesc', 'updatetime', 'map', 'copyright');
+my $dir = "/tmp/envcan";
+
+getopts('Tvtlu:d:');
+
+if (defined $opt_v) {
+ print "$name,$version,$author,$email\n";
+ exit 0;
+}
+
+if (defined $opt_T) {
+ print "$updateTimeout,$retrieveTimeout\n";
+ exit 0;
+}
+if (defined $opt_l) {
+ my $search = shift;
+ ENVCANMapSearch::AddSatSearch($search);
+ ENVCANMapSearch::AddSatClassSearch($search);
+ ENVCANMapSearch::AddImageTypeSearch($search);
+ foreach my $result (@{ENVCANMapSearch::doSearch()}) {
+ print "$result->{entry_id}::($result->{satellite_class}) $result->{satellite} $result->{image_type}\n";
+ }
+ exit 0;
+}
+
+if (defined $opt_t) {
+ foreach (@types) {print; print "\n";}
+ exit 0;
+}
+
+if (defined $opt_d) {
+ $dir = $opt_d;
+}
+
+if (!-d $dir) {
+ mkpath( $dir, {mode => 0755} );
+}
+
+my $loc = shift;
+
+if (!defined $loc || $loc eq "") {
+ die "Invalid usage";
+}
+
+# Get map info
+ENVCANMapSearch::AddAniSearch($loc);
+my $results = ENVCANMapSearch::doSearch();
+my $desc = $results->[0]->{satellite};
+
+# Get HTML and find image list
+my $response = get $results->[0]->{animated_url};
+die unless defined $response;
+
+my @image_list;
+my $size;
+my $base_url = "http://www.weatheroffice.gc.ca";
+my $file = $loc;
+my $path = "$dir/$file";
+
+# Get list of images (at most 10)
+foreach my $line (split(/\n/, $response)) {
+ if ($line =~ /theImagesComplete\[\d*\] \= \"(.*)\"\;/) {
+ push (@image_list, $1);
+ if ($#image_list >= 1) { shift @image_list; }
+ }
+}
+
+# Download map file, if necessary (maps are stale after 15 minutes)
+my $image = shift @image_list;
+my $ext = $image;
+$ext =~ s/.*\.(.*?)$/$1/;
+
+my $cached = 0;
+if (-f "$path.$ext" ) {
+ my @stats = stat(_);
+ if ($stats[9] > (time - 900)) {
+ $cached = 1;
+ }
+}
+
+if (!$cached) {
+ getstore($base_url . $image, "$path.$ext");
+}
+
+print "smdesc::$desc\n";
+print "map::$path.$ext\n";
+print "updatetime::Last Updated on " .
+ UnixDate("now", "%b %d, %I:%M %p %Z") . "\n";
+print "copyright::Environment Canada\n";
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2010-06-22 00:11:23.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2011-02-28 22:42:02.000000000 -0500
@@ -154,14 +154,14 @@ elsif ($weather_string =~ /^heavy rain$/
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "weather_icon::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "weather_icon::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "weather_icon::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2010-06-22 00:11:23.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2011-02-28 22:42:02.000000000 -0500
@@ -179,14 +179,14 @@ foreach $item (@{$xml->{channel}->{item}
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "icon-" . $i . "::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "icon-" . $i . "::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "icon-" . $i . "::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2010-10-10 17:47:57.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
+use File::Path;
use File::Basename;
use Cwd 'abs_path';
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2010-10-10 17:47:57.000000000 -0400
+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
+use File::Path;
use File::Basename;
use Cwd 'abs_path';
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythzmserver
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp
--- mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2010-08-15 06:52:05.000000000 -0400
+++ mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -12,10 +12,6 @@
*
* ============================================================ */
-#include <iostream>
-#include <sys/shm.h>
-#include <cstdlib>
-
// qt
#include <QDateTime>
#include <QTimer>
diff -Naurp mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml
--- mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2010-10-06 11:44:50.000000000 -0400
+++ mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -652,23 +652,23 @@
<window name="zmplayer">
- <font name="label" from="basesmall">
+ <fontdef name="label" from="basesmall">
<color>#ffff00</color>
<size>16</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="data" from="basesmall">
+ <fontdef name="data" from="basesmall">
<color>#ffffff</color>
<size>14</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="buttons" from="basesmall">
+ <fontdef name="buttons" from="basesmall">
<color>#ffffff</color>
<size>12</size>
<weight>bold</weight>
- </font>
+ </fontdef>
<textarea name="pagetitle" from="basetextarea">
<area>30,10,570,40</area>
mythtv-0.24-fixes.patch:
.gitignore | 3
Makefile | 6
VERSION | 1
bindings/perl/.gitignore | 4
bindings/perl/IO/Socket/INET/MythTV.pm | 8
bindings/perl/MythTV.pm | 8
bindings/perl/MythTV/Channel.pm | 8
bindings/perl/MythTV/Program.pm | 8
bindings/perl/MythTV/Recording.pm | 8
bindings/perl/MythTV/StorageGroup.pm | 8
bindings/python/.gitignore | 1
bindings/python/MythTV/__init__.py | 4
bindings/python/MythTV/dataheap.py | 2
bindings/python/MythTV/methodheap.py | 7
bindings/python/MythTV/mythproto.py | 2
bindings/python/MythTV/static.py | 2
bindings/python/MythTV/system.py | 24
bindings/python/MythTV/utility.py | 4
configure | 9
contrib/icons/master_iconmap/channel_icons.pl | 8
contrib/maintenance/flush_deleted_recgroup.pl | 8
contrib/maintenance/optimize_mythdb.pl | 8
contrib/user_jobs/mythlink.pl | 8
docs/mythtv-HOWTO.sgml | 123 +
external/.gitignore | 16
external/FFmpeg/Makefile | 11
external/FFmpeg/libavcodec/dvbsubdec.c | 1
external/FFmpeg/libavformat/mpegts.c | 1
external/FFmpeg/libavformat/rmdec.c | 7
filters/quickdnr/quickdnr.pro | 2
i18n/.gitignore | 1
i18n/mythfrontend_en_gb.qm | 52
i18n/mythfrontend_en_gb.ts | 2
i18n/mythfrontend_fr.qm | 468 +++---
i18n/mythfrontend_fr.ts | 2
i18n/mythfrontend_pt.qm | 375 ++--
i18n/mythfrontend_pt.ts | 2
libs/libavutil/.gitignore | 1
libs/libmyth/audiooutput.cpp | 40
libs/libmyth/audiooutput.h | 3
libs/libmyth/audiooutputalsa.cpp | 169 +-
libs/libmyth/audiooutputalsa.h | 7
libs/libmyth/audiooutputbase.cpp | 395 +++--
libs/libmyth/audiooutputbase.h | 9
libs/libmyth/audiooutputca.cpp | 4
libs/libmyth/audiooutputdigitalencoder.h | 1
libs/libmyth/audiooutputdx.cpp | 2
libs/libmyth/audiooutputpulse.cpp | 7
libs/libmyth/audiooutputsettings.cpp | 14
libs/libmyth/audiooutpututil.cpp | 26
libs/libmyth/audiooutpututil.h | 3
libs/libmyth/audiosettings.cpp | 4
libs/libmyth/mediamonitor-darwin.cpp | 2
libs/libmythdb/.gitignore | 2
libs/libmythdb/mythcorecontext.cpp | 5
libs/libmythdb/mythdownloadmanager.cpp | 51
libs/libmythdb/mythsystem.cpp | 14
libs/libmythdb/mythversion.h | 2
libs/libmythdb/storagegroup.cpp | 3
libs/libmythfreesurround/freesurround.cpp | 4
libs/libmythfreesurround/freesurround.h | 2
libs/libmythmetadata/.gitignore | 2
libs/libmythmetadata/videometadata.cpp | 16
libs/libmythsoundtouch/AAFilter.cpp | 6
libs/libmythsoundtouch/AAFilter.h | 6
libs/libmythsoundtouch/BPMDetect.h | 6
libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 6
libs/libmythsoundtouch/FIFOSampleBuffer.h | 6
libs/libmythsoundtouch/FIFOSamplePipe.h | 6
libs/libmythsoundtouch/FIRFilter.cpp | 6
libs/libmythsoundtouch/FIRFilter.h | 6
libs/libmythsoundtouch/RateTransposer.cpp | 6
libs/libmythsoundtouch/RateTransposer.h | 6
libs/libmythsoundtouch/STTypes.h | 6
libs/libmythsoundtouch/SoundTouch.cpp | 6
libs/libmythsoundtouch/SoundTouch.h | 6
libs/libmythsoundtouch/TDStretch.cpp | 6
libs/libmythsoundtouch/TDStretch.h | 6
libs/libmythsoundtouch/cpu_detect.h | 14
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 6
libs/libmythsoundtouch/mmx_gcc.cpp | 6
libs/libmythtv/RingBuffer.cpp | 39
libs/libmythtv/audioplayer.cpp | 51
libs/libmythtv/audioplayer.h | 3
libs/libmythtv/avformatdecoder.cpp | 257 ++-
libs/libmythtv/avformatdecoder.h | 8
libs/libmythtv/bswap.h | 19
libs/libmythtv/cc608reader.cpp | 1
libs/libmythtv/decoderbase.cpp | 2
libs/libmythtv/decoderbase.h | 4
libs/libmythtv/dtvrecorder.cpp | 30
libs/libmythtv/dtvrecorder.h | 2
libs/libmythtv/eithelper.cpp | 16
libs/libmythtv/fourcc.h | 2
libs/libmythtv/frame.h | 2
libs/libmythtv/frequencies.c | 15
libs/libmythtv/frequencytables.cpp | 4
libs/libmythtv/libmythtv.pro | 6
libs/libmythtv/minilzo.cpp | 2
libs/libmythtv/mpeg/H264Parser.cpp | 424 ++++-
libs/libmythtv/mpeg/H264Parser.h | 27
libs/libmythtv/mythcommflagplayer.cpp | 2
libs/libmythtv/mythdvdplayer.cpp | 10
libs/libmythtv/mythplayer.cpp | 336 ++--
libs/libmythtv/mythplayer.h | 36
libs/libmythtv/nuppeldecoder.cpp | 18
libs/libmythtv/playercontext.cpp | 2
libs/libmythtv/recordingprofile.cpp | 8
libs/libmythtv/recordingprofile.h | 1
libs/libmythtv/subtitlescreen.cpp | 33
libs/libmythtv/teletextdecoder.cpp | 51
libs/libmythtv/teletextdecoder.h | 42
libs/libmythtv/teletextreader.cpp | 609 ++++++++
libs/libmythtv/teletextreader.h | 162 ++
libs/libmythtv/teletextscreen.cpp | 754 +---------
libs/libmythtv/teletextscreen.h | 154 --
libs/libmythtv/textsubtitleparser.h | 6
libs/libmythtv/transporteditor.cpp | 2
libs/libmythtv/transporteditor.h | 2
libs/libmythtv/tv_play.cpp | 286 +--
libs/libmythtv/tv_play.h | 23
libs/libmythtv/tv_rec.cpp | 4
libs/libmythtv/videodisplayprofile.h | 1
libs/libmythtv/videoout_d3d.h | 2
libs/libmythtv/videoout_opengl.h | 2
libs/libmythtv/videoout_quartz.cpp | 2
libs/libmythtv/videoout_vdpau.h | 2
libs/libmythtv/videoout_xv.cpp | 4
libs/libmythtv/videoout_xv.h | 6
libs/libmythtv/videooutbase.cpp | 9
libs/libmythtv/videooutbase.h | 1
libs/libmythui/mythmainwindow.cpp | 2
libs/libmythui/mythrender_opengl.cpp | 21
libs/libmythui/mythrender_opengl.h | 4
libs/libmythui/mythscreentype.cpp | 4
libs/libmythui/mythuibuttonlist.cpp | 2
libs/libmythui/mythuiimage.cpp | 16
libs/libmythui/mythuistatetype.cpp | 16
libs/libmythui/mythuiwebbrowser.cpp | 6
libs/libmythui/util-osx.cpp | 2
libs/libmythupnp/httprequest.cpp | 28
libs/libmythupnp/soapclient.cpp | 6
libs/libmythupnp/threadpool.cpp | 59
libs/libmythupnp/upnpcds.cpp | 2
libs/libmythupnp/upnpcdsobjects.cpp | 2
locales/.gitignore | 1
programs/mythavtest/.gitignore | 1
programs/mythbackend/.gitignore | 1
programs/mythbackend/mainserver.cpp | 20
programs/mythbackend/playbacksock.cpp | 2
programs/mythbackend/scheduler.cpp | 15
programs/mythcommflag/.gitignore | 1
programs/mythfilldatabase/.gitignore | 1
programs/mythfrontend/.gitignore | 1
programs/mythfrontend/exitprompt.cpp | 25
programs/mythfrontend/globalsettings.cpp | 115 -
programs/mythfrontend/globalsettings.h | 5
programs/mythfrontend/guidegrid.cpp | 7
programs/mythfrontend/playbackbox.cpp | 13
programs/mythfrontend/playbackbox.h | 1
programs/mythfrontend/progfind.cpp | 84 -
programs/mythfrontend/proglist.cpp | 46
programs/mythfrontend/proglist.h | 2
programs/mythfrontend/programrecpriority.cpp | 24
programs/mythjobqueue/.gitignore | 1
programs/mythlcdserver/.gitignore | 1
programs/mythpreviewgen/.gitignore | 1
programs/mythshutdown/.gitignore | 1
programs/mythtranscode/.gitignore | 1
programs/mythtranscode/mpeg2fix.cpp | 2
programs/mythtranscode/mpeg2fix.h | 2
programs/mythtranscode/replex/.gitignore | 1
programs/mythtranscode/transcode.cpp | 9
programs/mythtv-setup/.gitignore | 1
programs/mythtvosd/.gitignore | 1
programs/mythwelcome/.gitignore | 1
programs/scripts/.gitignore | 1
programs/scripts/database/mythconverg_restore.pl | 8
programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py | 18
programs/scripts/internetcontent/nv_python_libs/common/common_api.py | 17
programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html | 39
programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml | 5
programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml | 2
programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl | 100 -
programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py | 18
programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py | 39
themes/.gitignore | 1
themes/DVR/util_menu.xml | 7
themes/MythCenter-wide/base.xml | 1
themes/MythCenter-wide/osd.xml | 16
themes/MythCenter-wide/schedule-ui.xml | 2
themes/MythCenter-wide/zoneminder-ui.xml | 12
themes/MythCenter/base.xml | 1
version.sh | 23
194 files changed, 3611 insertions(+), 2856 deletions(-)
--- NEW FILE mythtv-0.24-fixes.patch ---
diff -Naurp mythtv-0.24.orig/bindings/perl/.gitignore mythtv-0.24.fixes/bindings/perl/.gitignore
--- mythtv-0.24.orig/bindings/perl/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1,4 @@
+Makefile.perl
+Makefile.perl.*
+blib/
+pm_to_blib
diff -Naurp mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
# 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-24/mythtv/bindings/perl/IO/Socke... $
-# @date $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
-# @version $Revision: 20349 $
-# @author $Author: xris $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
# @copyright Silicon Mechanics
#
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm 2010-05-22 20:48:40.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV channel.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/C... $
-# @date $Date: 2010-05-22 17:48:40 -0700 (Sat, 22 May 2010) $
-# @version $Revision: 24799 $
-# @author $Author: mdean $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Program.pm mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Program.pm 2010-09-10 22:23:32.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV program.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/P... $
-# @date $Date: 2010-09-10 19:23:32 -0700 (Fri, 10 Sep 2010) $
-# @version $Revision: 26207 $
-# @author $Author: mdean $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
package MythTV::Program;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm 2010-09-03 15:55:56.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV recording.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/R... $
-# @date $Date: 2010-09-03 12:55:56 -0700 (Fri, 03 Sep 2010) $
-# @version $Revision: 26106 $
-# @author $Author: danielk $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
package MythTV::Recording;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV Storage Group.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/S... $
-# @date $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
-# @version $Revision: 20349 $
-# @author $Author: xris $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV.pm mythtv-0.24.fixes/bindings/perl/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/MythTV.pm 2010-09-29 13:08:29.000000000 -0400
+++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-02-28 22:42:43.000000000 -0500
@@ -1,10 +1,10 @@
#
# MythTV bindings for perl.
#
-# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV.pm $
-# @date $Date: 2010-09-29 10:08:29 -0700 (Wed, 29 Sep 2010) $
-# @version $Revision: 26574 $
-# @author $Author: wagnerrp $
+# @url $URL$
+# @date $Date$
+# @version $Revision$
+# @author $Author$
#
# Version
diff -Naurp mythtv-0.24.orig/bindings/python/.gitignore mythtv-0.24.fixes/bindings/python/.gitignore
--- mythtv-0.24.orig/bindings/python/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+build/
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/dataheap.py mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/dataheap.py 2010-11-02 23:15:16.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-02-28 22:42:43.000000000 -0500
@@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C
return vid
def _playOnFe(self, fe):
- return fe.send('play','filename myth://Videos@%s/%s' %
+ return fe.send('play','file myth://Videos@%s/%s' %
(self.host, self.filename))
class VideoGrabber( Grabber ):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/__init__.py mythtv-0.24.fixes/bindings/python/MythTV/__init__.py
--- mythtv-0.24.orig/bindings/python/MythTV/__init__.py 2010-09-09 01:11:01.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-02-28 22:42:43.000000000 -0500
@@ -53,8 +53,10 @@ from methodheap import *
from sys import version_info
if version_info >= (2, 6): # 2.6 or newer
exec(import26)
-else:
+elif version_info >= (2, 5):
exec(importall)
+else:
+ raise Exception("The MythTV Python bindings will only operate against Python 2.5 or later.")
__version__ = OWN_VERSION
static.mysqldb = MySQLdb.version_info
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/methodheap.py mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/methodheap.py 2010-09-23 00:01:58.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-02-28 22:42:43.000000000 -0500
@@ -625,9 +625,9 @@ class MythDB( DBCache ):
return ('recorded.%s=%%s' % key, datetime.duck(value), 0)
if key == 'olderthan':
- return ('recorded.starttime>%s', datetime.duck(value), 0)
- if key == 'newerthan':
return ('recorded.starttime<%s', datetime.duck(value), 0)
+ if key == 'newerthan':
+ return ('recorded.starttime>%s', datetime.duck(value), 0)
# recordedprogram matches
@@ -641,8 +641,9 @@ class MythDB( DBCache ):
return ('people.name', 'recordedcredits', 4, 1)
if key == 'livetv':
- if value is None:
+ if (value is None) or (value == False):
return ('recorded.recgroup!=%s', 'LiveTV', 0)
+ return ()
return None
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/mythproto.py mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py
--- mythtv-0.24.orig/bindings/python/MythTV/mythproto.py 2010-10-14 11:36:31.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py 2011-02-28 22:42:43.000000000 -0500
@@ -188,7 +188,7 @@ def ftopen(file, mode, forceremote=False
db = DBCache(db)
log = MythLog('Python File Transfer', db=db)
reuri = re.compile(\
- 'myth://((?P<group>.*)@)?(?P<host>[a-zA-Z0-9_\.]*)(:[0-9]*)?/(?P<file>.*)')
+ 'myth://((?P<group>.*)@)?(?P<host>[a-zA-Z0-9_\-\.]*)(:[0-9]*)?/(?P<file>.*)')
reip = re.compile('(?:\d{1,3}\.){3}\d{1,3}')
if mode not in ('r','w'):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/static.py mythtv-0.24.fixes/bindings/python/MythTV/static.py
--- mythtv-0.24.orig/bindings/python/MythTV/static.py 2010-10-08 13:55:04.000000000 -0400
+++ mythtv-0.24.fixes/bindings/python/MythTV/static.py 2011-02-28 22:42:43.000000000 -0500
@@ -4,7 +4,7 @@
Contains any static and global variables for MythTV Python Bindings
"""
-OWN_VERSION = (0,24,0,0)
+OWN_VERSION = (0,24,0,2)
SCHEMA_VERSION = 1264
MVSCHEMA_VERSION = 1038
NVSCHEMA_VERSION = 1007
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/system.py mythtv-0.24.fixes/bindings/python/MythTV/system.py
[...11679 lines suppressed...]
+
+ def tributecaDebug(self, context, *arg):
+ ''' Routine only used for debugging. Prints out the node
+ passed as an argument. Not to be used in production.
+ Call example: mnvXpath:tributecaDebug(//a)
+ '''
+ testpath = etree.XPath(".//a", namespaces=common.namespaces)
+ print arg
+ count = 0
+ for x in arg:
+ sys.stdout.write(u'\nElement Count (%s):\n' % count)
+# for y in testpath(x):
+# sys.stdout.write(etree.tostring(y, encoding='UTF-8', pretty_print=True))
+ print "testpath(%s)" % testpath(x)
+ count+=1
+ print
+# sys.stdout.write(etree.tostring(arg[0], encoding='UTF-8', pretty_print=True))
+ return u"========tributecaDebug Called========="
+ # end tributecaDebug()
+
######################################################################################################
#
# End of XPath extension functions
diff -Naurp mythtv-0.24.orig/themes/DVR/util_menu.xml mythtv-0.24.fixes/themes/DVR/util_menu.xml
--- mythtv-0.24.orig/themes/DVR/util_menu.xml 2010-08-13 15:45:54.000000000 -0400
+++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-02-28 22:42:43.000000000 -0500
@@ -8,6 +8,13 @@
</button>
<button>
+ <type>NET_VIDEO</type>
+ <text>Internet Video</text>
+ <action>MENU netvisionmenu.xml</action>
+ <depends>mythnetvision</depends>
+ </button>
+
+ <button>
<type>MUSIC</type>
<text>Music</text>
<action>PLUGIN mythmusic</action>
diff -Naurp mythtv-0.24.orig/themes/.gitignore mythtv-0.24.fixes/themes/.gitignore
--- mythtv-0.24.orig/themes/.gitignore 1969-12-31 19:00:00.000000000 -0500
+++ mythtv-0.24.fixes/themes/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+themes
diff -Naurp mythtv-0.24.orig/themes/MythCenter/base.xml mythtv-0.24.fixes/themes/MythCenter/base.xml
--- mythtv-0.24.orig/themes/MythCenter/base.xml 2010-09-22 08:39:41.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-02-28 22:42:43.000000000 -0500
@@ -766,6 +766,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,125</area>
<align>allcenter</align>
+ <multiline>yes</multiline>
</textarea>
</window>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/base.xml mythtv-0.24.fixes/themes/MythCenter-wide/base.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/base.xml 2010-10-06 10:17:51.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-02-28 22:42:43.000000000 -0500
@@ -881,6 +881,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,126</area>
<align>allcenter</align>
+ <multiline>yes</multiline>
</textarea>
</window>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/osd.xml mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/osd.xml 2010-11-09 21:44:09.000000000 -0500
+++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-02-28 22:42:43.000000000 -0500
@@ -429,6 +429,22 @@
<fill color="#FFFFFF" alpha="255" />
<alphapulse min="180" max="255" change="4" />
</shape>
+ <shape name="cuttoright">
+ <area>0,4,3,30</area>
+ <fill color="#FF0000" alpha="255" />
+ </shape>
+ <shape name="cuttoleft">
+ <area>0,4,3,30</area>
+ <fill color="#FF0000" alpha="255" />
+ </shape>
+ <shape name="keeptoright">
+ <area>0,4,3,30</area>
+ <fill color="#00FF00" alpha="255" />
+ </shape>
+ <shape name="keeptoleft">
+ <area>0,4,3,30</area>
+ <fill color="#00FF00" alpha="255" />
+ </shape>
</editbar>
</window>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml 2010-10-06 10:17:51.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-02-28 22:42:43.000000000 -0500
@@ -532,7 +532,7 @@
<area>240,2,220,24</area>
</textarea>
<textarea name="title" from="shortstarttimedate">
- <area>475,2,675,24</area>
+ <area>480,2,675,24</area>
</textarea>
<textarea name="card" from="shortstarttimedate">
<area>1165,2,30,24</area>
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml 2010-10-06 11:37:20.000000000 -0400
+++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-02-28 22:42:43.000000000 -0500
@@ -652,23 +652,23 @@
<window name="zmplayer">
- <font name="label" from="basesmall">
+ <fontdef name="label" from="basesmall">
<color>#ffff00</color>
<size>16</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="data" from="basesmall">
+ <fontdef name="data" from="basesmall">
<color>#ffffff</color>
<size>14</size>
<weight>bold</weight>
- </font>
+ </fontdef>
- <font name="buttons" from="basesmall">
+ <fontdef name="buttons" from="basesmall">
<color>#ffffff</color>
<size>12</size>
<weight>bold</weight>
- </font>
+ </fontdef>
<textarea name="pagetitle" from="basetextarea">
<area>30,10,570,40</area>
diff -Naurp mythtv-0.24.orig/VERSION mythtv-0.24.fixes/VERSION
--- mythtv-0.24.orig/VERSION 2010-11-10 12:31:31.000000000 -0500
+++ mythtv-0.24.fixes/VERSION 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-SOURCE_VERSION="0.24"
diff -Naurp mythtv-0.24.orig/version.sh mythtv-0.24.fixes/version.sh
--- mythtv-0.24.orig/version.sh 2010-08-29 18:22:54.000000000 -0400
+++ mythtv-0.24.fixes/version.sh 2011-02-28 22:42:43.000000000 -0500
@@ -1,12 +1,11 @@
#!/bin/sh
#
# small shell script to generate version.cpp
-# it expects two parameters
+# it expects one parameter
# first parameter is the root of the source directory
-# second parameter is the svn base folder (trunk, branches/release-0-21-fixes)
if test $# -ne 1; then
- echo "Usage: version.sh SVN_TREE_DIR"
+ echo "Usage: version.sh GIT_TREE_DIR"
exit 1
fi
@@ -18,21 +17,21 @@ else
exit 0
fi
-SVNTREEDIR=$1
-SVNREPOPATH="exported"
+GITTREEDIR=$1
+GITREPOPATH="exported"
-SOURCE_VERSION=$(svnversion ${SVNTREEDIR} 2>/dev/null || echo Unknown)
+cd ${GITTREEDIR}
+
+SOURCE_VERSION=$(git describe --dirty || git describe || echo Unknown)
case "${SOURCE_VERSION}" in
exported|Unknown)
- if test -e $SVNTREEDIR/VERSION ; then
- . $SVNTREEDIR/VERSION
+ if test -e $GITTREEDIR/VERSION ; then
+ . $GITTREEDIR/VERSION
fi
;;
*)
- SVNREPOPATH=$(echo "$$URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/version.sh $$" | sed -e 's,.*/svn/,,' \
- -e 's,/mythtv/version\.sh.*,,' \
- -e 's,/version\.sh.*,,')
+ BRANCH=$(git branch --no-color | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/')
;;
esac
@@ -41,7 +40,7 @@ cat > .vers.new <<EOF
#include "mythversion.h"
const MPUBLIC char *myth_source_version = "${SOURCE_VERSION}";
-const MPUBLIC char *myth_source_path = "${SVNREPOPATH}";
+const MPUBLIC char *myth_source_path = "${BRANCH}";
const MPUBLIC char *myth_binary_version = MYTH_BINARY_VERSION;
EOF
mythweb-0.24-fixes.patch:
mythplugins-0.24.fixes/mythweb/.gitignore | 3
mythplugins-0.24.fixes/mythweb/classes/Database.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/Query.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysql.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysqlicompat.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/mysql.php | 8
mythplugins-0.24.fixes/mythweb/classes/Database/mysqlicompat.php | 8
mythplugins-0.24.fixes/mythweb/classes/JSON.php | 8
mythplugins-0.24.fixes/mythweb/classes/Modules.php | 8
mythplugins-0.24.fixes/mythweb/classes/MythBackend.php | 8
mythplugins-0.24.fixes/mythweb/classes/MythBase.php | 8
mythplugins-0.24.fixes/mythweb/classes/MythFrontend.php | 8
mythplugins-0.24.fixes/mythweb/classes/Services/JSON.php | 2
mythplugins-0.24.fixes/mythweb/classes/Translate.php | 8
mythplugins-0.24.fixes/mythweb/includes/class_autoload.php | 8
mythplugins-0.24.fixes/mythweb/includes/cleanup.php | 8
mythplugins-0.24.fixes/mythweb/includes/config.php | 8
mythplugins-0.24.fixes/mythweb/includes/css.php | 8
mythplugins-0.24.fixes/mythweb/includes/data_dir.php | 8
mythplugins-0.24.fixes/mythweb/includes/database.php | 8
mythplugins-0.24.fixes/mythweb/includes/db_update.php | 14
mythplugins-0.24.fixes/mythweb/includes/defines.php | 8
mythplugins-0.24.fixes/mythweb/includes/errordisplay.php | 8
mythplugins-0.24.fixes/mythweb/includes/errors.php | 8
mythplugins-0.24.fixes/mythweb/includes/init.php | 8
mythplugins-0.24.fixes/mythweb/includes/jobqueue.php | 8
mythplugins-0.24.fixes/mythweb/includes/lockdown.php | 8
mythplugins-0.24.fixes/mythweb/includes/mobile.php | 8
mythplugins-0.24.fixes/mythweb/includes/mouseovers.php | 8
mythplugins-0.24.fixes/mythweb/includes/php_version_check.php | 8
mythplugins-0.24.fixes/mythweb/includes/session.php | 8
mythplugins-0.24.fixes/mythweb/includes/skin.php | 12
mythplugins-0.24.fixes/mythweb/includes/sorting.php | 8
mythplugins-0.24.fixes/mythweb/includes/translate.php | 8
mythplugins-0.24.fixes/mythweb/includes/utils.php | 13
mythplugins-0.24.fixes/mythweb/js/pngbehavior.htc | 6
mythplugins-0.24.fixes/mythweb/js/table_sort.js | 8
mythplugins-0.24.fixes/mythweb/js/utils.js | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/lang/Finnish.lang | 288 ++++++----
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/db_access_denied.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/db_vars_error.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/error.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/fatal.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/lockdown.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/no_modules.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/site_down.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/_errors/unknown_module.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/default/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/default/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/iPod/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/iPod/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/iPod/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/lite/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/lite/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/tmpl/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/wap/footer.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/wap/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/_shared/tmpl/wap/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/default/backend_log.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/lite/backend_log.php | 8
mythplugins-0.24.fixes/mythweb/modules/backend_log/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/coverart/handler.pl | 8
mythplugins-0.24.fixes/mythweb/modules/coverart/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/database/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/database/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/database/tmpl/default/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/mp3act_functions.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/stream.php | 8
mythplugins-0.24.fixes/mythweb/modules/music/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/set_keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/default/set_keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/default/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/lite/set_keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythtv/tmpl/lite/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/set_defaults.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/set_flvplayer.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/default/set_defaults.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/default/set_flvplayer.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/default/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/lite/set_defaults.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/lite/set_flvplayer.php | 8
mythplugins-0.24.fixes/mythweb/modules/mythweb/tmpl/lite/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/do.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/play_program_on_frontend.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/screenshot.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/default/keys.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/default/remote.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/iPod/play_program_on_frontend.php | 8
mythplugins-0.24.fixes/mythweb/modules/remote/tmpl/iPod/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/default/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/lite/header.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/lite/mythweb.php | 8
mythplugins-0.24.fixes/mythweb/modules/settings/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/default/stats.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/lite/stats.php | 8
mythplugins-0.24.fixes/mythweb/modules/stats/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/default/status.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/lite/status.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/status/tmpl/wap/status.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/handler.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/set_protocol.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_asx.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_flv.pl | 10
mythplugins-0.24.fixes/mythweb/modules/stream/stream_flvp.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_mp4.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/stream_raw.pl | 8
mythplugins-0.24.fixes/mythweb/modules/stream/tmpl/default/set_protocol.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/tmpl/lite/set_protocol.php | 8
mythplugins-0.24.fixes/mythweb/modules/stream/tv.pl | 8
mythplugins-0.24.fixes/mythweb/modules/tv/canned_searches.conf.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Program.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Recording.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/classes/Schedule.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/detail.php | 15
mythplugins-0.24.fixes/mythweb/modules/tv/get_pixmap.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/includes/programs.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/includes/recording_schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/includes/schedule_utils.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list_recording_groups.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list_shows_in_title_and_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/list_titles_in_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/opensearch.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/schedules_custom.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/schedules_manual.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/searches.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_channels.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_playgroup.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_screens.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/submenu.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/list_data.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/schedules_custom.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/schedules_manual.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/searches.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_channels.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_playgroup.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_screens.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/list_recording_groups.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/list_shows_in_title_and_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/list_titles_in_group.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/submenu.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/iPod/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/ical/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/schedules.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/schedules_custom.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/schedules_manual.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/searches.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/set_channels.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/set_session.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/lite/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/rss/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/channel.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/detail.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/list.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/recorded.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/search.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/tmpl/wap/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/tv/upcoming.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/edit.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/imdb.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/scan.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/tmpl/default/set_settings.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/tmpl/default/video.php | 8
mythplugins-0.24.fixes/mythweb/modules/video/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/classes/WeatherScreen.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/handler.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/init.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/set_screen.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/set_screen.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.18h.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.3d.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.6d.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.am.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.cc.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/weather.sm.php | 8
mythplugins-0.24.fixes/mythweb/modules/weather/tmpl/default/welcome.php | 8
mythplugins-0.24.fixes/mythweb/modules/welcome.php | 8
mythplugins-0.24.fixes/mythweb/mythweb.php | 8
mythplugins-0.24.fixes/mythweb/mythweb.pl | 8
mythplugins-0.24.fixes/mythweb/skins/iPod-default/AppPanel.css | 35 -
mythplugins-0.24.fixes/mythweb/skins/iPod-default/ListPanel.css | 157 -----
mythplugins-0.24.fixes/mythweb/skins/iPod-default/header.css | 91 ---
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/cal.png | 16
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/clock.png | 19
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/logs.png | 20
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/music.png | 21
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/photos.png | 22
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/remote.png | 26
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/status.png | 24
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/tv.png | 18
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/video.png | 26
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/Icons/weather.png | 25
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/back_button.png | 23
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/back_button_clicked.png | 11
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/button_darkgray.png | 5
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/button_darkgray_pressed.png | 10
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/chevron.png | 5
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/chevron_touched.png | 3
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/favicon.ico | 3
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/header_middle.png | 5
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/item_background_touched.png | 4
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/off.png | 13
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/on.png | 14
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/pinstripes.png | 4
mythplugins-0.24.fixes/mythweb/skins/iPod-default/img/spinner.gif | 32 -
mythplugins-0.24.fixes/mythweb/skins/iPod-default/style.css | 19
mythweb/skins/iPod-default/img/Search Background.tiff | 2
263 files changed, 1138 insertions(+), 1686 deletions(-)
--- NEW FILE mythweb-0.24-fixes.patch ---
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/mysqlicompat.php mythplugins-0.24.fixes/mythweb/classes/Database/mysqlicompat.php
--- mythplugins-0.24.orig/mythweb/classes/Database/mysqlicompat.php 2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.24.fixes/mythweb/classes/Database/mysqlicompat.php 2011-01-22 18:44:18.000000000 -0500
@@ -20,10 +20,10 @@
* 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-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2008-11-08 18:42:14 -0800 (Sat, 08 Nov 2008) $
- * @version $Revision: 19023 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/mysql.php mythplugins-0.24.fixes/mythweb/classes/Database/mysql.php
--- mythplugins-0.24.orig/mythweb/classes/Database/mysql.php 2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.24.fixes/mythweb/classes/Database/mysql.php 2011-01-22 18:44:18.000000000 -0500
@@ -13,10 +13,10 @@
*
* MySQL Database connection class.
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2008-11-08 18:42:14 -0800 (Sat, 08 Nov 2008) $
- * @version $Revision: 19023 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/Query/mysqlicompat.php mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysqlicompat.php
--- mythplugins-0.24.orig/mythweb/classes/Database/Query/mysqlicompat.php 2010-06-09 23:05:34.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysqlicompat.php 2011-01-22 18:44:18.000000000 -0500
@@ -15,10 +15,10 @@
* 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-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2010-06-09 20:05:34 -0700 (Wed, 09 Jun 2010) $
- * @version $Revision: 25070 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/Query/mysql.php mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysql.php
--- mythplugins-0.24.orig/mythweb/classes/Database/Query/mysql.php 2010-06-09 23:05:34.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database/Query/mysql.php 2011-01-22 18:44:18.000000000 -0500
@@ -13,10 +13,10 @@
*
* Query handler for MySQL
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2010-06-09 20:05:34 -0700 (Wed, 09 Jun 2010) $
- * @version $Revision: 25070 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database/Query.php mythplugins-0.24.fixes/mythweb/classes/Database/Query.php
--- mythplugins-0.24.orig/mythweb/classes/Database/Query.php 2009-10-09 01:29:02.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database/Query.php 2011-01-22 18:44:18.000000000 -0500
@@ -14,10 +14,10 @@
* 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-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2009-10-08 22:29:02 -0700 (Thu, 08 Oct 2009) $
- * @version $Revision: 22328 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Database.php mythplugins-0.24.fixes/mythweb/classes/Database.php
--- mythplugins-0.24.orig/mythweb/classes/Database.php 2008-06-01 19:52:54.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Database.php 2011-01-22 18:44:18.000000000 -0500
@@ -24,10 +24,10 @@
* define _errstr() and _errno() methods to return the appropriate database
* engine error string/number.
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/D... $
- * @date $Date: 2008-06-01 16:52:54 -0700 (Sun, 01 Jun 2008) $
- * @version $Revision: 17434 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @copyright Silicon Mechanics
* @license GPL
*
diff -Naurp mythplugins-0.24.orig/mythweb/classes/JSON.php mythplugins-0.24.fixes/mythweb/classes/JSON.php
--- mythplugins-0.24.orig/mythweb/classes/JSON.php 2008-02-22 16:35:09.000000000 -0500
+++ mythplugins-0.24.fixes/mythweb/classes/JSON.php 2011-01-22 18:44:18.000000000 -0500
@@ -3,10 +3,10 @@
* 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-24/mythplugins/mythweb/classes/J... $
- * @date $Date: 2008-02-22 13:35:09 -0800 (Fri, 22 Feb 2008) $
- * @version $Revision: 16202 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythWeb
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Modules.php mythplugins-0.24.fixes/mythweb/classes/Modules.php
--- mythplugins-0.24.orig/mythweb/classes/Modules.php 2010-09-12 04:52:48.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/Modules.php 2011-01-22 18:44:18.000000000 -0500
@@ -2,10 +2,10 @@
/**
* Handling Modules
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-09-12 01:52:48 -0700 (Sun, 12 Sep 2010) $
- * @version $Revision: 26245 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythTV
diff -Naurp mythplugins-0.24.orig/mythweb/classes/MythBackend.php mythplugins-0.24.fixes/mythweb/classes/MythBackend.php
--- mythplugins-0.24.orig/mythweb/classes/MythBackend.php 2010-10-06 23:35:10.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/MythBackend.php 2011-01-22 18:44:18.000000000 -0500
@@ -1,10 +1,10 @@
<?php
/**
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-10-06 20:35:10 -0700 (Wed, 06 Oct 2010) $
- * @version $Revision: 26688 $
- * @author $Author: kormoc $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythTV
diff -Naurp mythplugins-0.24.orig/mythweb/classes/MythBase.php mythplugins-0.24.fixes/mythweb/classes/MythBase.php
--- mythplugins-0.24.orig/mythweb/classes/MythBase.php 2010-08-28 16:16:22.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/MythBase.php 2011-01-22 18:44:18.000000000 -0500
@@ -2,10 +2,10 @@
/**
* This is the base object to handle all the common features for all myth classes
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-08-28 13:16:22 -0700 (Sat, 28 Aug 2010) $
- * @version $Revision: 25914 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythWeb
diff -Naurp mythplugins-0.24.orig/mythweb/classes/MythFrontend.php mythplugins-0.24.fixes/mythweb/classes/MythFrontend.php
--- mythplugins-0.24.orig/mythweb/classes/MythFrontend.php 2010-09-12 02:55:38.000000000 -0400
+++ mythplugins-0.24.fixes/mythweb/classes/MythFrontend.php 2011-01-22 18:44:18.000000000 -0500
@@ -2,10 +2,10 @@
/**
* Connection routines for the new socket interface to mythfrontend.
*
- * @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythplugins/mythweb/classes/M... $
- * @date $Date: 2010-09-11 23:55:38 -0700 (Sat, 11 Sep 2010) $
- * @version $Revision: 26244 $
- * @author $Author: xris $
+ * @url $URL$
+ * @date $Date$
+ * @version $Revision$
+ * @author $Author$
* @license GPL
*
* @package MythTV
diff -Naurp mythplugins-0.24.orig/mythweb/classes/Services/JSON.php mythplugins-0.24.fixes/mythweb/classes/Services/JSON.php
[...5566 lines suppressed...]
-1- Ea5l)+!
13 years, 8 months
- 1
- 0
rpms/mythtv/F-14 mythplugins-0.24-fixes.patch, 1.1, 1.2 mythtv-0.24-fixes.patch, 1.2, 1.3 mythtv.spec, 1.86, 1.87
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20547
Modified Files:
mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch
mythtv.spec
Log Message:
* Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6
- Update to 0.24 fixes, git revision 4af46b1f5d
- Fix mythtv version output to properly show git revision
mythplugins-0.24-fixes.patch:
.gitignore | 6
mytharchive/i18n/.gitignore | 1
mytharchive/mytharchive/recordingselector.cpp | 2
mytharchive/mytharchivehelper/.gitignore | 1
mytharchive/mytharchivehelper/pxsup2dast.c | 2
mytharchive/mythburn/scripts/mythburn.py | 13 -
mytharchive/theme/default-wide/mytharchive-ui.xml | 12
mytharchive/theme/default-wide/mythburn-ui.xml | 7
mytharchive/theme/default/mytharchive-ui.xml | 12
mytharchive/theme/default/mythburn-ui.xml | 7
mythbrowser/i18n/.gitignore | 1
mythbrowser/theme/default-wide/browser-ui.xml | 15 -
mythbrowser/theme/default/browser-ui.xml | 15 -
mythgallery/dcrawplugin/.gitignore | 1
mythgallery/i18n/.gitignore | 1
mythgallery/mythgallery/.gitignore | 1
mythgallery/mythgallery/gallerysettings.cpp | 10
mythgallery/mythgallery/galleryutil.cpp | 4
mythgallery/mythgallery/main.cpp | 3
mythgame/i18n/.gitignore | 1
mythgame/mythgame/.gitignore | 1
mythmusic/i18n/.gitignore | 1
mythmusic/mythmusic/.gitignore | 1
mythmusic/mythmusic/cdrip.cpp | 2
mythmusic/mythmusic/filescanner.cpp | 40 +--
mythmusic/mythmusic/musicplayer.cpp | 5
mythnetvision/i18n/.gitignore | 1
mythnetvision/mythfillnetvision/.gitignore | 1
mythnews/i18n/.gitignore | 1
mythnews/mythnews/main.cpp | 2
mythvideo/i18n/.gitignore | 1
mythvideo/mtd/.gitignore | 1
mythvideo/mythvideo/.gitignore | 1
mythvideo/mythvideo/scripts/jamu.py | 14 -
mythweather/i18n/.gitignore | 1
mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 40 +--
mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl | 127 ++++++++++
mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 4
mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 4
mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl | 1
mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 1
mythzoneminder/i18n/.gitignore | 1
mythzoneminder/mythzmserver/.gitignore | 1
mythzoneminder/mythzoneminder/zmliveplayer.cpp | 4
mythzoneminder/theme/default-wide/zoneminder-ui.xml | 12
45 files changed, 278 insertions(+), 105 deletions(-)
Index: mythplugins-0.24-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythplugins-0.24-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythplugins-0.24-fixes.patch 23 Jan 2011 03:48:05 -0000 1.1
+++ mythplugins-0.24-fixes.patch 3 Mar 2011 02:34:21 -0000 1.2
@@ -1,6 +1,6 @@
diff -Naurp mythplugins-0.24.orig/.gitignore mythplugins-0.24.fixes/.gitignore
--- mythplugins-0.24.orig/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1,6 @@
+Makefile
+themenop
@@ -10,12 +10,12 @@
+mythconfig.mak
diff -Naurp mythplugins-0.24.orig/mytharchive/i18n/.gitignore mythplugins-0.24.fixes/mytharchive/i18n/.gitignore
--- mythplugins-0.24.orig/mytharchive/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mytharchive/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp
--- mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp 2010-10-06 06:38:18.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -116,7 +116,7 @@ bool RecordingSelector::Create(void)
void RecordingSelector::Init(void)
@@ -27,12 +27,12 @@
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mytharchivehelper
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c 2010-08-28 16:16:22.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c 2011-02-28 22:42:02.000000000 -0500
@@ -1,6 +1,6 @@
/*
#
@@ -43,7 +43,7 @@
# too ät iki piste fi
diff -Naurp mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py
--- mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py 2010-10-06 09:07:39.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py 2011-02-28 22:42:02.000000000 -0500
@@ -38,7 +38,7 @@
#******************************************************************************
@@ -99,7 +99,7 @@
command += mediafile
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml 2010-09-22 08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -146,7 +146,7 @@ Common MythArchive window definitions
</statetype>
</state>
@@ -156,7 +156,7 @@
<gradient start="#52CA38" end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml 2010-09-22 08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
@@ -173,7 +173,7 @@
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml 2010-09-22 08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -147,7 +147,7 @@ Common MythArchive window definitions
</statetype>
</state>
@@ -230,7 +230,7 @@
<gradient start="#52CA38" end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml 2010-09-22 08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml 2011-02-28 22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
@@ -247,22 +247,117 @@
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mythbrowser/i18n/.gitignore mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore
--- mythplugins-0.24.orig/mythbrowser/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml
+--- mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml 2010-10-09 15:44:27.000000000 -0400
++++ mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml 2011-02-28 22:42:02.000000000 -0500
+@@ -53,9 +53,8 @@
+ <statetype name="buttonitem">
+ <area>0,0,180,40</area>
+ <state name="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector.png</filename>
+- </imagetype>
++ <area>0,0,180,40</area>
++ <shape name="background" from="basewidgetshape" />
+ <textarea name="buttontext" from="basetextarea">
+ <area>0,0,180,40</area>
+ <font>basesmall</font>
+@@ -63,14 +62,12 @@
+ </textarea>
+ </state>
+ <state name="selectedactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_selected.png</filename>
+- </imagetype>
++ <shape name="background" from="baseselectedwidgetshape" />
+ </state>
+ <state name="selectedinactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_inactive.png</filename>
+- </imagetype>
++ <textarea name="buttontext">
++ <font>basesmallgrey</font>
++ </textarea>
+ </state>
+ </statetype>
+ <statetype name="downscrollarrow">
+diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml
+--- mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml 2010-10-09 15:44:27.000000000 -0400
++++ mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml 2011-02-28 22:42:02.000000000 -0500
+@@ -61,9 +61,8 @@
+ <statetype name="buttonitem">
+ <area>0,0,180,40</area>
+ <state name="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector.png</filename>
+- </imagetype>
++ <area>0,0,180,40</area>
++ <shape name="background" from="basewidgetshape" />
+ <textarea name="buttontext" from="basetextarea">
+ <area>0,0,180,40</area>
+ <font>basesmall</font>
+@@ -73,14 +72,12 @@
+ </textarea>
+ </state>
+ <state name="selectedactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_selected.png</filename>
+- </imagetype>
++ <shape name="background" from="baseselectedwidgetshape" />
+ </state>
+ <state name="selectedinactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_inactive.png</filename>
+- </imagetype>
++ <textarea name="buttontext">
++ <font>basesmallgrey</font>
++ </textarea>
+ </state>
+ </statetype>
+ <statetype name="downscrollarrow">
diff -Naurp mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore
--- mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythgallery/i18n/.gitignore mythplugins-0.24.fixes/mythgallery/i18n/.gitignore
--- mythplugins-0.24.orig/mythgallery/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgallery/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgallery/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp
+--- mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp 2010-08-28 16:16:22.000000000 -0400
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp 2011-02-28 22:42:02.000000000 -0500
+@@ -78,6 +78,15 @@ static HostLineEdit *MythGalleryImportDi
+ return gc;
+ };
+
++static HostCheckBox *MythGalleryAutoLoad()
++{
++ HostCheckBox *gc = new HostCheckBox("GalleryAutoLoad");
++ gc->setLabel(QObject::tr("Automatically load MythGallery to display pictures"));
++ gc->setValue(false);
++ gc->setHelpText(QObject::tr("When a new CD-Rom or removable storage device containing pictures is detected then load MythGallery to display the content."));
++ return gc;
++}
++
+ #ifdef USING_OPENGL
+
+ static HostCheckBox *SlideshowUseOpenGL()
+@@ -217,6 +226,7 @@ GallerySettings::GallerySettings()
+ general->addChild(MythGalleryThumbnailLocation());
+ general->addChild(MythGallerySortOrder());
+ general->addChild(MythGalleryImportDirs());
++ general->addChild(MythGalleryAutoLoad());
+ general->addChild(MythGalleryMoviePlayerCmd());
+ addChild(general);
+
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp 2010-08-28 16:16:22.000000000 -0400
-+++ mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -98,7 +98,7 @@ bool GalleryUtil::IsImage(const QString
QStringList::const_iterator it = filt.begin();
for (; it != filt.end(); ++it)
@@ -283,71 +378,281 @@
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore
--- mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
+diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp
+--- mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp 2010-10-18 09:02:43.000000000 -0400
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp 2011-02-28 22:42:02.000000000 -0500
+@@ -59,6 +59,9 @@ static void runGallery(void)
+
+ static void handleMedia(MythMediaDevice *dev)
+ {
++ if (! gCoreContext->GetNumSetting("GalleryAutoLoad", 0))
++ return;
++
+ if (dev && dev->isUsable())
+ run(dev);
+ }
diff -Naurp mythplugins-0.24.orig/mythgame/i18n/.gitignore mythplugins-0.24.fixes/mythgame/i18n/.gitignore
--- mythplugins-0.24.orig/mythgame/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgame/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgame/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythgame/mythgame/.gitignore mythplugins-0.24.fixes/mythgame/mythgame/.gitignore
--- mythplugins-0.24.orig/mythgame/mythgame/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgame/mythgame/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgame/mythgame/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+gameui.moc
diff -Naurp mythplugins-0.24.orig/mythmusic/i18n/.gitignore mythplugins-0.24.fixes/mythmusic/i18n/.gitignore
--- mythplugins-0.24.orig/mythmusic/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythmusic/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythmusic/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp
+--- mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp 2010-09-12 18:53:44.000000000 -0400
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp 2011-02-28 22:42:02.000000000 -0500
+@@ -945,8 +945,6 @@ QString Ripper::filenameFromMetadata(Met
+ VERBOSE(VB_GENERAL, QString("Invalid file storage definition."));
+ }
+
+- filename = QString(filename.toLocal8Bit().constData());
+-
+ QStringList directoryList = filename.split("/");
+ for (int i = 0; i < (directoryList.size() - 1); i++)
+ {
+diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp
+--- mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp 2010-05-13 00:18:15.000000000 -0400
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp 2011-02-28 22:42:02.000000000 -0500
+@@ -22,7 +22,7 @@ FileScanner::FileScanner ()
+ MSqlQuery query(MSqlQuery::InitCon());
+
+ // Cache the directory ids from the database
+- query.prepare("SELECT directory_id, LOWER(path) FROM music_directories");
++ query.prepare("SELECT directory_id, path FROM music_directories");
+ if (query.exec())
+ {
+ while(query.next())
+@@ -109,12 +109,12 @@ void FileScanner::BuildFileList(QString
+ QString dir(filename);
+ dir.remove(0, m_startdir.length());
+
+- newparentid = m_directoryid[QString(dir.toUtf8()).toLower()];
++ newparentid = m_directoryid[dir];
+
+ if (newparentid == 0)
+ {
+ int id = GetDirectoryId(dir, parentid);
+- m_directoryid[QString(dir.toUtf8()).toLower()] = id;
++ m_directoryid[dir] = id;
+
+ if (id > 0)
+ {
+@@ -252,8 +252,7 @@ void FileScanner::AddFileToDB(const QStr
+ query.prepare("INSERT INTO music_albumart SET filename = :FILE, "
+ "directory_id = :DIRID, imagetype = :TYPE;");
+ query.bindValue(":FILE", name);
+- query.bindValue(":DIRID", m_directoryid[
+- QString(directory.toUtf8()).toLower()]);
++ query.bindValue(":DIRID", m_directoryid[directory]);
+ query.bindValue(":TYPE", AlbumArtImages::guessImageType(name));
+
+ if (!query.exec() || query.numRowsAffected() <= 0)
+@@ -274,24 +273,24 @@ void FileScanner::AddFileToDB(const QStr
+ QString album_cache_string;
+
+ // Set values from cache
+- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
++ int did = m_directoryid[directory];
+ if (did > 0)
+ data->setDirectoryId(did);
+
+- int aid = m_artistid[QString(data->Artist().toUtf8()).toLower()];
++ int aid = m_artistid[data->Artist().toLower()];
+ if (aid > 0)
+ {
+ data->setArtistId(aid);
+
+ // The album cache depends on the artist id
+ album_cache_string = data->getArtistId() + "#"
+- + QString(data->Album().toUtf8()).toLower();
++ + data->Album().toLower();
+
+ if (m_albumid[album_cache_string] > 0)
+ data->setAlbumId(m_albumid[album_cache_string]);
+ }
+
+- int gid = m_genreid[QString(data->Genre().toUtf8()).toLower()];
++ int gid = m_genreid[data->Genre().toLower()];
+ if (gid > 0)
+ data->setGenreId(gid);
+
+@@ -299,14 +298,14 @@ void FileScanner::AddFileToDB(const QStr
+ data->dumpToDatabase();
+
+ // Update the cache
+- m_artistid[QString(data->Artist().toUtf8()).toLower()] =
++ m_artistid[data->Artist().toLower()] =
+ data->getArtistId();
+
+- m_genreid[QString(data->Genre().toUtf8()).toLower()] =
++ m_genreid[data->Genre().toLower()] =
+ data->getGenreId();
+
+ album_cache_string = data->getArtistId() + "#"
+- + QString(data->Album().toUtf8()).toLower();
++ + data->Album().toLower();
+ m_albumid[album_cache_string] = data->getAlbumId();
+ delete data;
+ }
+@@ -445,8 +444,7 @@ void FileScanner::RemoveFileFromDB (cons
+ query.prepare("DELETE FROM music_albumart WHERE filename= :FILE AND "
+ "directory_id= :DIRID;");
+ query.bindValue(":FILE", sqlfilename);
+- query.bindValue(":DIRID", m_directoryid[
+- QString(directory.toUtf8()).toLower()]);
++ query.bindValue(":DIRID", m_directoryid[directory]);
+
+ if (!query.exec() || query.numRowsAffected() <= 0)
+ {
+@@ -491,24 +489,24 @@ void FileScanner::UpdateFileInDB(const Q
+ QString album_cache_string;
+
+ // Set values from cache
+- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
++ int did = m_directoryid[directory];
+ if (did > 0)
+ disk_meta->setDirectoryId(did);
+
+- int aid = m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()];
++ int aid = m_artistid[disk_meta->Artist().toLower()];
+ if (aid > 0)
+ {
+ disk_meta->setArtistId(aid);
+
+ // The album cache depends on the artist id
+ album_cache_string = disk_meta->getArtistId() + "#" +
+- QString(disk_meta->Album().toUtf8()).toLower();
++ disk_meta->Album().toLower();
+
+ if (m_albumid[album_cache_string] > 0)
+ disk_meta->setAlbumId(m_albumid[album_cache_string]);
+ }
+
+- int gid = m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()];
++ int gid = m_genreid[disk_meta->Genre().toLower()];
+ if (gid > 0)
+ disk_meta->setGenreId(gid);
+
+@@ -516,12 +514,12 @@ void FileScanner::UpdateFileInDB(const Q
+ disk_meta->dumpToDatabase();
+
+ // Update the cache
+- m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()]
++ m_artistid[disk_meta->Artist().toLower()]
+ = disk_meta->getArtistId();
+- m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()]
++ m_genreid[disk_meta->Genre().toLower()]
+ = disk_meta->getGenreId();
+ album_cache_string = disk_meta->getArtistId() + "#" +
+- QString(disk_meta->Album().toUtf8()).toLower();
++ disk_meta->Album().toLower();
+ m_albumid[album_cache_string] = disk_meta->getAlbumId();
+ }
+
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore
--- mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
+diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp
+--- mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp 2010-10-10 17:59:02.000000000 -0400
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp 2011-02-28 22:42:02.000000000 -0500
+@@ -993,8 +993,9 @@ void MusicPlayer::decoderHandlerReady(vo
+ VERBOSE(VB_PLAYBACK, QString ("decoder handler is ready, decoding %1").
+ arg(getDecoder()->getFilename()));
+
+- if (getDecoder()->getFilename().contains("cda") == 1)
+- dynamic_cast<CdDecoder*>(getDecoder())->setDevice(m_CDdevice);
++ CdDecoder *cddecoder = dynamic_cast<CdDecoder*>(getDecoder());
++ if (cddecoder)
++ cddecoder->setDevice(m_CDdevice);
+
+ getDecoder()->setOutput(m_output);
+ //getDecoder()-> setBlockSize(2 * 1024);
diff -Naurp mythplugins-0.24.orig/mythnetvision/i18n/.gitignore mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore
--- mythplugins-0.24.orig/mythnetvision/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore
--- mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythfillnetvision
diff -Naurp mythplugins-0.24.orig/mythnews/i18n/.gitignore mythplugins-0.24.fixes/mythnews/i18n/.gitignore
--- mythplugins-0.24.orig/mythnews/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythnews/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythnews/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythnews/mythnews/main.cpp mythplugins-0.24.fixes/mythnews/mythnews/main.cpp
+--- mythplugins-0.24.orig/mythnews/mythnews/main.cpp 2010-08-29 18:21:36.000000000 -0400
++++ mythplugins-0.24.fixes/mythnews/mythnews/main.cpp 2011-02-28 22:42:02.000000000 -0500
+@@ -69,7 +69,7 @@ int mythplugin_init(const char *libversi
+ "Couldn't upgrade database to new schema, exiting.");
+ return -1;
+ }
+- gCoreContext->ActivateSettingsCache(false);
++ gCoreContext->ActivateSettingsCache(true);
+
+ setupKeys();
+
diff -Naurp mythplugins-0.24.orig/mythvideo/i18n/.gitignore mythplugins-0.24.fixes/mythvideo/i18n/.gitignore
--- mythplugins-0.24.orig/mythvideo/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythvideo/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythvideo/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythvideo/mtd/.gitignore mythplugins-0.24.fixes/mythvideo/mtd/.gitignore
--- mythplugins-0.24.orig/mythvideo/mtd/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythvideo/mtd/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythvideo/mtd/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mtd
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore
--- mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+*.moc
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py
--- mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py 2010-09-12 12:10:46.000000000 -0400
-+++ mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py 2011-01-18 00:21:00.000000000 -0500
-@@ -306,6 +306,7 @@ __version__=u"v0.7.7"
++++ mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py 2011-02-28 22:42:02.000000000 -0500
+@@ -306,6 +306,8 @@ __version__=u"v0.7.7"
# 0.7.5 Added the TMDB MovieRating as videometadata table "rating" field
# 0.7.6 Modifications to support MythTV python bindings changes
# 0.7.7 Pull hostname from python bindings instead of socket libraries
-+ # Added support of unicode characters within a jamu.conf file
++ # Added support of unicode characters within a jamu.conf file
++ # Replace 'xml' module version check with generic Python version, to correct failure in Python 2.7
usage_txt=u'''
-@@ -1246,7 +1247,7 @@ class Configuration(object):
+@@ -476,14 +478,10 @@ class OutStreamEncoder(object):
+ sys.stdout = OutStreamEncoder(sys.stdout, 'utf8')
+ sys.stderr = OutStreamEncoder(sys.stderr, 'utf8')
+
+-try:
+- import xml
+-except Exception, e:
+- print '''The python module xml must be installed. error(%s)''' % e
++if sys.version_info <= (2,5):
++ print '''JAMU requires Python 2.5 or newer to run.'''
+ sys.exit(1)
+-if xml.__version__ < u'41660':
+- print '''
+-\n! Warning - The module xml (v41660 or greater) must be installed. Your version is different (v%s) than what Jamu was tested with. Jamu may not work on your installation.\nIt is recommended that you upgrade.\n''' % xml.__version__
++
+ import xml.etree.cElementTree as ElementTree
+
+
+@@ -1246,7 +1244,7 @@ class Configuration(object):
)
sys.exit(1)
cfg = ConfigParser.SafeConfigParser()
@@ -358,12 +663,12 @@
self.config['config_file'] = section[5:]
diff -Naurp mythplugins-0.24.orig/mythweather/i18n/.gitignore mythplugins-0.24.fixes/mythweather/i18n/.gitignore
--- mythplugins-0.24.orig/mythweather/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythweather/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythweather/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2010-06-22 00:11:23.000000000 -0400
-+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -1,4 +1,5 @@
#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
@@ -453,7 +758,7 @@
+print "copyright::Environment Canada\n";
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1,127 @@
+#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
@@ -584,7 +889,7 @@
+print "copyright::Environment Canada\n";
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2010-06-22 00:11:23.000000000 -0400
-+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2011-02-28 22:42:02.000000000 -0500
@@ -154,14 +154,14 @@ elsif ($weather_string =~ /^heavy rain$/
}
elsif ($weather_string =~ /^thundery rain$/i ||
@@ -604,7 +909,7 @@
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2010-06-22 00:11:23.000000000 -0400
-+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2011-02-28 22:42:02.000000000 -0500
@@ -179,14 +179,14 @@ foreach $item (@{$xml->{channel}->{item}
}
elsif ($weather_string =~ /^thundery rain$/i ||
@@ -624,7 +929,7 @@
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2010-10-10 17:47:57.000000000 -0400
-+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
@@ -635,7 +940,7 @@
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl
--- mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2010-10-10 17:47:57.000000000 -0400
-+++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2011-02-28 22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
@@ -646,17 +951,17 @@
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythzmserver
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp
--- mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2010-08-15 06:52:05.000000000 -0400
-+++ mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2011-02-28 22:42:02.000000000 -0500
@@ -12,10 +12,6 @@
*
* ============================================================ */
@@ -668,3 +973,36 @@
// qt
#include <QDateTime>
#include <QTimer>
+diff -Naurp mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml
+--- mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2010-10-06 11:44:50.000000000 -0400
++++ mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2011-02-28 22:42:02.000000000 -0500
+@@ -652,23 +652,23 @@
+
+ <window name="zmplayer">
+
+- <font name="label" from="basesmall">
++ <fontdef name="label" from="basesmall">
+ <color>#ffff00</color>
+ <size>16</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="data" from="basesmall">
++ <fontdef name="data" from="basesmall">
+ <color>#ffffff</color>
+ <size>14</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="buttons" from="basesmall">
++ <fontdef name="buttons" from="basesmall">
+ <color>#ffffff</color>
+ <size>12</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+ <textarea name="pagetitle" from="basetextarea">
+ <area>30,10,570,40</area>
mythtv-0.24-fixes.patch:
.gitignore | 3
Makefile | 6
VERSION | 1
bindings/perl/.gitignore | 4
bindings/perl/IO/Socket/INET/MythTV.pm | 8
bindings/perl/MythTV.pm | 8
bindings/perl/MythTV/Channel.pm | 8
bindings/perl/MythTV/Program.pm | 8
bindings/perl/MythTV/Recording.pm | 8
bindings/perl/MythTV/StorageGroup.pm | 8
bindings/python/.gitignore | 1
bindings/python/MythTV/__init__.py | 4
bindings/python/MythTV/dataheap.py | 2
bindings/python/MythTV/methodheap.py | 7
bindings/python/MythTV/mythproto.py | 2
bindings/python/MythTV/static.py | 2
bindings/python/MythTV/system.py | 24
bindings/python/MythTV/utility.py | 4
configure | 9
contrib/icons/master_iconmap/channel_icons.pl | 8
contrib/maintenance/flush_deleted_recgroup.pl | 8
contrib/maintenance/optimize_mythdb.pl | 8
contrib/user_jobs/mythlink.pl | 8
docs/mythtv-HOWTO.sgml | 123 +
external/.gitignore | 16
external/FFmpeg/Makefile | 11
external/FFmpeg/libavcodec/dvbsubdec.c | 1
external/FFmpeg/libavformat/mpegts.c | 1
external/FFmpeg/libavformat/rmdec.c | 7
filters/quickdnr/quickdnr.pro | 2
i18n/.gitignore | 1
i18n/mythfrontend_en_gb.qm | 52
i18n/mythfrontend_en_gb.ts | 2
i18n/mythfrontend_fr.qm | 468 +++---
i18n/mythfrontend_fr.ts | 2
i18n/mythfrontend_pt.qm | 375 ++--
i18n/mythfrontend_pt.ts | 2
libs/libavutil/.gitignore | 1
libs/libmyth/audiooutput.cpp | 40
libs/libmyth/audiooutput.h | 3
libs/libmyth/audiooutputalsa.cpp | 169 +-
libs/libmyth/audiooutputalsa.h | 7
libs/libmyth/audiooutputbase.cpp | 395 +++--
libs/libmyth/audiooutputbase.h | 9
libs/libmyth/audiooutputca.cpp | 4
libs/libmyth/audiooutputdigitalencoder.h | 1
libs/libmyth/audiooutputdx.cpp | 2
libs/libmyth/audiooutputpulse.cpp | 7
libs/libmyth/audiooutputsettings.cpp | 14
libs/libmyth/audiooutpututil.cpp | 26
libs/libmyth/audiooutpututil.h | 3
libs/libmyth/audiosettings.cpp | 4
libs/libmyth/mediamonitor-darwin.cpp | 2
libs/libmythdb/.gitignore | 2
libs/libmythdb/mythcorecontext.cpp | 5
libs/libmythdb/mythdownloadmanager.cpp | 51
libs/libmythdb/mythsystem.cpp | 14
libs/libmythdb/mythversion.h | 2
libs/libmythdb/storagegroup.cpp | 3
libs/libmythfreesurround/freesurround.cpp | 4
libs/libmythfreesurround/freesurround.h | 2
libs/libmythmetadata/.gitignore | 2
libs/libmythmetadata/videometadata.cpp | 16
libs/libmythsoundtouch/AAFilter.cpp | 6
libs/libmythsoundtouch/AAFilter.h | 6
libs/libmythsoundtouch/BPMDetect.h | 6
libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 6
libs/libmythsoundtouch/FIFOSampleBuffer.h | 6
libs/libmythsoundtouch/FIFOSamplePipe.h | 6
libs/libmythsoundtouch/FIRFilter.cpp | 6
libs/libmythsoundtouch/FIRFilter.h | 6
libs/libmythsoundtouch/RateTransposer.cpp | 6
libs/libmythsoundtouch/RateTransposer.h | 6
libs/libmythsoundtouch/STTypes.h | 6
libs/libmythsoundtouch/SoundTouch.cpp | 6
libs/libmythsoundtouch/SoundTouch.h | 6
libs/libmythsoundtouch/TDStretch.cpp | 6
libs/libmythsoundtouch/TDStretch.h | 6
libs/libmythsoundtouch/cpu_detect.h | 14
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 6
libs/libmythsoundtouch/mmx_gcc.cpp | 6
libs/libmythtv/RingBuffer.cpp | 39
libs/libmythtv/audioplayer.cpp | 51
libs/libmythtv/audioplayer.h | 3
libs/libmythtv/avformatdecoder.cpp | 257 ++-
libs/libmythtv/avformatdecoder.h | 8
libs/libmythtv/bswap.h | 19
libs/libmythtv/cc608reader.cpp | 1
libs/libmythtv/decoderbase.cpp | 2
libs/libmythtv/decoderbase.h | 4
libs/libmythtv/dtvrecorder.cpp | 30
libs/libmythtv/dtvrecorder.h | 2
libs/libmythtv/eithelper.cpp | 16
libs/libmythtv/fourcc.h | 2
libs/libmythtv/frame.h | 2
libs/libmythtv/frequencies.c | 15
libs/libmythtv/frequencytables.cpp | 4
libs/libmythtv/libmythtv.pro | 6
libs/libmythtv/minilzo.cpp | 2
libs/libmythtv/mpeg/H264Parser.cpp | 424 ++++-
libs/libmythtv/mpeg/H264Parser.h | 27
libs/libmythtv/mythcommflagplayer.cpp | 2
libs/libmythtv/mythdvdplayer.cpp | 10
libs/libmythtv/mythplayer.cpp | 336 ++--
libs/libmythtv/mythplayer.h | 36
libs/libmythtv/nuppeldecoder.cpp | 18
libs/libmythtv/playercontext.cpp | 2
libs/libmythtv/recordingprofile.cpp | 8
libs/libmythtv/recordingprofile.h | 1
libs/libmythtv/subtitlescreen.cpp | 33
libs/libmythtv/teletextdecoder.cpp | 51
libs/libmythtv/teletextdecoder.h | 42
libs/libmythtv/teletextreader.cpp | 609 ++++++++
libs/libmythtv/teletextreader.h | 162 ++
libs/libmythtv/teletextscreen.cpp | 754 +---------
libs/libmythtv/teletextscreen.h | 154 --
libs/libmythtv/textsubtitleparser.h | 6
libs/libmythtv/transporteditor.cpp | 2
libs/libmythtv/transporteditor.h | 2
libs/libmythtv/tv_play.cpp | 286 +--
libs/libmythtv/tv_play.h | 23
libs/libmythtv/tv_rec.cpp | 4
libs/libmythtv/videodisplayprofile.h | 1
libs/libmythtv/videoout_d3d.h | 2
libs/libmythtv/videoout_opengl.h | 2
libs/libmythtv/videoout_quartz.cpp | 2
libs/libmythtv/videoout_vdpau.h | 2
libs/libmythtv/videoout_xv.cpp | 4
libs/libmythtv/videoout_xv.h | 6
libs/libmythtv/videooutbase.cpp | 9
libs/libmythtv/videooutbase.h | 1
libs/libmythui/mythmainwindow.cpp | 2
libs/libmythui/mythrender_opengl.cpp | 21
libs/libmythui/mythrender_opengl.h | 4
libs/libmythui/mythscreentype.cpp | 4
libs/libmythui/mythuibuttonlist.cpp | 2
libs/libmythui/mythuiimage.cpp | 16
libs/libmythui/mythuistatetype.cpp | 16
libs/libmythui/mythuiwebbrowser.cpp | 6
libs/libmythui/util-osx.cpp | 2
libs/libmythupnp/httprequest.cpp | 28
libs/libmythupnp/soapclient.cpp | 6
libs/libmythupnp/threadpool.cpp | 59
libs/libmythupnp/upnpcds.cpp | 2
libs/libmythupnp/upnpcdsobjects.cpp | 2
locales/.gitignore | 1
programs/mythavtest/.gitignore | 1
programs/mythbackend/.gitignore | 1
programs/mythbackend/mainserver.cpp | 20
programs/mythbackend/playbacksock.cpp | 2
programs/mythbackend/scheduler.cpp | 15
programs/mythcommflag/.gitignore | 1
programs/mythfilldatabase/.gitignore | 1
programs/mythfrontend/.gitignore | 1
programs/mythfrontend/exitprompt.cpp | 25
programs/mythfrontend/globalsettings.cpp | 115 -
programs/mythfrontend/globalsettings.h | 5
programs/mythfrontend/guidegrid.cpp | 7
programs/mythfrontend/playbackbox.cpp | 13
programs/mythfrontend/playbackbox.h | 1
programs/mythfrontend/progfind.cpp | 84 -
programs/mythfrontend/proglist.cpp | 46
programs/mythfrontend/proglist.h | 2
programs/mythfrontend/programrecpriority.cpp | 24
programs/mythjobqueue/.gitignore | 1
programs/mythlcdserver/.gitignore | 1
programs/mythpreviewgen/.gitignore | 1
programs/mythshutdown/.gitignore | 1
programs/mythtranscode/.gitignore | 1
programs/mythtranscode/mpeg2fix.cpp | 2
programs/mythtranscode/mpeg2fix.h | 2
programs/mythtranscode/replex/.gitignore | 1
programs/mythtranscode/transcode.cpp | 9
programs/mythtv-setup/.gitignore | 1
programs/mythtvosd/.gitignore | 1
programs/mythwelcome/.gitignore | 1
programs/scripts/.gitignore | 1
programs/scripts/database/mythconverg_restore.pl | 8
programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py | 18
programs/scripts/internetcontent/nv_python_libs/common/common_api.py | 17
programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html | 39
programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml | 5
programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml | 2
programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl | 100 -
programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py | 18
programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py | 39
themes/.gitignore | 1
themes/DVR/util_menu.xml | 7
themes/MythCenter-wide/base.xml | 1
themes/MythCenter-wide/osd.xml | 16
themes/MythCenter-wide/schedule-ui.xml | 2
themes/MythCenter-wide/zoneminder-ui.xml | 12
themes/MythCenter/base.xml | 1
version.sh | 23
194 files changed, 3611 insertions(+), 2856 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 mythtv-0.24-fixes.patch
Index: mythtv-0.24-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv-0.24-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.24-fixes.patch 30 Jan 2011 19:20:22 -0000 1.2
+++ mythtv-0.24-fixes.patch 3 Mar 2011 02:34:21 -0000 1.3
@@ -1,6 +1,6 @@
diff -Naurp mythtv-0.24.orig/bindings/perl/.gitignore mythtv-0.24.fixes/bindings/perl/.gitignore
--- mythtv-0.24.orig/bindings/perl/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1,4 @@
+Makefile.perl
+Makefile.perl.*
@@ -8,7 +8,7 @@
+pm_to_blib
diff -Naurp mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
# A MythTV Socket class that extends IO::Socket::INET to include some
# MythTV-specific data queries
@@ -26,7 +26,7 @@
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm 2010-05-22 20:48:40.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV channel.
@@ -44,7 +44,7 @@
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Program.pm mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Program.pm 2010-09-10 22:23:32.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV program.
@@ -62,7 +62,7 @@
package MythTV::Program;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm 2010-09-03 15:55:56.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV recording.
@@ -80,7 +80,7 @@
package MythTV::Recording;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-02-28 22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV Storage Group.
@@ -98,7 +98,7 @@
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV.pm mythtv-0.24.fixes/bindings/perl/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/MythTV.pm 2010-09-29 13:08:29.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-02-28 22:42:43.000000000 -0500
@@ -1,10 +1,10 @@
#
# MythTV bindings for perl.
@@ -116,12 +116,12 @@
# Version
diff -Naurp mythtv-0.24.orig/bindings/python/.gitignore mythtv-0.24.fixes/bindings/python/.gitignore
--- mythtv-0.24.orig/bindings/python/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+build/
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/dataheap.py mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/dataheap.py 2010-11-02 23:15:16.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-02-28 22:42:43.000000000 -0500
@@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C
return vid
@@ -131,9 +131,24 @@
(self.host, self.filename))
class VideoGrabber( Grabber ):
+diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/__init__.py mythtv-0.24.fixes/bindings/python/MythTV/__init__.py
+--- mythtv-0.24.orig/bindings/python/MythTV/__init__.py 2010-09-09 01:11:01.000000000 -0400
++++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-02-28 22:42:43.000000000 -0500
+@@ -53,8 +53,10 @@ from methodheap import *
+ from sys import version_info
+ if version_info >= (2, 6): # 2.6 or newer
+ exec(import26)
+-else:
++elif version_info >= (2, 5):
+ exec(importall)
++else:
++ raise Exception("The MythTV Python bindings will only operate against Python 2.5 or later.")
+
+ __version__ = OWN_VERSION
+ static.mysqldb = MySQLdb.version_info
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/methodheap.py mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/methodheap.py 2010-09-23 00:01:58.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-02-28 22:42:43.000000000 -0500
@@ -625,9 +625,9 @@ class MythDB( DBCache ):
return ('recorded.%s=%%s' % key, datetime.duck(value), 0)
@@ -159,7 +174,7 @@
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/mythproto.py mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py
--- mythtv-0.24.orig/bindings/python/MythTV/mythproto.py 2010-10-14 11:36:31.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py 2011-02-28 22:42:43.000000000 -0500
@@ -188,7 +188,7 @@ def ftopen(file, mode, forceremote=False
db = DBCache(db)
log = MythLog('Python File Transfer', db=db)
@@ -171,20 +186,44 @@
if mode not in ('r','w'):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/static.py mythtv-0.24.fixes/bindings/python/MythTV/static.py
--- mythtv-0.24.orig/bindings/python/MythTV/static.py 2010-10-08 13:55:04.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/static.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/static.py 2011-02-28 22:42:43.000000000 -0500
@@ -4,7 +4,7 @@
Contains any static and global variables for MythTV Python Bindings
"""
-OWN_VERSION = (0,24,0,0)
-+OWN_VERSION = (0,24,0,1)
++OWN_VERSION = (0,24,0,2)
SCHEMA_VERSION = 1264
MVSCHEMA_VERSION = 1038
NVSCHEMA_VERSION = 1007
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/system.py mythtv-0.24.fixes/bindings/python/MythTV/system.py
--- mythtv-0.24.orig/bindings/python/MythTV/system.py 2010-10-08 13:55:04.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/system.py 2011-01-30 00:25:19.000000000 -0500
-@@ -195,7 +195,12 @@ class InternetMetadata( Metadata ):
++++ mythtv-0.24.fixes/bindings/python/MythTV/system.py 2011-02-28 22:42:43.000000000 -0500
+@@ -36,8 +36,21 @@ class System( DBCache ):
+ if path is None:
+ raise MythError('Invalid input to System()')
+ self.path = path
+- if not os.access(self.path, os.F_OK):
+- raise MythFileError('Defined grabber path does not exist.')
++
++ cmd = self.path.split()[0]
++ if self.path.startswith('/'):
++ # test full given path
++ if not os.access(cmd, os.F_OK):
++ raise MythFileError('Defined executable path does not exist.')
++ else:
++ # search command from PATH
++ for folder in os.environ['PATH'].split(':'):
++ if os.access(os.path.join(folder,cmd), os.F_OK):
++ self.path = os.path.join(folder,self.path)
++ break
++ else:
++ raise MythFileError('Defined executable path does not exist.')
++
+ self.returncode = 0
+ self.stderr = ''
+
+@@ -195,7 +208,12 @@ class InternetMetadata( Metadata ):
class Grabber( System ):
def _processMetadata(self, xml):
@@ -200,7 +239,7 @@
def command(self, *args):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/utility.py mythtv-0.24.fixes/bindings/python/MythTV/utility.py
--- mythtv-0.24.orig/bindings/python/MythTV/utility.py 2010-10-13 17:26:06.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/utility.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/utility.py 2011-02-28 22:42:43.000000000 -0500
@@ -180,7 +180,9 @@ class databaseSearch( object ):
raise TypeError(errstr % (self.__name__, key))
res[0] = 'NOT '+res[0]
@@ -214,7 +253,16 @@
fields.append(res[1])
diff -Naurp mythtv-0.24.orig/configure mythtv-0.24.fixes/configure
--- mythtv-0.24.orig/configure 2010-11-08 12:40:43.000000000 -0500
-+++ mythtv-0.24.fixes/configure 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/configure 2011-02-28 22:42:43.000000000 -0500
+@@ -742,7 +742,7 @@ check_ld(){
+ test "${f}" = "${f#-l}" && flags="$flags $f" || libs="$libs $f"
+ done
+ check_cc $($filter_cflags $flags) || return
+- check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $extralibs $libs
++ check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $libs $extralibs
+ }
+
+ check_cppflags(){
@@ -1955,6 +1955,8 @@ enable avutil
enable asm
enable debug
@@ -245,7 +293,7 @@
SHLIBDIR=\$(INSTALL_ROOT)$shlibdir
diff -Naurp mythtv-0.24.orig/contrib/icons/master_iconmap/channel_icons.pl mythtv-0.24.fixes/contrib/icons/master_iconmap/channel_icons.pl
--- mythtv-0.24.orig/contrib/icons/master_iconmap/channel_icons.pl 2009-04-10 20:04:30.000000000 -0400
[...4656 lines suppressed...]
--- mythtv-0.24.orig/programs/mythwelcome/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/programs/mythwelcome/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/mythwelcome/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+mythwelcome
diff -Naurp mythtv-0.24.orig/programs/scripts/database/mythconverg_restore.pl mythtv-0.24.fixes/programs/scripts/database/mythconverg_restore.pl
--- mythtv-0.24.orig/programs/scripts/database/mythconverg_restore.pl 2010-10-17 20:25:30.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/database/mythconverg_restore.pl 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/database/mythconverg_restore.pl 2011-02-28 22:42:43.000000000 -0500
@@ -13,7 +13,7 @@
# Script info
@@ -8982,12 +11285,12 @@
{
diff -Naurp mythtv-0.24.orig/programs/scripts/.gitignore mythtv-0.24.fixes/programs/scripts/.gitignore
--- mythtv-0.24.orig/programs/scripts/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/programs/scripts/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+scripts
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py 2010-08-28 16:16:22.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py 2011-02-28 22:42:43.000000000 -0500
@@ -349,16 +349,19 @@ class Videos(object):
urlType = u'fullscreen'
@@ -9035,7 +11338,7 @@
s_e = self.getSeasonEpisode(title)
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/common/common_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/common/common_api.py
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/common/common_api.py 2010-08-28 16:16:22.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/common/common_api.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/common/common_api.py 2011-02-28 22:42:43.000000000 -0500
@@ -18,7 +18,7 @@ MythNetvision Grabber scripts that run a
MNV grabbers.
'''
@@ -9096,7 +11399,7 @@
else:
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
@@ -9139,7 +11442,7 @@
+</html>
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2010-08-28 16:16:22.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-02-28 22:42:43.000000000 -0500
@@ -19,9 +19,8 @@
<url>
<name>BBC iPlayer Search</name>
@@ -9154,7 +11457,7 @@
</urls>
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2010-08-28 16:16:22.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-02-28 22:42:43.000000000 -0500
@@ -46,7 +46,7 @@
</subDirectory>
@@ -9166,7 +11469,7 @@
<subDirectory name="TrailerAddict.com">
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2010-07-13 12:14:21.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-02-28 22:42:43.000000000 -0500
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
@@ -9429,7 +11732,7 @@
</xsl:stylesheet>
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2010-08-28 16:16:22.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-02-28 22:42:43.000000000 -0500
@@ -19,7 +19,7 @@ metadata, video and image URLs from MTV.
for this api are published at http://developer.mtvnservices.com/docs
'''
@@ -9500,7 +11803,7 @@
dictionaries.append([self.massageDescription(self.feed_names[self.tree_key][self.feed]), self.setTreeViewIcon()])
diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
--- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2010-08-28 16:16:22.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-02-28 22:42:43.000000000 -0500
@@ -21,8 +21,9 @@ See this link for the specifications:
http://www.mythtv.org/wiki/MythNetvision_Grabber_Script_Format
'''
@@ -9596,14 +11899,31 @@
######################################################################################################
#
# End of XPath extension functions
+diff -Naurp mythtv-0.24.orig/themes/DVR/util_menu.xml mythtv-0.24.fixes/themes/DVR/util_menu.xml
+--- mythtv-0.24.orig/themes/DVR/util_menu.xml 2010-08-13 15:45:54.000000000 -0400
++++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-02-28 22:42:43.000000000 -0500
+@@ -8,6 +8,13 @@
+ </button>
+
+ <button>
++ <type>NET_VIDEO</type>
++ <text>Internet Video</text>
++ <action>MENU netvisionmenu.xml</action>
++ <depends>mythnetvision</depends>
++ </button>
++
++ <button>
+ <type>MUSIC</type>
+ <text>Music</text>
+ <action>PLUGIN mythmusic</action>
diff -Naurp mythtv-0.24.orig/themes/.gitignore mythtv-0.24.fixes/themes/.gitignore
--- mythtv-0.24.orig/themes/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/themes/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+themes
diff -Naurp mythtv-0.24.orig/themes/MythCenter/base.xml mythtv-0.24.fixes/themes/MythCenter/base.xml
--- mythtv-0.24.orig/themes/MythCenter/base.xml 2010-09-22 08:39:41.000000000 -0400
-+++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-02-28 22:42:43.000000000 -0500
@@ -766,6 +766,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,125</area>
@@ -9614,7 +11934,7 @@
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/base.xml mythtv-0.24.fixes/themes/MythCenter-wide/base.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/base.xml 2010-10-06 10:17:51.000000000 -0400
-+++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-02-28 22:42:43.000000000 -0500
@@ -881,6 +881,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,126</area>
@@ -9625,7 +11945,7 @@
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/osd.xml mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/osd.xml 2010-11-09 21:44:09.000000000 -0500
-+++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-02-28 22:42:43.000000000 -0500
@@ -429,6 +429,22 @@
<fill color="#FFFFFF" alpha="255" />
<alphapulse min="180" max="255" change="4" />
@@ -9651,7 +11971,7 @@
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml 2010-10-06 10:17:51.000000000 -0400
-+++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-02-28 22:42:43.000000000 -0500
@@ -532,7 +532,7 @@
<area>240,2,220,24</area>
</textarea>
@@ -9661,6 +11981,39 @@
</textarea>
<textarea name="card" from="shortstarttimedate">
<area>1165,2,30,24</area>
+diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml
+--- mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml 2010-10-06 11:37:20.000000000 -0400
++++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-02-28 22:42:43.000000000 -0500
+@@ -652,23 +652,23 @@
+
+ <window name="zmplayer">
+
+- <font name="label" from="basesmall">
++ <fontdef name="label" from="basesmall">
+ <color>#ffff00</color>
+ <size>16</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="data" from="basesmall">
++ <fontdef name="data" from="basesmall">
+ <color>#ffffff</color>
+ <size>14</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="buttons" from="basesmall">
++ <fontdef name="buttons" from="basesmall">
+ <color>#ffffff</color>
+ <size>12</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+ <textarea name="pagetitle" from="basetextarea">
+ <area>30,10,570,40</area>
diff -Naurp mythtv-0.24.orig/VERSION mythtv-0.24.fixes/VERSION
--- mythtv-0.24.orig/VERSION 2010-11-10 12:31:31.000000000 -0500
+++ mythtv-0.24.fixes/VERSION 1969-12-31 19:00:00.000000000 -0500
@@ -9668,7 +12021,7 @@
-SOURCE_VERSION="0.24"
diff -Naurp mythtv-0.24.orig/version.sh mythtv-0.24.fixes/version.sh
--- mythtv-0.24.orig/version.sh 2010-08-29 18:22:54.000000000 -0400
-+++ mythtv-0.24.fixes/version.sh 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/version.sh 2011-02-28 22:42:43.000000000 -0500
@@ -1,12 +1,11 @@
#!/bin/sh
#
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mythtv.spec 31 Jan 2011 20:11:30 -0000 1.86
+++ mythtv.spec 3 Mar 2011 02:34:21 -0000 1.87
@@ -66,7 +66,7 @@
# Git revision and branch ID
# 0.24 release: git tag b0.24
-%define _gitrev 8921ded85a
+%define _gitrev 4af46b1f5d
%define branch fixes/0.24
#
@@ -83,7 +83,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 5%{?dist}
+Release: 6%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1457,6 +1457,10 @@
################################################################################
%changelog
+* Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6
+- Update to 0.24 fixes, git revision 4af46b1f5d
+- Fix mythtv version output to properly show git revision
+
* Sun Jan 30 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-5
- Update to 0.24 fixes, git revision 8921ded85a (rpmfbz#1605, #1585)
- Add BR: libcdio-devel for forthcoming improved BD support
13 years, 8 months
- 1
- 0
rpms/openafs/F-13 CellServDB,1.1,1.2 openafs.spec,1.5,1.6
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11870
Modified Files:
CellServDB openafs.spec
Log Message:
* Wed Mar 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-2
- Update the CellServDB to the current list from
http://dl.central.org/dl/cellservdb/CellServDB
- This addresses Bug #1646
Index: CellServDB
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/CellServDB,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CellServDB 27 May 2010 19:38:20 -0000 1.1
+++ CellServDB 2 Mar 2011 20:57:57 -0000 1.2
@@ -1,5 +1,5 @@
->grand.central.org #GCO Public CellServDB 05 Jul 2007
-18.92.0.108 #grand-opening.mit.edu
+>grand.central.org #GCO Public CellServDB 13 Dec 2010
+18.9.48.14 #grand.mit.edu
128.2.203.61 #penn.central.org
130.237.48.87 #andrew.e.kth.se
>wu-wien.ac.at #University of Economics, Vienna, Austria
@@ -11,9 +11,9 @@
193.170.243.12 #baloo.oeaw.ac.at
193.170.243.14 #akela.oeaw.ac.at
>cgv.tugraz.at #CGV cell
-129.27.224.133 #phobos.cgv.tugraz.at
-129.27.224.134 #deimos.cgv.tugraz.at
-129.27.224.210 #trinculo.cgv.tugraz.at
+129.27.218.30 #phobos.cgv.tugraz.at
+129.27.218.31 #deimos.cgv.tugraz.at
+129.27.218.32 #trinculo.cgv.tugraz.at
>itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus
129.27.161.7 #faepafs1.tu-graz.ac.at
129.27.161.15 #faepafs2.tu-graz.ac.at
@@ -21,6 +21,10 @@
>sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi
132.216.24.122 #germain.sums.math.mcgill.ca
132.216.24.125 #turing.sums.math.mcgill.ca
+>ualberta.ca #University of Alberta
+129.128.1.131 #file13.ucs.ualberta.ca
+129.128.98.17 #mystery.ucs.ualberta.ca
+129.128.125.40 #drake.ucs.ualberta.ca
>cern.ch #European Laboratory for Particle Physics, Geneva
137.138.128.148 #afsdb1.cern.ch
137.138.246.50 #afsdb3.cern.ch
@@ -33,78 +37,105 @@
128.178.109.112 #kd2.epfl.ch
128.178.109.113 #kd3.epfl.ch
>ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland
-129.132.97.19 #amalthea.ethz.ch
-129.132.97.27 #nethzafs-001.ethz.ch
-129.132.115.3 #himalia.ethz.ch
-129.132.115.37 #nethzafs-005.ethz.ch
-129.132.115.38 #nethzafs-006.ethz.ch
+82.130.118.32 #afs-db-1.ethz.ch
>psi.ch #Paul Scherrer Institut - Villigen, Switzerland
129.129.190.140 #afs00.psi.ch
129.129.190.141 #afs01.psi.ch
129.129.190.142 #afs02.psi.ch
>extundo.com #Simon Josefsson's cell
195.42.214.241 #slipsten.extundo.com
+>freedaemon.com #Free Daemon Consulting, Oklahoma City, OK, USA
+66.210.104.254 #afs0.freedaemon.com
>membrain.com #membrain.com
66.93.118.125 #stormy
130.85.24.11 #weasel
130.85.24.13 #straykitten
->midnightlinux.com #Midnight Linux, Pittsburgh PA
-208.10.142.82 #outpost.midnightlinux.com
>setfilepointer.com #SetFilePointer.com
-63.224.10.2 #hamlet.SetFilePointer.com
-63.224.10.4 #troilus.SetFilePointer.com
+69.164.193.174 #alpha.setfilepointer.com
+174.143.159.53 #beta.setfilepointer.com
>sodre.cx #Sodre.cx
128.8.140.165 #greed.sodre.cx
+>ruk.cuni.cz #Charles University Computer Centre, Prague, CR
+195.113.0.36 #asterix.ruk.cuni.cz
+195.113.0.37 #obelix.ruk.cuni.cz
+195.113.0.40 #sal.ruk.cuni.cz
+>ics.muni.cz #Masaryk university
+147.251.3.11 #grond.ics.muni.cz
+147.251.3.15 #nimloth.ics.muni.cz
+147.251.3.19 #sirion.ics.muni.cz
+>zcu.cz #University of West Bohemia, Czech Republic
+147.228.10.18 #sauron.zcu.cz
+147.228.52.10 #oknos.zcu.cz
+147.228.52.17 #nic.zcu.cz
>desy.de #Deutsches Elektronen-Synchrotron
-131.169.40.62 #vayu.desy.de
+131.169.2.19 #afsdb2.desy.de
+131.169.2.20 #afsdb3.desy.de
131.169.244.60 #solar00.desy.de
>gppc.de #GPP Chemnitz mbH
213.187.92.33 #gpp1.gppc.de
213.187.92.34 #paulchen.gppc.de
213.187.92.35 #lotus.gppc.de
+>cms.hu-berlin.de #Humboldt University Berlin
+141.20.1.65 #commodus.cms.hu-berlin.de
+141.20.1.66 #faustinus.cms.hu-berlin.de
+141.20.1.67 #marcellus.cms.hu-berlin.de
>ifh.de #DESY Zeuthen
141.34.22.10 #romulus.ifh.de
141.34.22.11 #remus.ifh.de
141.34.22.29 #hekate.ifh.de
+>integra-ev.de #INTEGRA e.V.
+134.155.48.8 #afsdb2.integra-ev.de
+134.155.48.63 #afsdb1.integra-ev.de
>lrz-muenchen.de #Leibniz Computing Centre, Germany
129.187.10.36 #afs1.lrz-muenchen.de
129.187.10.56 #afs3.lrz-muenchen.de
129.187.10.57 #afs2.lrz-muenchen.de
>ipp-garching.mpg.de #Institut fuer Plasmaphysik
130.183.9.5 #afs-db1.rzg.mpg.de
+130.183.14.14 #afs-db3.bc.rzg.mpg.de
130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de
-130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de
>mpe.mpg.de #MPE cell
130.183.130.7 #irafs1.mpe-garching.mpg.de
130.183.134.20 #irafs2.mpe-garching.mpg.de
+>nicsys.de #NICsys GbR
+213.187.80.3 #attila.nicsys.de
>i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
137.226.244.79 #remus.informatik.rwth-aachen.de
+>combi.tfh-wildau.de #Philips Research Lab
+194.95.50.106 #joda13.combi.tfh-wildau.de
>tu-bs.de #Technical University of Braunschweig, Germany
134.169.1.1 #rzafs1.rz.tu-bs.de
134.169.1.5 #rzafs2.rz.tu-bs.de
134.169.1.6 #rzafs3.rz.tu-bs.de
>tu-chemnitz.de #Technische Universitaet Chemnitz, Germany
134.109.2.1 #zuse.hrz.tu-chemnitz.de
+134.109.2.2 #andrew.hrz.tu-chemnitz.de
134.109.2.15 #phoenix.hrz.tu-chemnitz.de
-134.109.200.7 #aetius.hrz.tu-chemnitz.de
>e18.ph.tum.de #Experimental Physics, TU Munich, Germany
+129.187.154.165 #dionysos.e18.physik.tu-muenchen.de
129.187.154.223 #hamlet.e18.physik.tu-muenchen.de
->uni-bonn.de #University of Bonn, Computing Center
-131.220.14.198 #work15-eth.rhrz.uni-bonn.de
-131.220.14.205 #node05.rhrz.uni-bonn.de
-131.220.15.197 #afs-db1.rhrz.uni-bonn.de
>atlass01.physik.uni-bonn.de #Bonn ATLAS
131.220.165.43 #atlass01.physik.uni-bonn.de
>uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg
-132.230.6.235 #sv6.ruf.uni-freiburg.de
-132.230.6.236 #sv7.ruf.uni-freiburg.de
132.230.6.237 #sv8.ruf.uni-freiburg.de
->physik.uni-freiburg.de #institute of physics, university Freiburg, Germany
+132.230.6.239 #sv10.ruf.uni-freiburg.de
+>physik.uni-freiburg.de #Institute of Physics, University Freiburg, Germany
+132.230.6.234 #afs1.ruf.uni-freiburg.de
+132.230.6.235 #afs2.ruf.uni-freiburg.de
132.230.77.16 #hepafs.physik.uni-freiburg.de
+>physnet.uni-hamburg.de #PHYSnet-Rechenzentrum university of hamburg
+134.100.106.44 #afs-core.physnet.uni-hamburg.de
+134.100.106.45 #afs-core2.physnet.uni-hamburg.de
+134.100.106.47 #afs-core3.physnet.uni-hamburg.de
+>mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut)
+129.206.26.241 #hactar.mathi.uni-heidelberg.de
>urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum)
129.206.119.10 #afsdb.urz.uni-heidelberg.de
129.206.119.16 #afsdb1.urz.uni-heidelberg.de
129.206.119.17 #afsdb2.urz.uni-heidelberg.de
+>ziti.uni-heidelberg.de #Institute of Computer Science at the University of Heidelberg
+147.142.42.246 #mp-sun.ziti.uni-heidelberg.de
+147.142.42.252 #mp-pizza.ziti.uni-heidelberg.de
>uni-hohenheim.de #University of Hohenheim
144.41.2.2 #rs13.serv.uni-hohenheim.de
144.41.2.3 #rs14.serv.uni-hohenheim.de
@@ -120,9 +151,10 @@
134.95.144.24 #afs2.meteo.uni-koeln.de
>rrz.uni-koeln.de #University of Cologne - Reg Comp Center
134.95.19.3 #afsdb1.rrz.uni-koeln.de
+134.95.19.4 #afsdb2.rrz.uni-koeln.de
134.95.19.10 #lyra.rrz.uni-koeln.de
134.95.67.97 #afs.thp.uni-koeln.de
-134.95.141.243 #agrippina.rrz.uni-koeln.de
+134.95.112.8 #ladon.rrz.uni-koeln.de
>physik.uni-mainz.de #institute of physics, university Mainz, Germany
134.93.130.93 #hardy.physik.uni-mainz.de
>uni-mannheim.de #Uni Mannheim (Rechenzentrum)
@@ -147,28 +179,42 @@
129.219.10.70 #authen1.asu.edu
129.219.10.72 #authen3.asu.edu
129.219.100.16 #authen4.asu.edu
->hep.caltech.edu #CalTech High Energy Physics
-131.215.126.150 #afs.hep.caltech.edu
+>mars.asu.edu #Mars Space Flight Facility - ASU Mars Research
+149.169.146.57 #kdc1.mars.asu.edu
+149.169.146.58 #kdc2.mars.asu.edu
+149.169.146.59 #kdc3.mars.asu.edu
+>eecs.berkeley.edu #University of California, Berkeley - EECS Dept.
+128.32.139.34 #greed.eecs.berkeley.edu
+128.32.139.35 #gluttony.eecs.berkeley.edu
+169.229.60.112 #envy.eecs.berkeley.edu
+>hep.caltech.edu #Caltech High Energy Physics
+131.215.116.20 #afs.hep.caltech.edu
+>ugcs.caltech.edu #Caltech UGCS lab
+131.215.176.65 #afs-c.ugcs.caltech.edu
+131.215.176.67 #afs-a.ugcs.caltech.edu
+131.215.176.68 #afs-b.ugcs.caltech.edu
>clarkson.edu #Clarkson University, Potsdam, New York USA
128.153.1.111 #arthur.clarkson.edu
128.153.9.111 #lancelot.clarkson.edu
128.153.17.111 #uther.clarkson.edu
>andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell
-128.2.10.2 #vice2.fs.andrew.cmu.edu
-128.2.10.7 #vice7.fs.andrew.cmu.edu
-128.2.10.11 #vice11.fs.andrew.cmu.edu
-128.2.10.28 #vice28.fs.andrew.cmu.edu
-128.2.32.44 #new-vice12.fs.andrew.cmu.edu
+128.2.10.2 #afsdb-01.andrew.cmu.edu
+128.2.10.7 #afsdb-02.andrew.cmu.edu
+128.2.10.11 #afsdb-03.andrew.cmu.edu
+>mw.andrew.cmu.edu #Carnegie Mellon University - Middleware Test Cell
+128.2.234.24 #null.andrew.cmu.edu
+128.2.234.170 #mw-mgr.andrew.cmu.edu
>club.cc.cmu.edu #Carnegie Mellon University Computer Club
+128.2.204.149 #barium.club.cc.cmu.edu
128.237.157.11 #sodium.club.cc.cmu.edu
128.237.157.13 #potassium.club.cc.cmu.edu
>chem.cmu.edu #Carnegie Mellon University - Chemistry Dept.
128.2.40.134 #afs.chem.cmu.edu
128.2.40.140 #afs2.chem.cmu.edu
>cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci.
-128.2.201.46 #strawberry.srv.cs.cmu.edu
-128.2.201.47 #pumpkin.srv.cs.cmu.edu
-128.2.201.48 #cherry.srv.cs.cmu.edu
+128.2.172.58 #date.srv.cs.cmu.edu
+128.2.172.60 #fig.srv.cs.cmu.edu
+128.2.200.97 #watermelon.srv.cs.cmu.edu
>ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept.
128.2.129.7 #porok.ece.cmu.edu
128.2.129.8 #vicio.ece.cmu.edu
@@ -184,6 +230,11 @@
>cnf.cornell.edu #CNF
128.253.198.9 #hole.cnf.cornell.edu
128.253.198.27 #smoke.cnf.cornell.edu
+128.253.198.231 #mist.cnf.cornell.edu
+>math.cornell.edu #Cornell Math Dept
+128.84.234.12 #pooh.math.cornell.edu
+128.84.234.16 #bernoulli.math.cornell.edu
+128.84.234.162 #dyno.math.cornell.edu
>msc.cornell.edu #Cornell University Materials Science Center
128.84.231.242 #miranda.ccmr.cornell.edu
128.84.241.35 #co.ccmr.cornell.edu
@@ -194,42 +245,48 @@
129.170.30.145 #dbicafs3.dartmouth.edu
>northstar.dartmouth.edu #Dartmouth College Research Computing
129.170.16.22 #halley.dartmouth.edu
-129.170.16.42 #oort.dartmouth.edu
+129.170.16.26 #andromeda.dartmouth.edu
129.170.16.43 #cygnusx1.dartmouth.edu
->cs.fhm.edu #Department Computer Science Munich University Of Applied Science
+>cs.hm.edu #Department Computer Science Munich University Of Applied Science
129.187.208.2 #srv1.informatik.fh-muenchen.de
>eecs.harvard.edu #Harvard - EECS
-140.247.60.61 #zermelo.eecs.harvard.edu
+140.247.60.64 #lefkada.eecs.harvard.edu
140.247.60.83 #corfu.eecs.harvard.edu
>iastate.edu #Iowa State University
129.186.1.243 #afsdb-1.iastate.edu
129.186.6.243 #afsdb-2.iastate.edu
129.186.142.243 #afsdb-3.iastate.edu
>athena.mit.edu #MIT/Athena cell
-18.7.1.66 #paris.mit.edu.
-18.7.1.74 #chimera.mit.edu.
-18.158.0.37 #prill.mit.edu.
+18.3.48.11 #aether.mit.edu
+18.9.48.11 #castor.mit.edu
+18.9.48.12 #pollux.mit.edu
>dev.mit.edu #MIT/IS Development cell
-18.7.1.70 #wham.mit.edu.
-18.92.1.219 #click.mit.edu.
-18.92.1.220 #whirr.mit.edu.
+18.9.48.13 #saw.mit.edu.
+18.9.60.110 #hammer.mit.edu.
+18.9.60.111 #screw.mit.edu.
>net.mit.edu #MIT/Network Group cell
18.7.7.73 #gracie.mit.edu
18.7.21.95 #george.mit.edu
+>numenor.mit.edu #Project Numenor
+18.243.2.49 #numenor.mit.edu
>sipb.mit.edu #MIT/SIPB cell
-18.181.0.19 #reynelda.mit.edu.
-18.181.0.22 #rosebud.mit.edu.
-18.181.0.23 #ronald-ann.mit.edu.
+18.181.0.19 #reynelda.mit.edu
+18.181.0.22 #rosebud.mit.edu
+18.181.0.23 #ronald-ann.mit.edu
>soap.mit.edu #MIT School Of Architecture & Planning
18.89.1.204 #crypt.mit.edu
-18.89.1.209 #grotto.mit.edu
-18.89.2.156 #ac.mit.edu
+18.89.3.46 #soap.mit.edu
+18.89.4.9 #arch.mit.edu
>msu.edu #Michigan State University Main Cell
35.9.7.10 #afsdb0.cl.msu.edu
>nd.edu #University of Notre Dame
129.74.223.17 #john.helios.nd.edu
129.74.223.33 #lizardo.helios.nd.edu
129.74.223.65 #buckaroo.helios.nd.edu
+>crc.nd.edu #University of Notre Dame - Center for Research Computing
+129.74.85.34 #afsdb1.crc.nd.edu
+129.74.85.35 #afsdb2.crc.nd.edu
+129.74.85.36 #afsdb3.crc.nd.edu
>pitt.edu #University of Pittsburgh
136.142.8.15 #afs09.srv.cis.pitt.edu
136.142.8.20 #afs10.srv.cis.pitt.edu
@@ -273,14 +330,6 @@
134.79.18.25 #afsdb1.slac.stanford.edu
134.79.18.26 #afsdb2.slac.stanford.edu
134.79.18.27 #afsdb3.slac.stanford.edu
->ucdavis.edu #University of California at Davis
-169.237.104.100 #afs1.ucdavis.edu
-169.237.235.176 #afs2.ucdavis.edu
-169.237.247.91 #afs3.ucdavis.edu
->home.ucdavis.edu #University of California at Davis home directories
-169.237.105.91 #home1.ucdavis.edu
-169.237.105.92 #home2.ucdavis.edu
-169.237.105.93 #home3.ucdavis.edu
>physics.ucsb.edu #UC Santa Barbara, Physics Dept
128.111.18.161 #ledzeppelin.physics.ucsb.edu
>cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A
@@ -319,12 +368,8 @@
141.211.43.102 #linat02.grid.umich.edu
141.211.43.103 #linat03.grid.umich.edu
141.211.43.104 #linat04.grid.umich.edu
->citi.umich.edu #Center for Information Technology Integration
-141.211.133.5 #babylon.citi.umich.edu
->lsa.umich.edu #University of Michigan - College of LS&A
-141.211.211.53 #gerow.lsa.umich.edu
-141.211.211.72 #collines.lsa.umich.edu
-141.211.211.153 #hodges.lsa.umich.edu
+>citi.umich.edu #University of Michigan - Center for Information Technology Integ
+141.212.112.5 #babylon.citi.umich.edu
>sph.umich.edu #University of Michigan -- School of Public Health
141.211.51.137 #afssph7.sph.umich.edu
141.211.51.139 #afssph0.sph.umich.edu
@@ -356,6 +401,8 @@
144.92.13.16 #moe.cae.wisc.edu
>hep.wisc.edu #University of Wisconsin -- High Energy Physics
128.104.28.219 #anise.hep.wisc.edu
+144.92.180.7 #rosemary.hep.wisc.edu
+144.92.180.30 #fennel.hep.wisc.edu
>physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department
128.104.160.13 #kendra.physics.wisc.edu
128.104.160.14 #fray.physics.wisc.edu
@@ -374,16 +421,20 @@
>dapnia.saclay.cea.fr #CEA DAPNIA
132.166.32.7 #dphrsg.saclay.cea.fr
132.166.32.12 #dphrsl.saclay.cea.fr
->grif.fr #GRIF cell
-192.54.208.18 #node03.datagrid.cea.fr
>in2p3.fr #IN2P3 production cell
+134.158.104.11 #ccafsdb01.in2p3.fr
+134.158.104.12 #ccafsdb02.in2p3.fr
134.158.232.11 #ccafsdb1.in2p3.fr
134.158.232.12 #ccafsdb2.in2p3.fr
134.158.232.13 #ccafsdb3.in2p3.fr
+>mcc.ac.gb #University of Manchester
+130.88.203.41 #nevis.mc.man.ac.uk
+130.88.203.144 #eryri.mc.man.ac.uk
+130.88.203.145 #scafell.mc.man.ac.uk
>anl.gov #Argonne National Laboratory
-146.137.96.33 #arteus.ctd.anl.gov
-146.137.162.88 #agamemnon.ctd.anl.gov
-146.137.194.80 #antenor.ctd.anl.gov
+146.137.96.33 #arteus.it.anl.gov
+146.137.162.88 #agamemnon.it.anl.gov
+146.137.194.80 #antenor.it.anl.gov
>rhic.bnl.gov #Relativistic Heavy Ion Collider
130.199.6.51 #rafs03.rcf.bnl.gov
130.199.6.52 #rafs02.rcf.bnl.gov
@@ -406,6 +457,8 @@
128.55.128.250 #mars.nersc.gov
128.55.128.252 #alfred.nersc.gov
128.55.128.254 #lurch.nersc.gov
+>doe.atomki.hu #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary
+193.6.179.31 #afs.doe.atomki.hu
>bme.hu #Budapest University of Technology and Economics
152.66.241.6 #afs.iit.bme.hu
>kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H
@@ -418,15 +471,15 @@
192.107.54.5 #aixfs.frascati.enea.it
192.107.54.11 #rs2ced.frascati.enea.it
192.107.54.12 #43p.frascati.enea.it
-192.107.61.235 #serverinfo02.bologna.enea.it
-192.107.71.6 #glauco.casaccia.enea.it
-192.107.96.233 #riscdb.trisaia.enea.it
>fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy
192.107.90.2 #fusafs1.frascati.enea.it
192.107.90.3 #fusafs2.frascati.enea.it
192.107.90.4 #fusafs3.frascati.enea.it
>icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy
193.204.6.130 #icembfs.caspur.it
+>ictp.it #The Abdus Salam International Centre for Theoretical Physics (IC
+140.105.34.7 #afsdb1.ictp.it
+140.105.34.8 #afsdb2.ictp.it
>infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
131.154.1.7 #afscnaf.infn.it
141.108.26.75 #afsrm1.roma1.infn.it
@@ -444,18 +497,19 @@
193.206.84.121 #afs1.lnf.infn.it
193.206.84.122 #afs2.lnf.infn.it
193.206.84.123 #afs3.lnf.infn.it
->lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso
-192.84.135.21 #rsgs05.lngs.infn.it
+>lngs.infn.it #INFN, Laboratori Nazionali del Gran Sasso
+192.84.135.21 #afs1.lngs.infn.it
+192.84.135.133 #afs2.lngs.infn.it
>pi.infn.it #INFN, Sezione di Pisa
-131.114.134.26 #unknownhost.pi.infn.it
192.84.133.50 #aix1.pi.infn.it
+212.189.152.6 #afs1.pi.infn.it
+212.189.152.7 #afs2.pi.infn.it
+>roma3.infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
+193.205.159.17 #afsrm3.roma3.infn.it
>psm.it #Progetto San Marco, Universita' di Roma-1
151.100.1.65 #atlante.psm.uniroma1.it
>tgrid.it #CASPUR-CILEA-CINECA Grid Cell
193.204.5.33 #cccgrid.caspur.it
->ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC
-140.105.16.8 #fs1.ictp.trieste.it
-140.105.16.9 #fs2.ictp.trieste.it
>math.unifi.it #math.unifi.it
150.217.34.182 #xeno.math.unifi.it
>ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria
@@ -469,76 +523,96 @@
193.204.161.138 #gamma.dia.uniroma3.it
>italia #Italian public AFS cell
193.204.5.9 #afs.caspur.it
->cmf.nrl.navy.mil #Naval Research Lab - CCS
-134.207.10.68 #picard.cmf.nrl.navy.mil
-134.207.10.69 #riker.cmf.nrl.navy.mil
-134.207.10.70 #kirk.cmf.nrl.navy.mil
+>cmf.nrl.navy.mil #Naval Research Laboratory - Center for Computational Science
+134.207.12.68 #picard.cmf.nrl.navy.mil
+134.207.12.69 #riker.cmf.nrl.navy.mil
+134.207.12.70 #kirk.cmf.nrl.navy.mil
>lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics
132.250.114.2 #afs1.lcp.nrl.navy.mil
132.250.114.4 #afs2.lcp.nrl.navy.mil
132.250.114.6 #afs3.lcp.nrl.navy.mil
+>crossproduct.net #crossproduct.net
+207.114.88.164 #enigma.crossproduct.net
+>epitech.net #EPITECH, France
+163.5.255.41 #afs-db-1.epitech.net
+163.5.255.42 #afs-db-2.epitech.net
>es.net #Energy Sciences Net
198.128.3.21 #fs1.es.net
198.128.3.22 #fs2.es.net
198.128.3.23 #fs3.es.net
+>gorlaeus.net #Gorlaeus Laboratories, Leiden University
+132.229.170.27 #fwncisafs1.gorlaeus.net
>laroia.net #Laroia Networks
66.66.102.254 #supercore.laroia.net
>sinenomine.net #Sine Nomine Associates
-192.204.203.218 #va.sinenomine.net
+72.73.25.18 #afsdb2.sinenomine.net
+72.73.30.74 #afsdb3.sinenomine.net
+74.121.192.42 #afsdb1.sinenomine.net
>slackers.net #The Slackers' Network
-63.201.48.27 #alexandria.slackers.net
+199.4.150.159 #alexandria.slackers.net
>tproa.net #The People's Republic of Ames
-72.13.4.23 #service-3.tproa.net
-72.13.4.24 #service-4.tproa.net
-72.13.4.25 #service-5.tproa.net
+204.11.35.83 #service-3.tproa.net
+204.11.35.84 #service-4.tproa.net
+204.11.35.85 #service-5.tproa.net
+>interdose.net #Interdose Ltd. & Co. KG, Germany
+80.190.171.42 #bfd9000.tow5.interdose.net
+80.190.171.43 #bfd9001.tow5.interdose.net
>nikhef.nl #The Dutch National Institute for High Energy Physics
192.16.185.26 #afs1.nikhef.nl
192.16.185.27 #afs2.nikhef.nl
>1ts.org #1TS.ORG, Cambridge, MA
-69.25.196.51 #pancake.1ts.org
+69.25.196.126 #neuromancer.1ts.org
>acm-csuf.org #California State Univerisity Fullerton ACM
137.151.29.193 #afs1.acm-csuf.org
+>adrake.org #adrake.org
+128.2.98.241 #afs.adrake.org
>bazquux.org #Baz Quux Organization
66.207.142.196 #baxquux.org
>coed.org #Adam Pennington's Cell
66.93.61.184 #vice1.coed.org
128.237.157.35 #vice3.coed.org
>dementia.org #Dementia Unlimited
-128.2.12.45 #alycia.dementia.org
-128.2.120.216 #meredith.dementia.org
->hackish.org #Hackish.org
-24.167.65.213 #avatar.sys.hackish.org
-128.2.120.138 #kurma.sys.hackish.org
+128.2.13.209 #dedlock.dementia.org
+128.2.235.26 #meredith.dementia.org
>idahofuturetruck.org #University of Idaho hybrid vehicle development
12.18.238.210 #dsle210.fsr.net
->nimlabs.org #Nimlabs, Ink. Cell.
-18.238.1.103 #olfin.nimlabs.org
-18.238.1.105 #caerbanog.nimlabs.org
+>jeaton.org #jeaton.org (Jeffrey Eaton, jeaton(a)jeaton.org)
+128.2.234.89 #jeaton-org-01.jeaton.org
+128.2.234.92 #jeaton-org-02.jeaton.org
+>mrow.org #MROW.ORG and RITLUG Cell
+88.198.46.111 #mrow.org
+129.21.205.119 #mirror.rit.edu
+>mrph.org #Mrph
+66.207.133.1 #sanber.mrph.org
+128.2.99.209 #hernandarias.mrph.org
+>mstacm.org #Missouri Science & Technology - ACM
+131.151.249.193 #acm.mst.edu
>nomh.org #nomh.org
204.29.154.12 #iota.nomh.org
204.29.154.32 #adversity.xi.nomh.org
>oc7.org #The OC7 Project
128.2.122.140 #knife.oc7.org
207.22.77.170 #spoon.oc7.org
+>pfriedma.org #pfriedma.org
+72.95.215.18 #vice.pfriedma.org
+>riscpkg.org #The RISC OS Packaging Project
+83.104.175.10 #delenn.riscpkg.org
>kth.se #Royal Institute of Technology, Stockholm, Sweden
130.237.32.145 #sonen.e.kth.se
130.237.48.7 #anden.e.kth.se
130.237.48.244 #fadern.e.kth.se
->hallf.kth.se #Royal Institute of Technology, HALLF
-130.237.24.11 #afs1.hallf.kth.se
-130.237.24.104 #afs2.hallf.kth.se
>isk.kth.se #Royal Institute of Technology, ISK
-130.237.202.3 #afsdb1.isk.kth.se
-130.237.209.5 #afsdb2.isk.kth.se
-130.237.209.9 #afsdb3.isk.kth.se
+130.237.216.17 #afsdb1.isk.kth.se
+130.237.216.82 #afsdb2.isk.kth.se
+130.237.216.83 #afsdb3.isk.kth.se
>it.kth.se #Royal Institute of Technology, IT
130.237.212.15 #ptah.it.kth.se
130.237.212.16 #toth.it.kth.se
130.237.215.7 #isis.it.kth.se
>md.kth.se #Royal Institute of Technology, MMK
+130.237.57.21 #euler.md.kth.se
130.237.57.68 #trinity.md.kth.se
130.237.57.72 #morpheus.md.kth.se
-130.237.67.230 #neo.speech.kth.se
>mech.kth.se #Royal Institute of Technology, MECH
130.237.233.142 #matterhorn.mech.kth.se
130.237.233.143 #castor.mech.kth.se
@@ -572,8 +646,12 @@
194.249.156.1 #brenta.ijs.si
>p-ng.si #Nova Gorica Polytechnic
193.2.120.2 #solkan.p-ng.si
->phy.bris.ac.uk #Bristol University - phyics
-137.222.58.9 #afs1.phy.bris.ac.uk
+>ihep.su #Institute for High-Energy Physics
+194.190.165.195 #afssrv00.ihep.su
+>hep-ex.physics.metu.edu.tr #METU Department of Physics, Experimental HEP group, Ankara/Turke
+144.122.31.131 #neutrino.physics.metu.edu.tr
+>phy.bris.ac.uk #Bristol University - physics
+137.222.74.18 #zen.phy.bris.ac.uk
>inf.ed.ac.uk #School of Informatics, University of Edinburgh
129.215.64.16 #afsdb0.inf.ed.ac.uk
129.215.64.17 #afsdb1.inf.ed.ac.uk
@@ -586,4 +664,6 @@
194.36.2.4 #afs2.hep.man.ac.uk
194.36.2.5 #afs3.hep.man.ac.uk
>rl.ac.uk #Rutherford Appleton Lab, England
-130.246.183.164 #wallace.cc.rl.ac.uk
+130.246.183.203 #afs1.gridpp.rl.ac.uk
+130.246.183.204 #afs2.gridpp.rl.ac.uk
+130.246.183.205 #afs3.gridpp.rl.ac.uk
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/openafs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openafs.spec 11 Jan 2011 03:26:58 -0000 1.5
+++ openafs.spec 2 Mar 2011 20:57:58 -0000 1.6
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.4.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -298,6 +298,11 @@
%changelog
+* Wed Mar 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-2
+- Update the CellServDB to the current list from
+ http://dl.central.org/dl/cellservdb/CellServDB
+- This addresses Bug #1646
+
* Mon Jan 10 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
13 years, 8 months
- 1
- 0
rpms/openafs/F-14 CellServDB,1.1,1.2 openafs.spec,1.5,1.6
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11471
Modified Files:
CellServDB openafs.spec
Log Message:
* Wed Mar 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-2
- Update the CellServDB to the current list from
http://dl.central.org/dl/cellservdb/CellServDB
- This addresses Bug #1646
Index: CellServDB
===================================================================
RCS file: /cvs/free/rpms/openafs/F-14/CellServDB,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CellServDB 10 Jun 2010 21:14:05 -0000 1.1
+++ CellServDB 2 Mar 2011 20:57:11 -0000 1.2
@@ -1,5 +1,5 @@
->grand.central.org #GCO Public CellServDB 05 Jul 2007
-18.92.0.108 #grand-opening.mit.edu
+>grand.central.org #GCO Public CellServDB 13 Dec 2010
+18.9.48.14 #grand.mit.edu
128.2.203.61 #penn.central.org
130.237.48.87 #andrew.e.kth.se
>wu-wien.ac.at #University of Economics, Vienna, Austria
@@ -11,9 +11,9 @@
193.170.243.12 #baloo.oeaw.ac.at
193.170.243.14 #akela.oeaw.ac.at
>cgv.tugraz.at #CGV cell
-129.27.224.133 #phobos.cgv.tugraz.at
-129.27.224.134 #deimos.cgv.tugraz.at
-129.27.224.210 #trinculo.cgv.tugraz.at
+129.27.218.30 #phobos.cgv.tugraz.at
+129.27.218.31 #deimos.cgv.tugraz.at
+129.27.218.32 #trinculo.cgv.tugraz.at
>itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus
129.27.161.7 #faepafs1.tu-graz.ac.at
129.27.161.15 #faepafs2.tu-graz.ac.at
@@ -21,6 +21,10 @@
>sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi
132.216.24.122 #germain.sums.math.mcgill.ca
132.216.24.125 #turing.sums.math.mcgill.ca
+>ualberta.ca #University of Alberta
+129.128.1.131 #file13.ucs.ualberta.ca
+129.128.98.17 #mystery.ucs.ualberta.ca
+129.128.125.40 #drake.ucs.ualberta.ca
>cern.ch #European Laboratory for Particle Physics, Geneva
137.138.128.148 #afsdb1.cern.ch
137.138.246.50 #afsdb3.cern.ch
@@ -33,78 +37,105 @@
128.178.109.112 #kd2.epfl.ch
128.178.109.113 #kd3.epfl.ch
>ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland
-129.132.97.19 #amalthea.ethz.ch
-129.132.97.27 #nethzafs-001.ethz.ch
-129.132.115.3 #himalia.ethz.ch
-129.132.115.37 #nethzafs-005.ethz.ch
-129.132.115.38 #nethzafs-006.ethz.ch
+82.130.118.32 #afs-db-1.ethz.ch
>psi.ch #Paul Scherrer Institut - Villigen, Switzerland
129.129.190.140 #afs00.psi.ch
129.129.190.141 #afs01.psi.ch
129.129.190.142 #afs02.psi.ch
>extundo.com #Simon Josefsson's cell
195.42.214.241 #slipsten.extundo.com
+>freedaemon.com #Free Daemon Consulting, Oklahoma City, OK, USA
+66.210.104.254 #afs0.freedaemon.com
>membrain.com #membrain.com
66.93.118.125 #stormy
130.85.24.11 #weasel
130.85.24.13 #straykitten
->midnightlinux.com #Midnight Linux, Pittsburgh PA
-208.10.142.82 #outpost.midnightlinux.com
>setfilepointer.com #SetFilePointer.com
-63.224.10.2 #hamlet.SetFilePointer.com
-63.224.10.4 #troilus.SetFilePointer.com
+69.164.193.174 #alpha.setfilepointer.com
+174.143.159.53 #beta.setfilepointer.com
>sodre.cx #Sodre.cx
128.8.140.165 #greed.sodre.cx
+>ruk.cuni.cz #Charles University Computer Centre, Prague, CR
+195.113.0.36 #asterix.ruk.cuni.cz
+195.113.0.37 #obelix.ruk.cuni.cz
+195.113.0.40 #sal.ruk.cuni.cz
+>ics.muni.cz #Masaryk university
+147.251.3.11 #grond.ics.muni.cz
+147.251.3.15 #nimloth.ics.muni.cz
+147.251.3.19 #sirion.ics.muni.cz
+>zcu.cz #University of West Bohemia, Czech Republic
+147.228.10.18 #sauron.zcu.cz
+147.228.52.10 #oknos.zcu.cz
+147.228.52.17 #nic.zcu.cz
>desy.de #Deutsches Elektronen-Synchrotron
-131.169.40.62 #vayu.desy.de
+131.169.2.19 #afsdb2.desy.de
+131.169.2.20 #afsdb3.desy.de
131.169.244.60 #solar00.desy.de
>gppc.de #GPP Chemnitz mbH
213.187.92.33 #gpp1.gppc.de
213.187.92.34 #paulchen.gppc.de
213.187.92.35 #lotus.gppc.de
+>cms.hu-berlin.de #Humboldt University Berlin
+141.20.1.65 #commodus.cms.hu-berlin.de
+141.20.1.66 #faustinus.cms.hu-berlin.de
+141.20.1.67 #marcellus.cms.hu-berlin.de
>ifh.de #DESY Zeuthen
141.34.22.10 #romulus.ifh.de
141.34.22.11 #remus.ifh.de
141.34.22.29 #hekate.ifh.de
+>integra-ev.de #INTEGRA e.V.
+134.155.48.8 #afsdb2.integra-ev.de
+134.155.48.63 #afsdb1.integra-ev.de
>lrz-muenchen.de #Leibniz Computing Centre, Germany
129.187.10.36 #afs1.lrz-muenchen.de
129.187.10.56 #afs3.lrz-muenchen.de
129.187.10.57 #afs2.lrz-muenchen.de
>ipp-garching.mpg.de #Institut fuer Plasmaphysik
130.183.9.5 #afs-db1.rzg.mpg.de
+130.183.14.14 #afs-db3.bc.rzg.mpg.de
130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de
-130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de
>mpe.mpg.de #MPE cell
130.183.130.7 #irafs1.mpe-garching.mpg.de
130.183.134.20 #irafs2.mpe-garching.mpg.de
+>nicsys.de #NICsys GbR
+213.187.80.3 #attila.nicsys.de
>i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
137.226.244.79 #remus.informatik.rwth-aachen.de
+>combi.tfh-wildau.de #Philips Research Lab
+194.95.50.106 #joda13.combi.tfh-wildau.de
>tu-bs.de #Technical University of Braunschweig, Germany
134.169.1.1 #rzafs1.rz.tu-bs.de
134.169.1.5 #rzafs2.rz.tu-bs.de
134.169.1.6 #rzafs3.rz.tu-bs.de
>tu-chemnitz.de #Technische Universitaet Chemnitz, Germany
134.109.2.1 #zuse.hrz.tu-chemnitz.de
+134.109.2.2 #andrew.hrz.tu-chemnitz.de
134.109.2.15 #phoenix.hrz.tu-chemnitz.de
-134.109.200.7 #aetius.hrz.tu-chemnitz.de
>e18.ph.tum.de #Experimental Physics, TU Munich, Germany
+129.187.154.165 #dionysos.e18.physik.tu-muenchen.de
129.187.154.223 #hamlet.e18.physik.tu-muenchen.de
->uni-bonn.de #University of Bonn, Computing Center
-131.220.14.198 #work15-eth.rhrz.uni-bonn.de
-131.220.14.205 #node05.rhrz.uni-bonn.de
-131.220.15.197 #afs-db1.rhrz.uni-bonn.de
>atlass01.physik.uni-bonn.de #Bonn ATLAS
131.220.165.43 #atlass01.physik.uni-bonn.de
>uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg
-132.230.6.235 #sv6.ruf.uni-freiburg.de
-132.230.6.236 #sv7.ruf.uni-freiburg.de
132.230.6.237 #sv8.ruf.uni-freiburg.de
->physik.uni-freiburg.de #institute of physics, university Freiburg, Germany
+132.230.6.239 #sv10.ruf.uni-freiburg.de
+>physik.uni-freiburg.de #Institute of Physics, University Freiburg, Germany
+132.230.6.234 #afs1.ruf.uni-freiburg.de
+132.230.6.235 #afs2.ruf.uni-freiburg.de
132.230.77.16 #hepafs.physik.uni-freiburg.de
+>physnet.uni-hamburg.de #PHYSnet-Rechenzentrum university of hamburg
+134.100.106.44 #afs-core.physnet.uni-hamburg.de
+134.100.106.45 #afs-core2.physnet.uni-hamburg.de
+134.100.106.47 #afs-core3.physnet.uni-hamburg.de
+>mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut)
+129.206.26.241 #hactar.mathi.uni-heidelberg.de
>urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum)
129.206.119.10 #afsdb.urz.uni-heidelberg.de
129.206.119.16 #afsdb1.urz.uni-heidelberg.de
129.206.119.17 #afsdb2.urz.uni-heidelberg.de
+>ziti.uni-heidelberg.de #Institute of Computer Science at the University of Heidelberg
+147.142.42.246 #mp-sun.ziti.uni-heidelberg.de
+147.142.42.252 #mp-pizza.ziti.uni-heidelberg.de
>uni-hohenheim.de #University of Hohenheim
144.41.2.2 #rs13.serv.uni-hohenheim.de
144.41.2.3 #rs14.serv.uni-hohenheim.de
@@ -120,9 +151,10 @@
134.95.144.24 #afs2.meteo.uni-koeln.de
>rrz.uni-koeln.de #University of Cologne - Reg Comp Center
134.95.19.3 #afsdb1.rrz.uni-koeln.de
+134.95.19.4 #afsdb2.rrz.uni-koeln.de
134.95.19.10 #lyra.rrz.uni-koeln.de
134.95.67.97 #afs.thp.uni-koeln.de
-134.95.141.243 #agrippina.rrz.uni-koeln.de
+134.95.112.8 #ladon.rrz.uni-koeln.de
>physik.uni-mainz.de #institute of physics, university Mainz, Germany
134.93.130.93 #hardy.physik.uni-mainz.de
>uni-mannheim.de #Uni Mannheim (Rechenzentrum)
@@ -147,28 +179,42 @@
129.219.10.70 #authen1.asu.edu
129.219.10.72 #authen3.asu.edu
129.219.100.16 #authen4.asu.edu
->hep.caltech.edu #CalTech High Energy Physics
-131.215.126.150 #afs.hep.caltech.edu
+>mars.asu.edu #Mars Space Flight Facility - ASU Mars Research
+149.169.146.57 #kdc1.mars.asu.edu
+149.169.146.58 #kdc2.mars.asu.edu
+149.169.146.59 #kdc3.mars.asu.edu
+>eecs.berkeley.edu #University of California, Berkeley - EECS Dept.
+128.32.139.34 #greed.eecs.berkeley.edu
+128.32.139.35 #gluttony.eecs.berkeley.edu
+169.229.60.112 #envy.eecs.berkeley.edu
+>hep.caltech.edu #Caltech High Energy Physics
+131.215.116.20 #afs.hep.caltech.edu
+>ugcs.caltech.edu #Caltech UGCS lab
+131.215.176.65 #afs-c.ugcs.caltech.edu
+131.215.176.67 #afs-a.ugcs.caltech.edu
+131.215.176.68 #afs-b.ugcs.caltech.edu
>clarkson.edu #Clarkson University, Potsdam, New York USA
128.153.1.111 #arthur.clarkson.edu
128.153.9.111 #lancelot.clarkson.edu
128.153.17.111 #uther.clarkson.edu
>andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell
-128.2.10.2 #vice2.fs.andrew.cmu.edu
-128.2.10.7 #vice7.fs.andrew.cmu.edu
-128.2.10.11 #vice11.fs.andrew.cmu.edu
-128.2.10.28 #vice28.fs.andrew.cmu.edu
-128.2.32.44 #new-vice12.fs.andrew.cmu.edu
+128.2.10.2 #afsdb-01.andrew.cmu.edu
+128.2.10.7 #afsdb-02.andrew.cmu.edu
+128.2.10.11 #afsdb-03.andrew.cmu.edu
+>mw.andrew.cmu.edu #Carnegie Mellon University - Middleware Test Cell
+128.2.234.24 #null.andrew.cmu.edu
+128.2.234.170 #mw-mgr.andrew.cmu.edu
>club.cc.cmu.edu #Carnegie Mellon University Computer Club
+128.2.204.149 #barium.club.cc.cmu.edu
128.237.157.11 #sodium.club.cc.cmu.edu
128.237.157.13 #potassium.club.cc.cmu.edu
>chem.cmu.edu #Carnegie Mellon University - Chemistry Dept.
128.2.40.134 #afs.chem.cmu.edu
128.2.40.140 #afs2.chem.cmu.edu
>cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci.
-128.2.201.46 #strawberry.srv.cs.cmu.edu
-128.2.201.47 #pumpkin.srv.cs.cmu.edu
-128.2.201.48 #cherry.srv.cs.cmu.edu
+128.2.172.58 #date.srv.cs.cmu.edu
+128.2.172.60 #fig.srv.cs.cmu.edu
+128.2.200.97 #watermelon.srv.cs.cmu.edu
>ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept.
128.2.129.7 #porok.ece.cmu.edu
128.2.129.8 #vicio.ece.cmu.edu
@@ -184,6 +230,11 @@
>cnf.cornell.edu #CNF
128.253.198.9 #hole.cnf.cornell.edu
128.253.198.27 #smoke.cnf.cornell.edu
+128.253.198.231 #mist.cnf.cornell.edu
+>math.cornell.edu #Cornell Math Dept
+128.84.234.12 #pooh.math.cornell.edu
+128.84.234.16 #bernoulli.math.cornell.edu
+128.84.234.162 #dyno.math.cornell.edu
>msc.cornell.edu #Cornell University Materials Science Center
128.84.231.242 #miranda.ccmr.cornell.edu
128.84.241.35 #co.ccmr.cornell.edu
@@ -194,42 +245,48 @@
129.170.30.145 #dbicafs3.dartmouth.edu
>northstar.dartmouth.edu #Dartmouth College Research Computing
129.170.16.22 #halley.dartmouth.edu
-129.170.16.42 #oort.dartmouth.edu
+129.170.16.26 #andromeda.dartmouth.edu
129.170.16.43 #cygnusx1.dartmouth.edu
->cs.fhm.edu #Department Computer Science Munich University Of Applied Science
+>cs.hm.edu #Department Computer Science Munich University Of Applied Science
129.187.208.2 #srv1.informatik.fh-muenchen.de
>eecs.harvard.edu #Harvard - EECS
-140.247.60.61 #zermelo.eecs.harvard.edu
+140.247.60.64 #lefkada.eecs.harvard.edu
140.247.60.83 #corfu.eecs.harvard.edu
>iastate.edu #Iowa State University
129.186.1.243 #afsdb-1.iastate.edu
129.186.6.243 #afsdb-2.iastate.edu
129.186.142.243 #afsdb-3.iastate.edu
>athena.mit.edu #MIT/Athena cell
-18.7.1.66 #paris.mit.edu.
-18.7.1.74 #chimera.mit.edu.
-18.158.0.37 #prill.mit.edu.
+18.3.48.11 #aether.mit.edu
+18.9.48.11 #castor.mit.edu
+18.9.48.12 #pollux.mit.edu
>dev.mit.edu #MIT/IS Development cell
-18.7.1.70 #wham.mit.edu.
-18.92.1.219 #click.mit.edu.
-18.92.1.220 #whirr.mit.edu.
+18.9.48.13 #saw.mit.edu.
+18.9.60.110 #hammer.mit.edu.
+18.9.60.111 #screw.mit.edu.
>net.mit.edu #MIT/Network Group cell
18.7.7.73 #gracie.mit.edu
18.7.21.95 #george.mit.edu
+>numenor.mit.edu #Project Numenor
+18.243.2.49 #numenor.mit.edu
>sipb.mit.edu #MIT/SIPB cell
-18.181.0.19 #reynelda.mit.edu.
-18.181.0.22 #rosebud.mit.edu.
-18.181.0.23 #ronald-ann.mit.edu.
+18.181.0.19 #reynelda.mit.edu
+18.181.0.22 #rosebud.mit.edu
+18.181.0.23 #ronald-ann.mit.edu
>soap.mit.edu #MIT School Of Architecture & Planning
18.89.1.204 #crypt.mit.edu
-18.89.1.209 #grotto.mit.edu
-18.89.2.156 #ac.mit.edu
+18.89.3.46 #soap.mit.edu
+18.89.4.9 #arch.mit.edu
>msu.edu #Michigan State University Main Cell
35.9.7.10 #afsdb0.cl.msu.edu
>nd.edu #University of Notre Dame
129.74.223.17 #john.helios.nd.edu
129.74.223.33 #lizardo.helios.nd.edu
129.74.223.65 #buckaroo.helios.nd.edu
+>crc.nd.edu #University of Notre Dame - Center for Research Computing
+129.74.85.34 #afsdb1.crc.nd.edu
+129.74.85.35 #afsdb2.crc.nd.edu
+129.74.85.36 #afsdb3.crc.nd.edu
>pitt.edu #University of Pittsburgh
136.142.8.15 #afs09.srv.cis.pitt.edu
136.142.8.20 #afs10.srv.cis.pitt.edu
@@ -273,14 +330,6 @@
134.79.18.25 #afsdb1.slac.stanford.edu
134.79.18.26 #afsdb2.slac.stanford.edu
134.79.18.27 #afsdb3.slac.stanford.edu
->ucdavis.edu #University of California at Davis
-169.237.104.100 #afs1.ucdavis.edu
-169.237.235.176 #afs2.ucdavis.edu
-169.237.247.91 #afs3.ucdavis.edu
->home.ucdavis.edu #University of California at Davis home directories
-169.237.105.91 #home1.ucdavis.edu
-169.237.105.92 #home2.ucdavis.edu
-169.237.105.93 #home3.ucdavis.edu
>physics.ucsb.edu #UC Santa Barbara, Physics Dept
128.111.18.161 #ledzeppelin.physics.ucsb.edu
>cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A
@@ -319,12 +368,8 @@
141.211.43.102 #linat02.grid.umich.edu
141.211.43.103 #linat03.grid.umich.edu
141.211.43.104 #linat04.grid.umich.edu
->citi.umich.edu #Center for Information Technology Integration
-141.211.133.5 #babylon.citi.umich.edu
->lsa.umich.edu #University of Michigan - College of LS&A
-141.211.211.53 #gerow.lsa.umich.edu
-141.211.211.72 #collines.lsa.umich.edu
-141.211.211.153 #hodges.lsa.umich.edu
+>citi.umich.edu #University of Michigan - Center for Information Technology Integ
+141.212.112.5 #babylon.citi.umich.edu
>sph.umich.edu #University of Michigan -- School of Public Health
141.211.51.137 #afssph7.sph.umich.edu
141.211.51.139 #afssph0.sph.umich.edu
@@ -356,6 +401,8 @@
144.92.13.16 #moe.cae.wisc.edu
>hep.wisc.edu #University of Wisconsin -- High Energy Physics
128.104.28.219 #anise.hep.wisc.edu
+144.92.180.7 #rosemary.hep.wisc.edu
+144.92.180.30 #fennel.hep.wisc.edu
>physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department
128.104.160.13 #kendra.physics.wisc.edu
128.104.160.14 #fray.physics.wisc.edu
@@ -374,16 +421,20 @@
>dapnia.saclay.cea.fr #CEA DAPNIA
132.166.32.7 #dphrsg.saclay.cea.fr
132.166.32.12 #dphrsl.saclay.cea.fr
->grif.fr #GRIF cell
-192.54.208.18 #node03.datagrid.cea.fr
>in2p3.fr #IN2P3 production cell
+134.158.104.11 #ccafsdb01.in2p3.fr
+134.158.104.12 #ccafsdb02.in2p3.fr
134.158.232.11 #ccafsdb1.in2p3.fr
134.158.232.12 #ccafsdb2.in2p3.fr
134.158.232.13 #ccafsdb3.in2p3.fr
+>mcc.ac.gb #University of Manchester
+130.88.203.41 #nevis.mc.man.ac.uk
+130.88.203.144 #eryri.mc.man.ac.uk
+130.88.203.145 #scafell.mc.man.ac.uk
>anl.gov #Argonne National Laboratory
-146.137.96.33 #arteus.ctd.anl.gov
-146.137.162.88 #agamemnon.ctd.anl.gov
-146.137.194.80 #antenor.ctd.anl.gov
+146.137.96.33 #arteus.it.anl.gov
+146.137.162.88 #agamemnon.it.anl.gov
+146.137.194.80 #antenor.it.anl.gov
>rhic.bnl.gov #Relativistic Heavy Ion Collider
130.199.6.51 #rafs03.rcf.bnl.gov
130.199.6.52 #rafs02.rcf.bnl.gov
@@ -406,6 +457,8 @@
128.55.128.250 #mars.nersc.gov
128.55.128.252 #alfred.nersc.gov
128.55.128.254 #lurch.nersc.gov
+>doe.atomki.hu #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary
+193.6.179.31 #afs.doe.atomki.hu
>bme.hu #Budapest University of Technology and Economics
152.66.241.6 #afs.iit.bme.hu
>kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H
@@ -418,15 +471,15 @@
192.107.54.5 #aixfs.frascati.enea.it
192.107.54.11 #rs2ced.frascati.enea.it
192.107.54.12 #43p.frascati.enea.it
-192.107.61.235 #serverinfo02.bologna.enea.it
-192.107.71.6 #glauco.casaccia.enea.it
-192.107.96.233 #riscdb.trisaia.enea.it
>fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy
192.107.90.2 #fusafs1.frascati.enea.it
192.107.90.3 #fusafs2.frascati.enea.it
192.107.90.4 #fusafs3.frascati.enea.it
>icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy
193.204.6.130 #icembfs.caspur.it
+>ictp.it #The Abdus Salam International Centre for Theoretical Physics (IC
+140.105.34.7 #afsdb1.ictp.it
+140.105.34.8 #afsdb2.ictp.it
>infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
131.154.1.7 #afscnaf.infn.it
141.108.26.75 #afsrm1.roma1.infn.it
@@ -444,18 +497,19 @@
193.206.84.121 #afs1.lnf.infn.it
193.206.84.122 #afs2.lnf.infn.it
193.206.84.123 #afs3.lnf.infn.it
->lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso
-192.84.135.21 #rsgs05.lngs.infn.it
+>lngs.infn.it #INFN, Laboratori Nazionali del Gran Sasso
+192.84.135.21 #afs1.lngs.infn.it
+192.84.135.133 #afs2.lngs.infn.it
>pi.infn.it #INFN, Sezione di Pisa
-131.114.134.26 #unknownhost.pi.infn.it
192.84.133.50 #aix1.pi.infn.it
+212.189.152.6 #afs1.pi.infn.it
+212.189.152.7 #afs2.pi.infn.it
+>roma3.infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
+193.205.159.17 #afsrm3.roma3.infn.it
>psm.it #Progetto San Marco, Universita' di Roma-1
151.100.1.65 #atlante.psm.uniroma1.it
>tgrid.it #CASPUR-CILEA-CINECA Grid Cell
193.204.5.33 #cccgrid.caspur.it
->ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC
-140.105.16.8 #fs1.ictp.trieste.it
-140.105.16.9 #fs2.ictp.trieste.it
>math.unifi.it #math.unifi.it
150.217.34.182 #xeno.math.unifi.it
>ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria
@@ -469,76 +523,96 @@
193.204.161.138 #gamma.dia.uniroma3.it
>italia #Italian public AFS cell
193.204.5.9 #afs.caspur.it
->cmf.nrl.navy.mil #Naval Research Lab - CCS
-134.207.10.68 #picard.cmf.nrl.navy.mil
-134.207.10.69 #riker.cmf.nrl.navy.mil
-134.207.10.70 #kirk.cmf.nrl.navy.mil
+>cmf.nrl.navy.mil #Naval Research Laboratory - Center for Computational Science
+134.207.12.68 #picard.cmf.nrl.navy.mil
+134.207.12.69 #riker.cmf.nrl.navy.mil
+134.207.12.70 #kirk.cmf.nrl.navy.mil
>lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics
132.250.114.2 #afs1.lcp.nrl.navy.mil
132.250.114.4 #afs2.lcp.nrl.navy.mil
132.250.114.6 #afs3.lcp.nrl.navy.mil
+>crossproduct.net #crossproduct.net
+207.114.88.164 #enigma.crossproduct.net
+>epitech.net #EPITECH, France
+163.5.255.41 #afs-db-1.epitech.net
+163.5.255.42 #afs-db-2.epitech.net
>es.net #Energy Sciences Net
198.128.3.21 #fs1.es.net
198.128.3.22 #fs2.es.net
198.128.3.23 #fs3.es.net
+>gorlaeus.net #Gorlaeus Laboratories, Leiden University
+132.229.170.27 #fwncisafs1.gorlaeus.net
>laroia.net #Laroia Networks
66.66.102.254 #supercore.laroia.net
>sinenomine.net #Sine Nomine Associates
-192.204.203.218 #va.sinenomine.net
+72.73.25.18 #afsdb2.sinenomine.net
+72.73.30.74 #afsdb3.sinenomine.net
+74.121.192.42 #afsdb1.sinenomine.net
>slackers.net #The Slackers' Network
-63.201.48.27 #alexandria.slackers.net
+199.4.150.159 #alexandria.slackers.net
>tproa.net #The People's Republic of Ames
-72.13.4.23 #service-3.tproa.net
-72.13.4.24 #service-4.tproa.net
-72.13.4.25 #service-5.tproa.net
+204.11.35.83 #service-3.tproa.net
+204.11.35.84 #service-4.tproa.net
+204.11.35.85 #service-5.tproa.net
+>interdose.net #Interdose Ltd. & Co. KG, Germany
+80.190.171.42 #bfd9000.tow5.interdose.net
+80.190.171.43 #bfd9001.tow5.interdose.net
>nikhef.nl #The Dutch National Institute for High Energy Physics
192.16.185.26 #afs1.nikhef.nl
192.16.185.27 #afs2.nikhef.nl
>1ts.org #1TS.ORG, Cambridge, MA
-69.25.196.51 #pancake.1ts.org
+69.25.196.126 #neuromancer.1ts.org
>acm-csuf.org #California State Univerisity Fullerton ACM
137.151.29.193 #afs1.acm-csuf.org
+>adrake.org #adrake.org
+128.2.98.241 #afs.adrake.org
>bazquux.org #Baz Quux Organization
66.207.142.196 #baxquux.org
>coed.org #Adam Pennington's Cell
66.93.61.184 #vice1.coed.org
128.237.157.35 #vice3.coed.org
>dementia.org #Dementia Unlimited
-128.2.12.45 #alycia.dementia.org
-128.2.120.216 #meredith.dementia.org
->hackish.org #Hackish.org
-24.167.65.213 #avatar.sys.hackish.org
-128.2.120.138 #kurma.sys.hackish.org
+128.2.13.209 #dedlock.dementia.org
+128.2.235.26 #meredith.dementia.org
>idahofuturetruck.org #University of Idaho hybrid vehicle development
12.18.238.210 #dsle210.fsr.net
->nimlabs.org #Nimlabs, Ink. Cell.
-18.238.1.103 #olfin.nimlabs.org
-18.238.1.105 #caerbanog.nimlabs.org
+>jeaton.org #jeaton.org (Jeffrey Eaton, jeaton(a)jeaton.org)
+128.2.234.89 #jeaton-org-01.jeaton.org
+128.2.234.92 #jeaton-org-02.jeaton.org
+>mrow.org #MROW.ORG and RITLUG Cell
+88.198.46.111 #mrow.org
+129.21.205.119 #mirror.rit.edu
+>mrph.org #Mrph
+66.207.133.1 #sanber.mrph.org
+128.2.99.209 #hernandarias.mrph.org
+>mstacm.org #Missouri Science & Technology - ACM
+131.151.249.193 #acm.mst.edu
>nomh.org #nomh.org
204.29.154.12 #iota.nomh.org
204.29.154.32 #adversity.xi.nomh.org
>oc7.org #The OC7 Project
128.2.122.140 #knife.oc7.org
207.22.77.170 #spoon.oc7.org
+>pfriedma.org #pfriedma.org
+72.95.215.18 #vice.pfriedma.org
+>riscpkg.org #The RISC OS Packaging Project
+83.104.175.10 #delenn.riscpkg.org
>kth.se #Royal Institute of Technology, Stockholm, Sweden
130.237.32.145 #sonen.e.kth.se
130.237.48.7 #anden.e.kth.se
130.237.48.244 #fadern.e.kth.se
->hallf.kth.se #Royal Institute of Technology, HALLF
-130.237.24.11 #afs1.hallf.kth.se
-130.237.24.104 #afs2.hallf.kth.se
>isk.kth.se #Royal Institute of Technology, ISK
-130.237.202.3 #afsdb1.isk.kth.se
-130.237.209.5 #afsdb2.isk.kth.se
-130.237.209.9 #afsdb3.isk.kth.se
+130.237.216.17 #afsdb1.isk.kth.se
+130.237.216.82 #afsdb2.isk.kth.se
+130.237.216.83 #afsdb3.isk.kth.se
>it.kth.se #Royal Institute of Technology, IT
130.237.212.15 #ptah.it.kth.se
130.237.212.16 #toth.it.kth.se
130.237.215.7 #isis.it.kth.se
>md.kth.se #Royal Institute of Technology, MMK
+130.237.57.21 #euler.md.kth.se
130.237.57.68 #trinity.md.kth.se
130.237.57.72 #morpheus.md.kth.se
-130.237.67.230 #neo.speech.kth.se
>mech.kth.se #Royal Institute of Technology, MECH
130.237.233.142 #matterhorn.mech.kth.se
130.237.233.143 #castor.mech.kth.se
@@ -572,8 +646,12 @@
194.249.156.1 #brenta.ijs.si
>p-ng.si #Nova Gorica Polytechnic
193.2.120.2 #solkan.p-ng.si
->phy.bris.ac.uk #Bristol University - phyics
-137.222.58.9 #afs1.phy.bris.ac.uk
+>ihep.su #Institute for High-Energy Physics
+194.190.165.195 #afssrv00.ihep.su
+>hep-ex.physics.metu.edu.tr #METU Department of Physics, Experimental HEP group, Ankara/Turke
+144.122.31.131 #neutrino.physics.metu.edu.tr
+>phy.bris.ac.uk #Bristol University - physics
+137.222.74.18 #zen.phy.bris.ac.uk
>inf.ed.ac.uk #School of Informatics, University of Edinburgh
129.215.64.16 #afsdb0.inf.ed.ac.uk
129.215.64.17 #afsdb1.inf.ed.ac.uk
@@ -586,4 +664,6 @@
194.36.2.4 #afs2.hep.man.ac.uk
194.36.2.5 #afs3.hep.man.ac.uk
>rl.ac.uk #Rutherford Appleton Lab, England
-130.246.183.164 #wallace.cc.rl.ac.uk
+130.246.183.203 #afs1.gridpp.rl.ac.uk
+130.246.183.204 #afs2.gridpp.rl.ac.uk
+130.246.183.205 #afs3.gridpp.rl.ac.uk
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-14/openafs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openafs.spec 10 Jan 2011 23:52:18 -0000 1.5
+++ openafs.spec 2 Mar 2011 20:57:11 -0000 1.6
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.4.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -298,6 +298,11 @@
%changelog
+* Wed Mar 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-2
+- Update the CellServDB to the current list from
+ http://dl.central.org/dl/cellservdb/CellServDB
+- This addresses Bug #1646
+
* Mon Jan 10 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
13 years, 8 months
- 1
- 0
rpms/openafs/devel CellServDB,1.1,1.2 openafs.spec,1.5,1.6
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11255
Modified Files:
CellServDB openafs.spec
Log Message:
* Wed Mar 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-2
- Update the CellServDB to the current list from
http://dl.central.org/dl/cellservdb/CellServDB
- This addresses Bug #1646
Index: CellServDB
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/CellServDB,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CellServDB 10 Jun 2010 21:14:05 -0000 1.1
+++ CellServDB 2 Mar 2011 20:56:31 -0000 1.2
@@ -1,5 +1,5 @@
->grand.central.org #GCO Public CellServDB 05 Jul 2007
-18.92.0.108 #grand-opening.mit.edu
+>grand.central.org #GCO Public CellServDB 13 Dec 2010
+18.9.48.14 #grand.mit.edu
128.2.203.61 #penn.central.org
130.237.48.87 #andrew.e.kth.se
>wu-wien.ac.at #University of Economics, Vienna, Austria
@@ -11,9 +11,9 @@
193.170.243.12 #baloo.oeaw.ac.at
193.170.243.14 #akela.oeaw.ac.at
>cgv.tugraz.at #CGV cell
-129.27.224.133 #phobos.cgv.tugraz.at
-129.27.224.134 #deimos.cgv.tugraz.at
-129.27.224.210 #trinculo.cgv.tugraz.at
+129.27.218.30 #phobos.cgv.tugraz.at
+129.27.218.31 #deimos.cgv.tugraz.at
+129.27.218.32 #trinculo.cgv.tugraz.at
>itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus
129.27.161.7 #faepafs1.tu-graz.ac.at
129.27.161.15 #faepafs2.tu-graz.ac.at
@@ -21,6 +21,10 @@
>sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi
132.216.24.122 #germain.sums.math.mcgill.ca
132.216.24.125 #turing.sums.math.mcgill.ca
+>ualberta.ca #University of Alberta
+129.128.1.131 #file13.ucs.ualberta.ca
+129.128.98.17 #mystery.ucs.ualberta.ca
+129.128.125.40 #drake.ucs.ualberta.ca
>cern.ch #European Laboratory for Particle Physics, Geneva
137.138.128.148 #afsdb1.cern.ch
137.138.246.50 #afsdb3.cern.ch
@@ -33,78 +37,105 @@
128.178.109.112 #kd2.epfl.ch
128.178.109.113 #kd3.epfl.ch
>ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland
-129.132.97.19 #amalthea.ethz.ch
-129.132.97.27 #nethzafs-001.ethz.ch
-129.132.115.3 #himalia.ethz.ch
-129.132.115.37 #nethzafs-005.ethz.ch
-129.132.115.38 #nethzafs-006.ethz.ch
+82.130.118.32 #afs-db-1.ethz.ch
>psi.ch #Paul Scherrer Institut - Villigen, Switzerland
129.129.190.140 #afs00.psi.ch
129.129.190.141 #afs01.psi.ch
129.129.190.142 #afs02.psi.ch
>extundo.com #Simon Josefsson's cell
195.42.214.241 #slipsten.extundo.com
+>freedaemon.com #Free Daemon Consulting, Oklahoma City, OK, USA
+66.210.104.254 #afs0.freedaemon.com
>membrain.com #membrain.com
66.93.118.125 #stormy
130.85.24.11 #weasel
130.85.24.13 #straykitten
->midnightlinux.com #Midnight Linux, Pittsburgh PA
-208.10.142.82 #outpost.midnightlinux.com
>setfilepointer.com #SetFilePointer.com
-63.224.10.2 #hamlet.SetFilePointer.com
-63.224.10.4 #troilus.SetFilePointer.com
+69.164.193.174 #alpha.setfilepointer.com
+174.143.159.53 #beta.setfilepointer.com
>sodre.cx #Sodre.cx
128.8.140.165 #greed.sodre.cx
+>ruk.cuni.cz #Charles University Computer Centre, Prague, CR
+195.113.0.36 #asterix.ruk.cuni.cz
+195.113.0.37 #obelix.ruk.cuni.cz
+195.113.0.40 #sal.ruk.cuni.cz
+>ics.muni.cz #Masaryk university
+147.251.3.11 #grond.ics.muni.cz
+147.251.3.15 #nimloth.ics.muni.cz
+147.251.3.19 #sirion.ics.muni.cz
+>zcu.cz #University of West Bohemia, Czech Republic
+147.228.10.18 #sauron.zcu.cz
+147.228.52.10 #oknos.zcu.cz
+147.228.52.17 #nic.zcu.cz
>desy.de #Deutsches Elektronen-Synchrotron
-131.169.40.62 #vayu.desy.de
+131.169.2.19 #afsdb2.desy.de
+131.169.2.20 #afsdb3.desy.de
131.169.244.60 #solar00.desy.de
>gppc.de #GPP Chemnitz mbH
213.187.92.33 #gpp1.gppc.de
213.187.92.34 #paulchen.gppc.de
213.187.92.35 #lotus.gppc.de
+>cms.hu-berlin.de #Humboldt University Berlin
+141.20.1.65 #commodus.cms.hu-berlin.de
+141.20.1.66 #faustinus.cms.hu-berlin.de
+141.20.1.67 #marcellus.cms.hu-berlin.de
>ifh.de #DESY Zeuthen
141.34.22.10 #romulus.ifh.de
141.34.22.11 #remus.ifh.de
141.34.22.29 #hekate.ifh.de
+>integra-ev.de #INTEGRA e.V.
+134.155.48.8 #afsdb2.integra-ev.de
+134.155.48.63 #afsdb1.integra-ev.de
>lrz-muenchen.de #Leibniz Computing Centre, Germany
129.187.10.36 #afs1.lrz-muenchen.de
129.187.10.56 #afs3.lrz-muenchen.de
129.187.10.57 #afs2.lrz-muenchen.de
>ipp-garching.mpg.de #Institut fuer Plasmaphysik
130.183.9.5 #afs-db1.rzg.mpg.de
+130.183.14.14 #afs-db3.bc.rzg.mpg.de
130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de
-130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de
>mpe.mpg.de #MPE cell
130.183.130.7 #irafs1.mpe-garching.mpg.de
130.183.134.20 #irafs2.mpe-garching.mpg.de
+>nicsys.de #NICsys GbR
+213.187.80.3 #attila.nicsys.de
>i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
137.226.244.79 #remus.informatik.rwth-aachen.de
+>combi.tfh-wildau.de #Philips Research Lab
+194.95.50.106 #joda13.combi.tfh-wildau.de
>tu-bs.de #Technical University of Braunschweig, Germany
134.169.1.1 #rzafs1.rz.tu-bs.de
134.169.1.5 #rzafs2.rz.tu-bs.de
134.169.1.6 #rzafs3.rz.tu-bs.de
>tu-chemnitz.de #Technische Universitaet Chemnitz, Germany
134.109.2.1 #zuse.hrz.tu-chemnitz.de
+134.109.2.2 #andrew.hrz.tu-chemnitz.de
134.109.2.15 #phoenix.hrz.tu-chemnitz.de
-134.109.200.7 #aetius.hrz.tu-chemnitz.de
>e18.ph.tum.de #Experimental Physics, TU Munich, Germany
+129.187.154.165 #dionysos.e18.physik.tu-muenchen.de
129.187.154.223 #hamlet.e18.physik.tu-muenchen.de
->uni-bonn.de #University of Bonn, Computing Center
-131.220.14.198 #work15-eth.rhrz.uni-bonn.de
-131.220.14.205 #node05.rhrz.uni-bonn.de
-131.220.15.197 #afs-db1.rhrz.uni-bonn.de
>atlass01.physik.uni-bonn.de #Bonn ATLAS
131.220.165.43 #atlass01.physik.uni-bonn.de
>uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg
-132.230.6.235 #sv6.ruf.uni-freiburg.de
-132.230.6.236 #sv7.ruf.uni-freiburg.de
132.230.6.237 #sv8.ruf.uni-freiburg.de
->physik.uni-freiburg.de #institute of physics, university Freiburg, Germany
+132.230.6.239 #sv10.ruf.uni-freiburg.de
+>physik.uni-freiburg.de #Institute of Physics, University Freiburg, Germany
+132.230.6.234 #afs1.ruf.uni-freiburg.de
+132.230.6.235 #afs2.ruf.uni-freiburg.de
132.230.77.16 #hepafs.physik.uni-freiburg.de
+>physnet.uni-hamburg.de #PHYSnet-Rechenzentrum university of hamburg
+134.100.106.44 #afs-core.physnet.uni-hamburg.de
+134.100.106.45 #afs-core2.physnet.uni-hamburg.de
+134.100.106.47 #afs-core3.physnet.uni-hamburg.de
+>mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut)
+129.206.26.241 #hactar.mathi.uni-heidelberg.de
>urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum)
129.206.119.10 #afsdb.urz.uni-heidelberg.de
129.206.119.16 #afsdb1.urz.uni-heidelberg.de
129.206.119.17 #afsdb2.urz.uni-heidelberg.de
+>ziti.uni-heidelberg.de #Institute of Computer Science at the University of Heidelberg
+147.142.42.246 #mp-sun.ziti.uni-heidelberg.de
+147.142.42.252 #mp-pizza.ziti.uni-heidelberg.de
>uni-hohenheim.de #University of Hohenheim
144.41.2.2 #rs13.serv.uni-hohenheim.de
144.41.2.3 #rs14.serv.uni-hohenheim.de
@@ -120,9 +151,10 @@
134.95.144.24 #afs2.meteo.uni-koeln.de
>rrz.uni-koeln.de #University of Cologne - Reg Comp Center
134.95.19.3 #afsdb1.rrz.uni-koeln.de
+134.95.19.4 #afsdb2.rrz.uni-koeln.de
134.95.19.10 #lyra.rrz.uni-koeln.de
134.95.67.97 #afs.thp.uni-koeln.de
-134.95.141.243 #agrippina.rrz.uni-koeln.de
+134.95.112.8 #ladon.rrz.uni-koeln.de
>physik.uni-mainz.de #institute of physics, university Mainz, Germany
134.93.130.93 #hardy.physik.uni-mainz.de
>uni-mannheim.de #Uni Mannheim (Rechenzentrum)
@@ -147,28 +179,42 @@
129.219.10.70 #authen1.asu.edu
129.219.10.72 #authen3.asu.edu
129.219.100.16 #authen4.asu.edu
->hep.caltech.edu #CalTech High Energy Physics
-131.215.126.150 #afs.hep.caltech.edu
+>mars.asu.edu #Mars Space Flight Facility - ASU Mars Research
+149.169.146.57 #kdc1.mars.asu.edu
+149.169.146.58 #kdc2.mars.asu.edu
+149.169.146.59 #kdc3.mars.asu.edu
+>eecs.berkeley.edu #University of California, Berkeley - EECS Dept.
+128.32.139.34 #greed.eecs.berkeley.edu
+128.32.139.35 #gluttony.eecs.berkeley.edu
+169.229.60.112 #envy.eecs.berkeley.edu
+>hep.caltech.edu #Caltech High Energy Physics
+131.215.116.20 #afs.hep.caltech.edu
+>ugcs.caltech.edu #Caltech UGCS lab
+131.215.176.65 #afs-c.ugcs.caltech.edu
+131.215.176.67 #afs-a.ugcs.caltech.edu
+131.215.176.68 #afs-b.ugcs.caltech.edu
>clarkson.edu #Clarkson University, Potsdam, New York USA
128.153.1.111 #arthur.clarkson.edu
128.153.9.111 #lancelot.clarkson.edu
128.153.17.111 #uther.clarkson.edu
>andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell
-128.2.10.2 #vice2.fs.andrew.cmu.edu
-128.2.10.7 #vice7.fs.andrew.cmu.edu
-128.2.10.11 #vice11.fs.andrew.cmu.edu
-128.2.10.28 #vice28.fs.andrew.cmu.edu
-128.2.32.44 #new-vice12.fs.andrew.cmu.edu
+128.2.10.2 #afsdb-01.andrew.cmu.edu
+128.2.10.7 #afsdb-02.andrew.cmu.edu
+128.2.10.11 #afsdb-03.andrew.cmu.edu
+>mw.andrew.cmu.edu #Carnegie Mellon University - Middleware Test Cell
+128.2.234.24 #null.andrew.cmu.edu
+128.2.234.170 #mw-mgr.andrew.cmu.edu
>club.cc.cmu.edu #Carnegie Mellon University Computer Club
+128.2.204.149 #barium.club.cc.cmu.edu
128.237.157.11 #sodium.club.cc.cmu.edu
128.237.157.13 #potassium.club.cc.cmu.edu
>chem.cmu.edu #Carnegie Mellon University - Chemistry Dept.
128.2.40.134 #afs.chem.cmu.edu
128.2.40.140 #afs2.chem.cmu.edu
>cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci.
-128.2.201.46 #strawberry.srv.cs.cmu.edu
-128.2.201.47 #pumpkin.srv.cs.cmu.edu
-128.2.201.48 #cherry.srv.cs.cmu.edu
+128.2.172.58 #date.srv.cs.cmu.edu
+128.2.172.60 #fig.srv.cs.cmu.edu
+128.2.200.97 #watermelon.srv.cs.cmu.edu
>ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept.
128.2.129.7 #porok.ece.cmu.edu
128.2.129.8 #vicio.ece.cmu.edu
@@ -184,6 +230,11 @@
>cnf.cornell.edu #CNF
128.253.198.9 #hole.cnf.cornell.edu
128.253.198.27 #smoke.cnf.cornell.edu
+128.253.198.231 #mist.cnf.cornell.edu
+>math.cornell.edu #Cornell Math Dept
+128.84.234.12 #pooh.math.cornell.edu
+128.84.234.16 #bernoulli.math.cornell.edu
+128.84.234.162 #dyno.math.cornell.edu
>msc.cornell.edu #Cornell University Materials Science Center
128.84.231.242 #miranda.ccmr.cornell.edu
128.84.241.35 #co.ccmr.cornell.edu
@@ -194,42 +245,48 @@
129.170.30.145 #dbicafs3.dartmouth.edu
>northstar.dartmouth.edu #Dartmouth College Research Computing
129.170.16.22 #halley.dartmouth.edu
-129.170.16.42 #oort.dartmouth.edu
+129.170.16.26 #andromeda.dartmouth.edu
129.170.16.43 #cygnusx1.dartmouth.edu
->cs.fhm.edu #Department Computer Science Munich University Of Applied Science
+>cs.hm.edu #Department Computer Science Munich University Of Applied Science
129.187.208.2 #srv1.informatik.fh-muenchen.de
>eecs.harvard.edu #Harvard - EECS
-140.247.60.61 #zermelo.eecs.harvard.edu
+140.247.60.64 #lefkada.eecs.harvard.edu
140.247.60.83 #corfu.eecs.harvard.edu
>iastate.edu #Iowa State University
129.186.1.243 #afsdb-1.iastate.edu
129.186.6.243 #afsdb-2.iastate.edu
129.186.142.243 #afsdb-3.iastate.edu
>athena.mit.edu #MIT/Athena cell
-18.7.1.66 #paris.mit.edu.
-18.7.1.74 #chimera.mit.edu.
-18.158.0.37 #prill.mit.edu.
+18.3.48.11 #aether.mit.edu
+18.9.48.11 #castor.mit.edu
+18.9.48.12 #pollux.mit.edu
>dev.mit.edu #MIT/IS Development cell
-18.7.1.70 #wham.mit.edu.
-18.92.1.219 #click.mit.edu.
-18.92.1.220 #whirr.mit.edu.
+18.9.48.13 #saw.mit.edu.
+18.9.60.110 #hammer.mit.edu.
+18.9.60.111 #screw.mit.edu.
>net.mit.edu #MIT/Network Group cell
18.7.7.73 #gracie.mit.edu
18.7.21.95 #george.mit.edu
+>numenor.mit.edu #Project Numenor
+18.243.2.49 #numenor.mit.edu
>sipb.mit.edu #MIT/SIPB cell
-18.181.0.19 #reynelda.mit.edu.
-18.181.0.22 #rosebud.mit.edu.
-18.181.0.23 #ronald-ann.mit.edu.
+18.181.0.19 #reynelda.mit.edu
+18.181.0.22 #rosebud.mit.edu
+18.181.0.23 #ronald-ann.mit.edu
>soap.mit.edu #MIT School Of Architecture & Planning
18.89.1.204 #crypt.mit.edu
-18.89.1.209 #grotto.mit.edu
-18.89.2.156 #ac.mit.edu
+18.89.3.46 #soap.mit.edu
+18.89.4.9 #arch.mit.edu
>msu.edu #Michigan State University Main Cell
35.9.7.10 #afsdb0.cl.msu.edu
>nd.edu #University of Notre Dame
129.74.223.17 #john.helios.nd.edu
129.74.223.33 #lizardo.helios.nd.edu
129.74.223.65 #buckaroo.helios.nd.edu
+>crc.nd.edu #University of Notre Dame - Center for Research Computing
+129.74.85.34 #afsdb1.crc.nd.edu
+129.74.85.35 #afsdb2.crc.nd.edu
+129.74.85.36 #afsdb3.crc.nd.edu
>pitt.edu #University of Pittsburgh
136.142.8.15 #afs09.srv.cis.pitt.edu
136.142.8.20 #afs10.srv.cis.pitt.edu
@@ -273,14 +330,6 @@
134.79.18.25 #afsdb1.slac.stanford.edu
134.79.18.26 #afsdb2.slac.stanford.edu
134.79.18.27 #afsdb3.slac.stanford.edu
->ucdavis.edu #University of California at Davis
-169.237.104.100 #afs1.ucdavis.edu
-169.237.235.176 #afs2.ucdavis.edu
-169.237.247.91 #afs3.ucdavis.edu
->home.ucdavis.edu #University of California at Davis home directories
-169.237.105.91 #home1.ucdavis.edu
-169.237.105.92 #home2.ucdavis.edu
-169.237.105.93 #home3.ucdavis.edu
>physics.ucsb.edu #UC Santa Barbara, Physics Dept
128.111.18.161 #ledzeppelin.physics.ucsb.edu
>cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A
@@ -319,12 +368,8 @@
141.211.43.102 #linat02.grid.umich.edu
141.211.43.103 #linat03.grid.umich.edu
141.211.43.104 #linat04.grid.umich.edu
->citi.umich.edu #Center for Information Technology Integration
-141.211.133.5 #babylon.citi.umich.edu
->lsa.umich.edu #University of Michigan - College of LS&A
-141.211.211.53 #gerow.lsa.umich.edu
-141.211.211.72 #collines.lsa.umich.edu
-141.211.211.153 #hodges.lsa.umich.edu
+>citi.umich.edu #University of Michigan - Center for Information Technology Integ
+141.212.112.5 #babylon.citi.umich.edu
>sph.umich.edu #University of Michigan -- School of Public Health
141.211.51.137 #afssph7.sph.umich.edu
141.211.51.139 #afssph0.sph.umich.edu
@@ -356,6 +401,8 @@
144.92.13.16 #moe.cae.wisc.edu
>hep.wisc.edu #University of Wisconsin -- High Energy Physics
128.104.28.219 #anise.hep.wisc.edu
+144.92.180.7 #rosemary.hep.wisc.edu
+144.92.180.30 #fennel.hep.wisc.edu
>physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department
128.104.160.13 #kendra.physics.wisc.edu
128.104.160.14 #fray.physics.wisc.edu
@@ -374,16 +421,20 @@
>dapnia.saclay.cea.fr #CEA DAPNIA
132.166.32.7 #dphrsg.saclay.cea.fr
132.166.32.12 #dphrsl.saclay.cea.fr
->grif.fr #GRIF cell
-192.54.208.18 #node03.datagrid.cea.fr
>in2p3.fr #IN2P3 production cell
+134.158.104.11 #ccafsdb01.in2p3.fr
+134.158.104.12 #ccafsdb02.in2p3.fr
134.158.232.11 #ccafsdb1.in2p3.fr
134.158.232.12 #ccafsdb2.in2p3.fr
134.158.232.13 #ccafsdb3.in2p3.fr
+>mcc.ac.gb #University of Manchester
+130.88.203.41 #nevis.mc.man.ac.uk
+130.88.203.144 #eryri.mc.man.ac.uk
+130.88.203.145 #scafell.mc.man.ac.uk
>anl.gov #Argonne National Laboratory
-146.137.96.33 #arteus.ctd.anl.gov
-146.137.162.88 #agamemnon.ctd.anl.gov
-146.137.194.80 #antenor.ctd.anl.gov
+146.137.96.33 #arteus.it.anl.gov
+146.137.162.88 #agamemnon.it.anl.gov
+146.137.194.80 #antenor.it.anl.gov
>rhic.bnl.gov #Relativistic Heavy Ion Collider
130.199.6.51 #rafs03.rcf.bnl.gov
130.199.6.52 #rafs02.rcf.bnl.gov
@@ -406,6 +457,8 @@
128.55.128.250 #mars.nersc.gov
128.55.128.252 #alfred.nersc.gov
128.55.128.254 #lurch.nersc.gov
+>doe.atomki.hu #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary
+193.6.179.31 #afs.doe.atomki.hu
>bme.hu #Budapest University of Technology and Economics
152.66.241.6 #afs.iit.bme.hu
>kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H
@@ -418,15 +471,15 @@
192.107.54.5 #aixfs.frascati.enea.it
192.107.54.11 #rs2ced.frascati.enea.it
192.107.54.12 #43p.frascati.enea.it
-192.107.61.235 #serverinfo02.bologna.enea.it
-192.107.71.6 #glauco.casaccia.enea.it
-192.107.96.233 #riscdb.trisaia.enea.it
>fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy
192.107.90.2 #fusafs1.frascati.enea.it
192.107.90.3 #fusafs2.frascati.enea.it
192.107.90.4 #fusafs3.frascati.enea.it
>icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy
193.204.6.130 #icembfs.caspur.it
+>ictp.it #The Abdus Salam International Centre for Theoretical Physics (IC
+140.105.34.7 #afsdb1.ictp.it
+140.105.34.8 #afsdb2.ictp.it
>infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
131.154.1.7 #afscnaf.infn.it
141.108.26.75 #afsrm1.roma1.infn.it
@@ -444,18 +497,19 @@
193.206.84.121 #afs1.lnf.infn.it
193.206.84.122 #afs2.lnf.infn.it
193.206.84.123 #afs3.lnf.infn.it
->lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso
-192.84.135.21 #rsgs05.lngs.infn.it
+>lngs.infn.it #INFN, Laboratori Nazionali del Gran Sasso
+192.84.135.21 #afs1.lngs.infn.it
+192.84.135.133 #afs2.lngs.infn.it
>pi.infn.it #INFN, Sezione di Pisa
-131.114.134.26 #unknownhost.pi.infn.it
192.84.133.50 #aix1.pi.infn.it
+212.189.152.6 #afs1.pi.infn.it
+212.189.152.7 #afs2.pi.infn.it
+>roma3.infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia
+193.205.159.17 #afsrm3.roma3.infn.it
>psm.it #Progetto San Marco, Universita' di Roma-1
151.100.1.65 #atlante.psm.uniroma1.it
>tgrid.it #CASPUR-CILEA-CINECA Grid Cell
193.204.5.33 #cccgrid.caspur.it
->ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC
-140.105.16.8 #fs1.ictp.trieste.it
-140.105.16.9 #fs2.ictp.trieste.it
>math.unifi.it #math.unifi.it
150.217.34.182 #xeno.math.unifi.it
>ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria
@@ -469,76 +523,96 @@
193.204.161.138 #gamma.dia.uniroma3.it
>italia #Italian public AFS cell
193.204.5.9 #afs.caspur.it
->cmf.nrl.navy.mil #Naval Research Lab - CCS
-134.207.10.68 #picard.cmf.nrl.navy.mil
-134.207.10.69 #riker.cmf.nrl.navy.mil
-134.207.10.70 #kirk.cmf.nrl.navy.mil
+>cmf.nrl.navy.mil #Naval Research Laboratory - Center for Computational Science
+134.207.12.68 #picard.cmf.nrl.navy.mil
+134.207.12.69 #riker.cmf.nrl.navy.mil
+134.207.12.70 #kirk.cmf.nrl.navy.mil
>lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics
132.250.114.2 #afs1.lcp.nrl.navy.mil
132.250.114.4 #afs2.lcp.nrl.navy.mil
132.250.114.6 #afs3.lcp.nrl.navy.mil
+>crossproduct.net #crossproduct.net
+207.114.88.164 #enigma.crossproduct.net
+>epitech.net #EPITECH, France
+163.5.255.41 #afs-db-1.epitech.net
+163.5.255.42 #afs-db-2.epitech.net
>es.net #Energy Sciences Net
198.128.3.21 #fs1.es.net
198.128.3.22 #fs2.es.net
198.128.3.23 #fs3.es.net
+>gorlaeus.net #Gorlaeus Laboratories, Leiden University
+132.229.170.27 #fwncisafs1.gorlaeus.net
>laroia.net #Laroia Networks
66.66.102.254 #supercore.laroia.net
>sinenomine.net #Sine Nomine Associates
-192.204.203.218 #va.sinenomine.net
+72.73.25.18 #afsdb2.sinenomine.net
+72.73.30.74 #afsdb3.sinenomine.net
+74.121.192.42 #afsdb1.sinenomine.net
>slackers.net #The Slackers' Network
-63.201.48.27 #alexandria.slackers.net
+199.4.150.159 #alexandria.slackers.net
>tproa.net #The People's Republic of Ames
-72.13.4.23 #service-3.tproa.net
-72.13.4.24 #service-4.tproa.net
-72.13.4.25 #service-5.tproa.net
+204.11.35.83 #service-3.tproa.net
+204.11.35.84 #service-4.tproa.net
+204.11.35.85 #service-5.tproa.net
+>interdose.net #Interdose Ltd. & Co. KG, Germany
+80.190.171.42 #bfd9000.tow5.interdose.net
+80.190.171.43 #bfd9001.tow5.interdose.net
>nikhef.nl #The Dutch National Institute for High Energy Physics
192.16.185.26 #afs1.nikhef.nl
192.16.185.27 #afs2.nikhef.nl
>1ts.org #1TS.ORG, Cambridge, MA
-69.25.196.51 #pancake.1ts.org
+69.25.196.126 #neuromancer.1ts.org
>acm-csuf.org #California State Univerisity Fullerton ACM
137.151.29.193 #afs1.acm-csuf.org
+>adrake.org #adrake.org
+128.2.98.241 #afs.adrake.org
>bazquux.org #Baz Quux Organization
66.207.142.196 #baxquux.org
>coed.org #Adam Pennington's Cell
66.93.61.184 #vice1.coed.org
128.237.157.35 #vice3.coed.org
>dementia.org #Dementia Unlimited
-128.2.12.45 #alycia.dementia.org
-128.2.120.216 #meredith.dementia.org
->hackish.org #Hackish.org
-24.167.65.213 #avatar.sys.hackish.org
-128.2.120.138 #kurma.sys.hackish.org
+128.2.13.209 #dedlock.dementia.org
+128.2.235.26 #meredith.dementia.org
>idahofuturetruck.org #University of Idaho hybrid vehicle development
12.18.238.210 #dsle210.fsr.net
->nimlabs.org #Nimlabs, Ink. Cell.
-18.238.1.103 #olfin.nimlabs.org
-18.238.1.105 #caerbanog.nimlabs.org
+>jeaton.org #jeaton.org (Jeffrey Eaton, jeaton(a)jeaton.org)
+128.2.234.89 #jeaton-org-01.jeaton.org
+128.2.234.92 #jeaton-org-02.jeaton.org
+>mrow.org #MROW.ORG and RITLUG Cell
+88.198.46.111 #mrow.org
+129.21.205.119 #mirror.rit.edu
+>mrph.org #Mrph
+66.207.133.1 #sanber.mrph.org
+128.2.99.209 #hernandarias.mrph.org
+>mstacm.org #Missouri Science & Technology - ACM
+131.151.249.193 #acm.mst.edu
>nomh.org #nomh.org
204.29.154.12 #iota.nomh.org
204.29.154.32 #adversity.xi.nomh.org
>oc7.org #The OC7 Project
128.2.122.140 #knife.oc7.org
207.22.77.170 #spoon.oc7.org
+>pfriedma.org #pfriedma.org
+72.95.215.18 #vice.pfriedma.org
+>riscpkg.org #The RISC OS Packaging Project
+83.104.175.10 #delenn.riscpkg.org
>kth.se #Royal Institute of Technology, Stockholm, Sweden
130.237.32.145 #sonen.e.kth.se
130.237.48.7 #anden.e.kth.se
130.237.48.244 #fadern.e.kth.se
->hallf.kth.se #Royal Institute of Technology, HALLF
-130.237.24.11 #afs1.hallf.kth.se
-130.237.24.104 #afs2.hallf.kth.se
>isk.kth.se #Royal Institute of Technology, ISK
-130.237.202.3 #afsdb1.isk.kth.se
-130.237.209.5 #afsdb2.isk.kth.se
-130.237.209.9 #afsdb3.isk.kth.se
+130.237.216.17 #afsdb1.isk.kth.se
+130.237.216.82 #afsdb2.isk.kth.se
+130.237.216.83 #afsdb3.isk.kth.se
>it.kth.se #Royal Institute of Technology, IT
130.237.212.15 #ptah.it.kth.se
130.237.212.16 #toth.it.kth.se
130.237.215.7 #isis.it.kth.se
>md.kth.se #Royal Institute of Technology, MMK
+130.237.57.21 #euler.md.kth.se
130.237.57.68 #trinity.md.kth.se
130.237.57.72 #morpheus.md.kth.se
-130.237.67.230 #neo.speech.kth.se
>mech.kth.se #Royal Institute of Technology, MECH
130.237.233.142 #matterhorn.mech.kth.se
130.237.233.143 #castor.mech.kth.se
@@ -572,8 +646,12 @@
194.249.156.1 #brenta.ijs.si
>p-ng.si #Nova Gorica Polytechnic
193.2.120.2 #solkan.p-ng.si
->phy.bris.ac.uk #Bristol University - phyics
-137.222.58.9 #afs1.phy.bris.ac.uk
+>ihep.su #Institute for High-Energy Physics
+194.190.165.195 #afssrv00.ihep.su
+>hep-ex.physics.metu.edu.tr #METU Department of Physics, Experimental HEP group, Ankara/Turke
+144.122.31.131 #neutrino.physics.metu.edu.tr
+>phy.bris.ac.uk #Bristol University - physics
+137.222.74.18 #zen.phy.bris.ac.uk
>inf.ed.ac.uk #School of Informatics, University of Edinburgh
129.215.64.16 #afsdb0.inf.ed.ac.uk
129.215.64.17 #afsdb1.inf.ed.ac.uk
@@ -586,4 +664,6 @@
194.36.2.4 #afs2.hep.man.ac.uk
194.36.2.5 #afs3.hep.man.ac.uk
>rl.ac.uk #Rutherford Appleton Lab, England
-130.246.183.164 #wallace.cc.rl.ac.uk
+130.246.183.203 #afs1.gridpp.rl.ac.uk
+130.246.183.204 #afs2.gridpp.rl.ac.uk
+130.246.183.205 #afs3.gridpp.rl.ac.uk
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openafs.spec 11 Jan 2011 18:35:19 -0000 1.5
+++ openafs.spec 2 Mar 2011 20:56:31 -0000 1.6
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.4.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -298,6 +298,11 @@
%changelog
+* Wed Mar 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-2
+- Update the CellServDB to the current list from
+ http://dl.central.org/dl/cellservdb/CellServDB
+- This addresses Bug #1646
+
* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
13 years, 8 months
- 1
- 0
rpms/terminatorX/devel terminatorX-linking.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 terminatorX.spec, 1.5, 1.6
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/terminatorX/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31071
Modified Files:
.cvsignore sources terminatorX.spec
Added Files:
terminatorX-linking.patch
Log Message:
* Tue Mar 01 2011 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 3.83-1
- Update to 3.83
terminatorX-linking.patch:
Makefile.am | 1 +
Makefile.in | 1 +
2 files changed, 2 insertions(+)
--- NEW FILE terminatorX-linking.patch ---
diff -rupN terminatorX-3.83.old/src/Makefile.am terminatorX-3.83/src/Makefile.am
--- terminatorX-3.83.old/src/Makefile.am 2004-10-29 16:37:11.000000000 -0400
+++ terminatorX-3.83/src/Makefile.am 2011-03-01 21:34:21.000000000 -0500
@@ -5,6 +5,7 @@ SUBDIRS = icons
EXTRA_CFLAGS=-D_REENTRANT @DEPRECATED_FLAGS@
AM_CFLAGS=@CFLAGS@ @GTK_CFLAGS@ $(EXTRA_CFLAGS)
AM_CXXFLAGS=@CFLAGS@ @GTK_CFLAGS@ $(EXTRA_CFLAGS)
+AM_LDFLAGS=-ldl
license.c: $(top_srcdir)/COPYING
@AWK@ -f $(srcdir)/licmak.awk < $(top_srcdir)/COPYING > $(srcdir)/license.c
diff -rupN terminatorX-3.83.old/src/Makefile.in terminatorX-3.83/src/Makefile.in
--- terminatorX-3.83.old/src/Makefile.in 2011-02-08 17:20:09.000000000 -0500
+++ terminatorX-3.83/src/Makefile.in 2011-03-01 21:34:50.000000000 -0500
@@ -237,6 +237,7 @@ SUBDIRS = icons
EXTRA_CFLAGS = -D_REENTRANT @DEPRECATED_FLAGS@
AM_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ $(EXTRA_CFLAGS)
AM_CXXFLAGS = @CFLAGS@ @GTK_CFLAGS@ $(EXTRA_CFLAGS)
+AM_LDFLAGS = -ldl
BUILT_SOURCES = license.c
terminatorX_DEPENDENCIES = license.c
terminatorX_SOURCES = tX_endian.c tX_dialog.cc tX_widget.c wav_write.c \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/terminatorX/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Apr 2009 17:29:59 -0000 1.2
+++ .cvsignore 2 Mar 2011 02:42:40 -0000 1.3
@@ -1 +1 @@
-terminatorX-3.82.tar.gz
+terminatorX-3.83.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/terminatorX/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Apr 2009 17:29:59 -0000 1.2
+++ sources 2 Mar 2011 02:42:40 -0000 1.3
@@ -1 +1 @@
-6faa4598f55d8727175576ce09bd1fac terminatorX-3.82.tar.gz
+06c5de0dfe4eb4a67488d93f577a9437 terminatorX-3.83.tar.gz
Index: terminatorX.spec
===================================================================
RCS file: /cvs/free/rpms/terminatorX/devel/terminatorX.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- terminatorX.spec 23 Oct 2009 08:12:54 -0000 1.5
+++ terminatorX.spec 2 Mar 2011 02:42:40 -0000 1.6
@@ -1,7 +1,7 @@
-Summary: Realtime Audio Synthesizer
+Summary: Real-time Audio Synthesizer
Name: terminatorX
-Version: 3.82
-Release: 4%{?dist}
+Version: 3.83
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+ and GFDL
URL: http://terminatorx.org/
@@ -9,6 +9,8 @@
Patch0: %{name}-gcc44.patch
# To make the package buildable on ppc/ppc64:
Patch1: %{name}-endian_h.patch
+# Fix DSO linking
+Patch2: %{name}-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -37,16 +39,17 @@
Requires(postun): scrollkeeper
%description
-terminatorX is a realtime audio synthesizer that allows you to "scratch" on
+terminatorX is a real-time audio synthesizer that allows you to "scratch" on
digitally sampled audio data (*.wav, *.au, *.ogg, *.mp3, etc.) the way
-hiphop-DJs scratch on vinyl records. It features multiple turntables, realtime
-effects (buit-in as well as LADSPA plugin effects), a sequencer and an
+hiphop-DJs scratch on vinyl records. It features multiple turntables, real-time
+effects (buit-in as well as LADSPA plug-in effects), a sequencer and an
easy-to-use gtk+ GUI.
%prep
%setup -q
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .endian
+%patch2 -p1 -b .linking
# To match the freedesktop standards
sed -i 's|\.png||' gnome-support/%{name}.desktop
@@ -122,6 +125,9 @@
%changelog
+* Tue Mar 01 2011 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 3.83-1
+- Update to 3.83
+
* Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 3.82-4
- Update desktop file according to F-12 FedoraStudio feature
13 years, 8 months
- 1
- 0