diff -Nru mythnettv-svn-8~svn259/bin/mythnettv mythnettv-svn-8~svn259/bin/mythnettv --- mythnettv-svn-8~svn259/bin/mythnettv 1970-01-01 01:00:00.000000000 +0100 +++ mythnettv-svn-8~svn259/bin/mythnettv 2009-02-10 15:12:09.000000000 +0000 @@ -0,0 +1,3 @@ +#!/bin/bash + +/usr/share/mythnettv/mythnettv $@ diff -Nru /tmp/ZO41PMUAmA/mythnettv-svn-8~svn259/debian/changelog /tmp/gygvINVns5/mythnettv-svn-8~svn259/debian/changelog --- mythnettv-svn-8~svn259/debian/changelog 2009-02-07 22:02:08.000000000 +0000 +++ mythnettv-svn-8~svn259/debian/changelog 2009-02-10 15:12:09.000000000 +0000 @@ -1,4 +1,4 @@ -mythnettv-svn (8~svn259-0ubuntu2~jaunty) jaunty; urgency=low +mythnettv-svn (8~svn259-0ubuntu4~jaunty) jaunty; urgency=low * Fixed conflicts for mythnettv diff -Nru /tmp/ZO41PMUAmA/mythnettv-svn-8~svn259/patch-dlinville-001.orig /tmp/gygvINVns5/mythnettv-svn-8~svn259/patch-dlinville-001.orig --- mythnettv-svn-8~svn259/patch-dlinville-001.orig 1970-01-01 01:00:00.000000000 +0100 +++ mythnettv-svn-8~svn259/patch-dlinville-001.orig 2008-07-24 09:09:20.000000000 +0100 @@ -0,0 +1,42 @@ +diff -Naur mythnettv-release-3/database.py mythnettv-david/database.py +--- mythnettv-release-3/database.py 2008-07-13 23:34:08.000000000 -0500 ++++ mythnettv-david/database.py 2008-07-21 16:56:38.000000000 -0500 +@@ -8,6 +8,8 @@ + import os + import sys + ++from program import MythNetTvProgram ++ + CURRENT_SCHEMA='13' + + class MythNetTvDatabase: +@@ -152,7 +154,7 @@ + for item in parsed: + parsed_ints.append(int(item)) + date = datetime.datetime(*parsed_ints[0:5]) +- program = IpTvProgram(self) ++ program = MythNetTvProgram(self) + program.Load(row['guid']) + program.SetDate(date) + program.Store() +@@ -161,7 +163,7 @@ + # Otherwise, just set it to now and get on with our lives + for row in self.GetRows('select guid from mythnettv_programs ' + 'where date is null;'): +- program = IpTvProgram(self) ++ program = MythNetTvProgram(self) + program.Load(row['guid']) + program.SetDate(datetime.datetime.now()) + program.Store() +diff -Naur mythnettv-release-3/mythnettv mythnettv-david/mythnettv +--- mythnettv-release-3/mythnettv 2008-07-13 23:34:08.000000000 -0500 ++++ mythnettv-david/mythnettv 2008-07-21 17:02:33.000000000 -0500 +@@ -10,7 +10,7 @@ + import commands + import datetime + import feedparser +-import gflags ++#import gflags + import os + import re + import shutil diff -Nru /tmp/ZO41PMUAmA/mythnettv-svn-8~svn259/setup.py /tmp/gygvINVns5/mythnettv-svn-8~svn259/setup.py --- mythnettv-svn-8~svn259/setup.py 2009-02-07 16:45:11.000000000 +0000 +++ mythnettv-svn-8~svn259/setup.py 2009-02-10 15:12:09.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/python # mythnettv install script -# Copyright (C) 2008, Thomas Mashos +# Copyright (C) 2008, Thomas Mashos # # # This program is free software; you can redistribute it and/or modify @@ -32,4 +32,5 @@ ("share/mythnettv", glob.glob("README*")), ("share/mythnettv", glob.glob("mythnettv*")), ("share/mythnettv", glob.glob("COPYING"))], + scripts=['bin/', 'bin/mythnettv'], )