diff -Nru miro-1.2.6/debian/changelog miro-1.2.8/debian/changelog --- miro-1.2.6/debian/changelog 2008-11-18 01:12:31.000000000 -0800 +++ miro-1.2.8/debian/changelog 2008-11-18 01:12:41.000000000 -0800 @@ -1,3 +1,43 @@ +miro (1.2.8-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #294459), remaining changes: + - Depend on python-gnome2-extras rather than python-gtkmozembed + - debian/patches/81_inhibit_gnome_screensaver + - Inhibit GNOME Screensaver when playing fullscreen video. (LP: #207794) + Patch based on patch from upstream trac: + http://bugzilla.pculture.org/show_bug.cgi?id=3067 + * debian/control + - Add Conflicts with miro-data < 1.2.6 (LP: #296175) + + -- Joseph M Smith Sat, 15 Nov 2008 21:21:59 -0800 + +miro (1.2.8-1) unstable; urgency=low + + * New upstream release (Closes: #496874). + + Youtube video downloads should work again, see upstream bug + http://bugzilla.pculture.org/show_bug.cgi?id=10656. + + Closing unreproducible (with the latest release) bugs: + + MIRO NOT WORKING (Closes: #502194). + Both the feed mentioned and video search is working fine. + + NBC News podcast corrupted if download is resumed (Closes: #496233). + Works fine with both, Miro 1.2.8, and mplayer. Must have been some + oddness with the feed itself. + + miro (version 1.2.3-2) segmentation fault (Closes: #489891). + No longer occuring according to the BTS, never reproducible by me. + + miro: If the XVideo extension is missing, video has wrong colors and + extremly low framerate (Closes: #459069, #473310). + This problem goes away if you use 'miro --xine-driver=xhsm' and will + not be relevant soon anymore, as Miro switches to gstreamer + upstream with the next major release. Added a note to README.Debian. + + [miro] Crash on startup (Closes: #500061). + Unreproducible by me, reporter says the problem was not Miro-related. + * debian/miro.lintian-overrides: Added file. Silence lintian warning about + an embedded version of 'feedparser'. We cannot use the Debian package + of 'feedparser' as Miro uses a highly modified version of it. + * debian/rules: Remove more files in the 'clean' target. + + -- Uwe Hermann Fri, 31 Oct 2008 13:02:38 +0100 + miro (1.2.6-0ubuntu1) intrepid; urgency=low * New upstream release (LP: #258401,#213667) diff -Nru miro-1.2.6/debian/control miro-1.2.8/debian/control --- miro-1.2.6/debian/control 2008-11-18 01:12:31.000000000 -0800 +++ miro-1.2.8/debian/control 2008-11-18 01:12:41.000000000 -0800 @@ -41,8 +41,9 @@ libxine1-x (>= 1.1.12), libxine1-plugins (>= 1.1.12), xulrunner-1.9, - miro-data (>= 1.2.6) + miro-data (>= 1.2.8-1) Suggests: ttf-dejavu, python-psyco [i386 hurd-i386 netbsd-i386 kfreebsd-i386] +Conflicts: miro-data (<< 1.2.6) Description: GTK+ based RSS video aggregator Miro (previously known as Democracy Player) is a platform for Internet television and video. diff -Nru miro-1.2.6/debian/miro.lintian-overrides miro-1.2.8/debian/miro.lintian-overrides --- miro-1.2.6/debian/miro.lintian-overrides 1969-12-31 16:00:00.000000000 -0800 +++ miro-1.2.8/debian/miro.lintian-overrides 2008-11-18 01:12:41.000000000 -0800 @@ -0,0 +1 @@ +miro: embedded-feedparser-library usr/share/python-support/miro/miro/feedparser.py diff -Nru miro-1.2.6/debian/README.Debian miro-1.2.8/debian/README.Debian --- miro-1.2.6/debian/README.Debian 2008-11-18 01:12:31.000000000 -0800 +++ miro-1.2.8/debian/README.Debian 2008-11-18 01:12:41.000000000 -0800 @@ -31,4 +31,12 @@ The video will now be displayed on localhost, audio will be redirected to the remote host's esd. - -- Uwe Hermann , Sat, 26 Apr 2008 21:50:56 +0200 + * If you experience segfaults or incorrect colors with Miro and certain + X.org drivers, please try 'miro --xine-driver=xhsm' as a work-around. + This problem will be obsoleted in the next major release, as Miro will + use gstreamer in the future. See + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=459069 + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473310 + for more information on this issue. + + -- Uwe Hermann , Fri, 31 Oct 2008 12:01:47 +0100 diff -Nru miro-1.2.6/debian/rules miro-1.2.8/debian/rules --- miro-1.2.6/debian/rules 2008-11-18 01:12:31.000000000 -0800 +++ miro-1.2.8/debian/rules 2008-11-18 01:12:41.000000000 -0800 @@ -43,14 +43,14 @@ clean:: @# TODO: This should probably be done in the upstream source. rm -rf portable/frontends/html/compiled_templates/* + rm -f portable/dl_daemon/daemon.py + rm -f portable/database.c + rm -f portable/sorts.c rm -f platform/gtk-x11/platform/frontends/html/MozillaBrowser.[ch] rm -f platform/gtk-x11/platform/frontends/html/xlibhelper.c rm -f platform/gtk-x11/miro.1.gz rm -f platform/gtk-x11/xine/xine_extractor rm -f platform/gtk-x11/xine/xine.c - rm -f portable/database.c - rm -f portable/sorts.c - rm -f portable/dl_daemon/daemon.py rm -f platform/gtk-x11/miro # For /usr/share/cdbs/1/rules/utils.mk sanity check. diff -Nru miro-1.2.6/merge-buildpackage miro-1.2.8/merge-buildpackage --- miro-1.2.6/merge-buildpackage 1969-12-31 16:00:00.000000000 -0800 +++ miro-1.2.8/merge-buildpackage 2008-11-18 01:12:41.000000000 -0800 @@ -0,0 +1,2 @@ +#!/bin/sh +exec dpkg-buildpackage -S -v1.2.6-0ubuntu1 -sa "$@" diff -Nru miro-1.2.6/portable/flashscraper.py miro-1.2.8/portable/flashscraper.py --- miro-1.2.6/portable/flashscraper.py 2008-08-14 21:50:42.000000000 -0700 +++ miro-1.2.8/portable/flashscraper.py 2008-10-24 10:49:20.000000000 -0700 @@ -33,6 +33,7 @@ from xml.dom import minidom from urllib import unquote_plus from miro.util import checkU, returnsUnicode +import logging # ============================================================================= @@ -61,41 +62,33 @@ def _scrapeYouTubeURL(url, callback): checkU(url) - httpclient.grabHeaders(url, lambda x:_youTubeCallback(x,callback), - lambda x:_youTubeErrback(x,callback)) + httpclient.grabHeaders(url, lambda x:_youTubeCallback(x,callback), lambda x:_youTubeErrback(x,callback)) def _youTubeCallback(info, callback): - redirected_url = info['redirected-url'] + redirected_url = info["redirected-url"] try: components = urlparse.urlsplit(redirected_url) params = cgi.parse_qs(components[3]) videoID = params['video_id'][0] - t = params['t'][0] - url = u"http://youtube.com/get_video.php?video_id=%s&t=%s&fmt=18" % (videoID, t) - httpclient.grabHeaders(url, lambda x: _youTubeCallback2(redirected_url, url, x, callback), - lambda x: _youTubeErrback(x, callback)) - except: - print "DTV: WARNING, unable to scrape You Tube Video URL: %s" % redirected_url - callback(None) - -def _youTubeCallback2(redirected_url, hidef_url, info, callback): - status = info['status'] - - # if the status is a 4xx, then we go for the lodef version - if status == 0 or status / 100 == 4: - try: - components = urlparse.urlsplit(redirected_url) - params = cgi.parse_qs(components[3]) - videoID = params['video_id'][0] - t = params['t'][0] - url = u"http://youtube.com/get_video.php?video_id=%s&t=%s" % (videoID, t) - callback(url) - except: - print "DTV: WARNING, unable to scrape You Tube Video URL: %s" % redirected_url - callback(None) - return + url = u"http://www.youtube.com/get_video_info?video_id=%s&el=embedded&ps=default&eurl=" % videoID + httpclient.grabURL(url, lambda x: _youTubeCallbackStep2(x, videoID, callback), + lambda x: _youTubeErrback(x, callback)) + except: + logging.exception("youTubeCallback: unable to scrape YouTube Video URL") + callback(None) + +def _youTubeCallbackStep2(info, videoID, callback): + try: + body = info['body'] + params = cgi.parse_qs(body) + token = params['token'][0] - callback(hidef_url, u"video/mpeg4") + url = u"http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=embedded&ps=default" % (videoID, token) + httpclient.grabURL(url, lambda x: callback(url, u"video/flv"), + lambda x: _youTubeErrback(x, callback)) + except: + logging.exception("youTubeCallbackStep2: unable to scrape YouTube Video URL") + callback(None) def _youTubeErrback(err, callback): print "DTV: WARNING, network error scraping You Tube Video URL" @@ -239,7 +232,7 @@ # ============================================================================= scraperInfoMap = [ - {'pattern': 'http://([^/]+\.)?youtube.com/(?!get_video\.php)', 'func': _scrapeYouTubeURL}, + {'pattern': 'http://([^/]+\.)?youtube.com/(?!get_video\.php)', 'func': _scrapeYouTubeURL}, {'pattern': 'http://video.google.com/googleplayer.swf', 'func': _scrapeGoogleVideoURL}, {'pattern': 'http://([^/]+\.)?lulu.tv/wp-content/flash_play/flvplayer', 'func': _scrapeLuLuVideoURL}, {'pattern': 'http://([^/]+\.)?vmix.com/flash/super_player.swf', 'func': _scrapeVMixVideoURL}, diff -Nru miro-1.2.6/portable/singleclick.py miro-1.2.8/portable/singleclick.py --- miro-1.2.6/portable/singleclick.py 2008-08-14 21:50:42.000000000 -0700 +++ miro-1.2.8/portable/singleclick.py 2008-10-24 10:49:20.000000000 -0700 @@ -320,11 +320,11 @@ elif arg.startswith('feed:'): # hack so feed: acts as http: arg = "http:" + arg[len("feed:"):] - addDownload(platformutils.filenameToUnicode(arg)) + addDownload(filenameToUnicode(arg)) elif arg.startswith('feeds:'): # hack so feeds: acts as https: arg = "https:" + arg[len("feeds:"):] - addDownload(platformutils.filenameToUnicode(arg)) + addDownload(filenameToUnicode(arg)) elif os.path.exists(arg): ext = os.path.splitext(arg)[1].lower() if ext in ('.torrent', '.tor'): diff -Nru miro-1.2.6/portable/theme.py miro-1.2.8/portable/theme.py --- miro-1.2.6/portable/theme.py 2008-08-14 21:50:42.000000000 -0700 +++ miro-1.2.8/portable/theme.py 2008-10-24 10:49:20.000000000 -0700 @@ -134,10 +134,10 @@ else: defaultFeedURLs = [u'http://www.getmiro.com/screencasts/windows/win.feed.rss'] - defaultFeedURLs.extend([u'http://feeds.feedburner.com/miroguide/featured', - u'http://feeds.feedburner.com/miroguide/toprated', - u'http://feeds.feedburner.com/miroguide/new', - u'http://feeds.feedburner.com/miroguide/popular' + defaultFeedURLs.extend([u'http://feeds.miroguide.com/miroguide/featured', + u'http://feeds.miroguide.com/miroguide/toprated', + u'http://feeds.miroguide.com/miroguide/new', + u'http://feeds.miroguide.com/miroguide/popular' ]) defaultFeedURLs.extend([ (_('Sample Channels'), diff -Nru miro-1.2.6/resources/app.config.template miro-1.2.8/resources/app.config.template --- miro-1.2.6/resources/app.config.template 2008-08-14 21:51:00.000000000 -0700 +++ miro-1.2.8/resources/app.config.template 2008-10-24 10:49:33.000000000 -0700 @@ -8,13 +8,13 @@ copyright = Copyright (c) 2005-2008 buildMachine = $BUILD_MACHINE buildTime = $BUILD_TIME -appVersion = 1.2.6 -appRevisionURL = https://svn.participatoryculture.org/svn/dtv/tags/Miro-1.2.6/tv/resources -appRevisionNum = 7691 -appRevision = https://svn.participatoryculture.org/svn/dtv/tags/Miro-1.2.6/tv/resources - 7691 +appVersion = 1.2.8 +appRevisionURL = https://svn.participatoryculture.org/svn/dtv/tags/Miro-1.2.8/tv/resources +appRevisionNum = 8366 +appRevision = https://svn.participatoryculture.org/svn/dtv/tags/Miro-1.2.8/tv/resources - 8366 appPlatform = $APP_PLATFORM -appSerial-gtk-x11 = 20080814000 -appSerial-osx = 20080814260 -appSerial-windows-xul = 20080814000 +appSerial-gtk-x11 = 20081024000 +appSerial-osx = 20081024000 +appSerial-windows-xul = 20081024000 mozillaLibPath = $MOZILLA_LIB_PATH maximizeOnFirstRun = False