From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 25 07:20:11 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20A391065670 for ; Mon, 25 Oct 2010 07:20:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D46DF8FC0C for ; Mon, 25 Oct 2010 07:20:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o9P7KAp7024242 for ; Mon, 25 Oct 2010 07:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o9P7KAN7024241; Mon, 25 Oct 2010 07:20:10 GMT (envelope-from gnats) Resent-Date: Mon, 25 Oct 2010 07:20:10 GMT Resent-Message-Id: <201010250720.o9P7KAN7024241@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Armin Pirkovitsch Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20896106566B for ; Mon, 25 Oct 2010 07:12:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 0CFED8FC1A for ; Mon, 25 Oct 2010 07:12:41 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o9P7Ce1s076774 for ; Mon, 25 Oct 2010 07:12:40 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o9P7CeYn076773; Mon, 25 Oct 2010 07:12:40 GMT (envelope-from nobody) Message-Id: <201010250712.o9P7CeYn076773@www.freebsd.org> Date: Mon, 25 Oct 2010 07:12:40 GMT From: Armin Pirkovitsch To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/151710: multimedia/miro update to 3.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Oct 2010 07:20:11 -0000 >Number: 151710 >Category: ports >Synopsis: multimedia/miro update to 3.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 25 07:20:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Armin Pirkovitsch >Release: >Organization: >Environment: >Description: TB testruns: http://tb.frozen-zone.org/index.php?action=describe_port&id=1072 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/Makefile multimedia/miro/Makefile --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/Makefile 2010-10-25 08:40:21.000000000 +0200 +++ multimedia/miro/Makefile 2010-10-25 09:09:42.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= miro -PORTVERSION= 3.0.3 -PORTREVISION= 1 +PORTVERSION= 3.5 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \ http://ftp.osuosl.org/pub/pculture.org/miro/src/ @@ -16,6 +15,7 @@ COMMENT= A video player to get internet TV broadcasts BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex \ + ${PYTHON_SITELIBDIR}/webkit/__init__.py:${PORTSDIR}/www/py-webkitgtk \ update-mime-database:${PORTSDIR}/misc/shared-mime-info RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \ ${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite23 \ @@ -23,10 +23,11 @@ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:${PORTSDIR}/devel/py-notify \ ${PYTHON_SITELIBDIR}/libtorrent.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15-python \ ${PYTHON_SITELIBDIR}/webkit/webkit.so:${PORTSDIR}/www/py-webkitgtk \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:${PORTSDIR}/x11-toolkits/py-gnome2 + ${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:${PORTSDIR}/x11-toolkits/py-gnome2 \ + ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl -BUILD_WRKSRC= ${WRKSRC}/platform/gtk-x11 -INSTALL_WRKSRC= ${WRKSRC}/platform/gtk-x11 +BUILD_WRKSRC= ${WRKSRC}/linux +INSTALL_WRKSRC= ${WRKSRC}/linux CONFLICTS= Miro-[0-9]* diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/distinfo multimedia/miro/distinfo --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/distinfo 2010-10-25 08:40:21.000000000 +0200 +++ multimedia/miro/distinfo 2010-10-23 09:42:07.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (miro-3.0.3.tar.gz) = 851de31dce0baf07922a22b4d29cfeac -SHA256 (miro-3.0.3.tar.gz) = d01972721b801f7944f5859c7849c4a88ee4814a099cc56fbe06c3621ba7a116 -SIZE (miro-3.0.3.tar.gz) = 9695616 +MD5 (miro-3.5.tar.gz) = 6e15d2d6ce086b0fe943a6cbea3c363c +SHA256 (miro-3.5.tar.gz) = 66e250fe2a5fb6623978668ac1ffb0147b70f3025eaaa1cf9af12cdd469a66f5 +SIZE (miro-3.5.tar.gz) = 10640526 diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-lib_startup.py multimedia/miro/files/patch-lib_startup.py --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-lib_startup.py 1970-01-01 01:00:00.000000000 +0100 +++ multimedia/miro/files/patch-lib_startup.py 2010-10-24 14:41:28.000000000 +0200 @@ -0,0 +1,11 @@ +--- lib/startup.py.orig 2010-10-24 14:40:03.000000000 +0200 ++++ lib/startup.py 2010-10-24 14:40:38.000000000 +0200 +@@ -370,7 +370,7 @@ + yield None + commandline.startup() + yield None +- autoupdate.check_for_updates() ++ # autoupdate.check_for_updates() + yield None + # Wait a bit before starting the downloader daemon. It can cause a bunch + # of disk/CPU load, so try to avoid it slowing other stuff down. diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-linux_plat_resources.py multimedia/miro/files/patch-linux_plat_resources.py --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-linux_plat_resources.py 1970-01-01 01:00:00.000000000 +0100 +++ multimedia/miro/files/patch-linux_plat_resources.py 2010-10-24 14:39:32.000000000 +0200 @@ -0,0 +1,23 @@ +--- linux/plat/resources.py.orig 2010-10-24 14:34:46.000000000 +0200 ++++ linux/plat/resources.py 2010-10-24 14:35:12.000000000 +0200 +@@ -44,9 +44,9 @@ + import platform + + RESOURCE_ROOT = os.path.abspath( +- os.environ.get('MIRO_RESOURCE_ROOT', '/usr/share/miro/resources/')) ++ os.environ.get('MIRO_RESOURCE_ROOT', '%%PREFIX%%/share/miro/resources/')) + SHARE_ROOT = os.path.abspath( +- os.environ.get('MIRO_SHARE_ROOT', '/usr/share/')) ++ os.environ.get('MIRO_SHARE_ROOT', '%%PREFIX%%/share/')) + + def root(): + return RESOURCE_ROOT +@@ -67,7 +67,7 @@ + return u'file://%s' % urllib.quote(path(relative_path)) + + def theme_path(theme, relative_path): +- return os.path.join('/usr/share/miro/themes', theme, relative_path) ++ return os.path.join('%%PREFIX%%/share/miro/themes', theme, relative_path) + + def check_kde(): + return os.environ.get("KDE_FULL_SESSION", None) != None diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-linux_setup.py multimedia/miro/files/patch-linux_setup.py --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-linux_setup.py 1970-01-01 01:00:00.000000000 +0100 +++ multimedia/miro/files/patch-linux_setup.py 2010-10-24 16:01:03.000000000 +0200 @@ -0,0 +1,114 @@ +--- linux/setup.py.orig 2010-10-21 18:46:03.000000000 +0200 ++++ linux/setup.py 2010-10-24 15:22:13.000000000 +0200 +@@ -199,6 +199,9 @@ + options_dict['library_dirs'].append(rest) + elif prefix == '-l': + options_dict['libraries'].append(rest) ++ elif prefix == '-W': ++ # throw away, it breaks cc1 ++ continue + else: + options_dict['extra_compile_args'].append(comp) + +@@ -242,7 +245,7 @@ + exit; + fi + +- $GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@" ++ $GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON %%PREFIX%%/bin/miro.real --sync "$@" + else + miro.real "$@" + fi +@@ -254,7 +257,7 @@ + xlib_ext = \ + Extension("miro.plat.xlibhelper", + [os.path.join(platform_package_dir, 'xlibhelper.pyx')], +- library_dirs = ['/usr/X11R6/lib'], ++ library_dirs = ['%%LOCALBASE%%/lib'], + libraries = ['X11'], + ) + +@@ -283,37 +286,37 @@ + # filter out app.config.template (which is handled specially) + files = [f for f in listfiles(resource_dir) \ + if os.path.basename(f) != 'app.config.template'] +-data_files.append(('/usr/share/miro/resources/', files)) ++data_files.append(('%%PREFIX%%/share/miro/resources/', files)) + # handle the sub directories. + for dir in ('searchengines', 'images', 'testdata', 'conversions', + os.path.join('testdata', 'stripperdata'), + os.path.join('testdata', 'httpserver'), + os.path.join('testdata', 'locale', 'fr', 'LC_MESSAGES')): + source_dir = os.path.join(resource_dir, dir) +- dest_dir = os.path.join('/usr/share/miro/resources/', dir) ++ dest_dir = os.path.join('%%PREFIX%%/share/miro/resources/', dir) + data_files.append((dest_dir, listfiles(source_dir))) + + for mem in ["24", "48", "72", "128"]: + d = os.path.join("icons", "hicolor", "%sx%s" % (mem, mem), "apps") + source = os.path.join(platform_dir, d, "miro.png") +- dest = os.path.join("/usr/share/", d) ++ dest = os.path.join("%%PREFIX%%/share/", d) + data_files.append((dest, [source])) + + # add ADOPTERS file, the desktop file, mime data, and man page + data_files += [ +- ('/usr/share/miro/resources', ++ ('%%PREFIX%%/share/miro/resources', + [os.path.join(root_dir, 'CREDITS')]), +- ('/usr/share/miro/resources', ++ ('%%PREFIX%%/share/miro/resources', + [os.path.join(root_dir, 'ADOPTERS')]), +- ('/usr/share/pixmaps', ++ ('%%PREFIX%%/share/pixmaps', + glob(os.path.join(platform_dir, 'miro.xpm'))), +- ('/usr/share/applications', ++ ('%%PREFIX%%/share/applications', + [os.path.join(platform_dir, 'miro.desktop')]), +- ('/usr/share/mime/packages', ++ ('%%PREFIX%%/share/mime/packages', + [os.path.join(platform_dir, 'miro.xml')]), +- ('/usr/share/man/man1', ++ ('%%PREFIX%%/man/man1', + [os.path.join(platform_dir, 'miro.1.gz')]), +- ('/usr/share/man/man1', ++ ('%%PREFIX%%/man/man1', + [os.path.join(platform_dir, 'miro.real.1.gz')]), + ] + +@@ -336,7 +339,7 @@ + + def install_app_config(self): + source = os.path.join(resource_dir, 'app.config.template') +- dest = '/usr/share/miro/resources/app.config' ++ dest = '%%PREFIX%%/share/miro/resources/app.config' + + config_file = util.read_simple_config_file(source) + print "Trying to figure out the git revision...." +@@ -378,7 +381,7 @@ + lang = os.path.basename(source)[:-3] + if 'LINGUAS' in os.environ and lang not in os.environ['LINGUAS']: + continue +- dest = '/usr/share/locale/%s/LC_MESSAGES/miro.mo' % lang ++ dest = '%%PREFIX%%/share/locale/%s/LC_MESSAGES/miro.mo' % lang + if self.root: + dest = change_root(self.root, dest) + self.mkpath(os.path.dirname(dest)) +@@ -407,7 +410,7 @@ + + #### install_theme installs a specified theme .zip + class install_theme(Command): +- description = 'Install a provided theme to /usr/share/miro/themes' ++ description = 'Install a provided theme to %%PREFIX%%/share/miro/themes' + user_options = [("theme=", None, 'ZIP file containing the theme')] + + def initialize_options(self): +@@ -435,7 +438,7 @@ + raise DistutilsOptionError, "invalid theme file" + self.zipfile = zf + self.theme_name = themeName +- self.theme_dir = '/usr/share/miro/themes/%s' % themeName ++ self.theme_dir = '%%PREFIX%%/share/miro/themes/%s' % themeName + + def run(self): + if os.path.exists(self.theme_dir): diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py 2010-10-25 08:40:21.000000000 +0200 +++ multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ ---- platform/gtk-x11/plat/resources.py.orig 2009-07-25 12:41:11.000000000 +0900 -+++ platform/gtk-x11/plat/resources.py 2009-07-30 15:48:04.000000000 +0900 -@@ -44,8 +44,8 @@ - import platform - - resource_root = os.path.abspath(os.environ.get('MIRO_RESOURCE_ROOT', -- '/usr/share/miro/resources/')) --share_root = os.path.abspath(os.environ.get('MIRO_SHARE_ROOT', '/usr/share/')) -+ '%%PREFIX%%/share/miro/resources/')) -+share_root = os.path.abspath(os.environ.get('MIRO_SHARE_ROOT', '%%PREFIX%%/share/')) - - def root(): - return resource_root -@@ -71,7 +71,7 @@ - return u"file://%s" % urllib.quote(absolute_path) - - def theme_path(theme, relative_path): -- return os.path.join('/usr/share/miro/themes', theme, relative_path) -+ return os.path.join('%%PREFIX%%/share/miro/themes', theme, relative_path) - - def check_kde(): - return os.environ.get("KDE_FULL_SESSION", None) != None diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-platform_gtk-x11_setup.py multimedia/miro/files/patch-platform_gtk-x11_setup.py --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-platform_gtk-x11_setup.py 2010-10-25 08:40:21.000000000 +0200 +++ multimedia/miro/files/patch-platform_gtk-x11_setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,110 +0,0 @@ ---- platform/gtk-x11/setup.py.orig 2010-05-23 05:39:24.000000000 +0900 -+++ platform/gtk-x11/setup.py 2010-06-14 18:47:40.000000000 +0900 -@@ -198,6 +198,9 @@ - options_dict['library_dirs'].append(rest) - elif prefix == '-l': - options_dict['libraries'].append(rest) -+ elif prefix == '-W': -+ # throw away, it breaks cc1 -+ continue - else: - options_dict['extra_compile_args'].append(comp) - -@@ -241,7 +244,7 @@ - exit; - fi - -- $GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@" -+ $GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON %%PREFIX%%/bin/miro.real --sync "$@" - else - miro.real "$@" - fi -@@ -253,7 +256,7 @@ - xlib_ext = \ - Extension("miro.plat.xlibhelper", - [ os.path.join(platform_package_dir,'xlibhelper.pyx') ], -- library_dirs = ['/usr/X11R6/lib'], -+ library_dirs = ['%%LOCALBASE%%/lib'], - libraries = ['X11'], - ) - -@@ -274,34 +277,34 @@ - # filter out app.config.template (which is handled specially) - files = [f for f in listfiles(resource_dir) \ - if os.path.basename(f) != 'app.config.template'] --data_files.append(('/usr/share/miro/resources/', files)) -+data_files.append(('%%PREFIX%%/share/miro/resources/', files)) - # handle the sub directories. - for dir in ('searchengines', 'images', 'testdata', - os.path.join('testdata', 'stripperdata'), - os.path.join('testdata', 'locale', 'fr', 'LC_MESSAGES')): - source_dir = os.path.join(resource_dir, dir) -- dest_dir = os.path.join('/usr/share/miro/resources/', dir) -+ dest_dir = os.path.join('%%PREFIX%%/share/miro/resources/', dir) - data_files.append((dest_dir, listfiles(source_dir))) - - for mem in ["24", "48", "72", "128"]: - d = os.path.join("icons", "hicolor", "%sx%s" % (mem, mem), "apps") - source = os.path.join(platform_dir, d, "miro.png") -- dest = os.path.join("/usr/share/", d) -+ dest = os.path.join("%%PREFIX%%/share/", d) - data_files.append((dest, [source])) - - # add ADOPTERS file, the desktop file, mime data, and man page - data_files += [ -- ('/usr/share/miro/resources', -+ ('%%PREFIX%%/share/miro/resources', - [os.path.join(root_dir, 'ADOPTERS')]), -- ('/usr/share/pixmaps', -+ ('%%PREFIX%%/share/pixmaps', - glob(os.path.join(platform_dir, 'miro.xpm'))), -- ('/usr/share/applications', -+ ('%%PREFIX%%/share/applications', - [os.path.join(platform_dir, 'miro.desktop')]), -- ('/usr/share/mime/packages', -+ ('%%PREFIX%%/share/mime/packages', - [os.path.join(platform_dir, 'miro.xml')]), -- ('/usr/share/man/man1', -+ ('%%MANPREFIX%%/man/man1', - [os.path.join(platform_dir, 'miro.1.gz')]), -- ('/usr/share/man/man1', -+ ('%%MANPREFIX%%/man/man1', - [os.path.join(platform_dir, 'miro.real.1.gz')]), - ] - -@@ -324,7 +327,7 @@ - - def install_app_config(self): - source = os.path.join(resource_dir, 'app.config.template') -- dest = '/usr/share/miro/resources/app.config' -+ dest = '%%PREFIX%%/share/miro/resources/app.config' - - config_file = util.read_simple_config_file(source) - print "Trying to figure out the git revision...." -@@ -366,7 +369,7 @@ - lang = os.path.basename(source)[:-3] - if 'LINGUAS' in os.environ and lang not in os.environ['LINGUAS']: - continue -- dest = '/usr/share/locale/%s/LC_MESSAGES/miro.mo' % lang -+ dest = '%%PREFIX%%/share/locale/%s/LC_MESSAGES/miro.mo' % lang - if self.root: - dest = change_root(self.root, dest) - self.mkpath(os.path.dirname(dest)) -@@ -395,7 +398,7 @@ - - #### install_theme installs a specified theme .zip - class install_theme(Command): -- description = 'Install a provided theme to /usr/share/miro/themes' -+ description = 'Install a provided theme to %%PREFIX%%/share/miro/themes' - user_options = [("theme=", None, 'ZIP file containing the theme')] - - def initialize_options(self): -@@ -423,7 +426,7 @@ - raise DistutilsOptionError, "invalid theme file" - self.zipfile = zf - self.theme_name = themeName -- self.theme_dir = '/usr/share/miro/themes/%s' % themeName -+ self.theme_dir = '%%PREFIX%%/share/miro/themes/%s' % themeName - - def run(self): - if os.path.exists(self.theme_dir): diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-portable__startup.py multimedia/miro/files/patch-portable__startup.py --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/files/patch-portable__startup.py 2010-10-25 08:40:21.000000000 +0200 +++ multimedia/miro/files/patch-portable__startup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- portable/startup.py.orig 2009-02-12 06:37:23.000000000 +0900 -+++ portable/startup.py 2009-02-12 18:25:40.000000000 +0900 -@@ -250,7 +250,7 @@ - yield None - parse_command_line_args() - yield None -- autoupdate.check_for_updates() -+ # autoupdate.check_for_updates() - yield None - # Wait a bit before starting the downloader daemon. It can cause a bunch - # of disk/CPU load, so try to avoid it slowing other stuff down. diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/pkg-plist multimedia/miro/pkg-plist --- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/multimedia/miro/pkg-plist 2010-10-25 08:40:21.000000000 +0200 +++ multimedia/miro/pkg-plist 2010-10-24 15:58:58.000000000 +0200 @@ -3,9 +3,6 @@ %%PYTHON_SITELIBDIR%%/miro/__init__.py %%PYTHON_SITELIBDIR%%/miro/__init__.pyc %%PYTHON_SITELIBDIR%%/miro/__init__.pyo -%%PYTHON_SITELIBDIR%%/miro/adscraper.py -%%PYTHON_SITELIBDIR%%/miro/adscraper.pyc -%%PYTHON_SITELIBDIR%%/miro/adscraper.pyo %%PYTHON_SITELIBDIR%%/miro/app.py %%PYTHON_SITELIBDIR%%/miro/app.pyc %%PYTHON_SITELIBDIR%%/miro/app.pyo @@ -36,6 +33,9 @@ %%PYTHON_SITELIBDIR%%/miro/convert20database.py %%PYTHON_SITELIBDIR%%/miro/convert20database.pyc %%PYTHON_SITELIBDIR%%/miro/convert20database.pyo +%%PYTHON_SITELIBDIR%%/miro/crashreport.py +%%PYTHON_SITELIBDIR%%/miro/crashreport.pyc +%%PYTHON_SITELIBDIR%%/miro/crashreport.pyo %%PYTHON_SITELIBDIR%%/miro/database.py %%PYTHON_SITELIBDIR%%/miro/database.pyc %%PYTHON_SITELIBDIR%%/miro/database.pyo @@ -57,6 +57,9 @@ %%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.py %%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.pyc %%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.pyo +%%PYTHON_SITELIBDIR%%/miro/debugutil.py +%%PYTHON_SITELIBDIR%%/miro/debugutil.pyc +%%PYTHON_SITELIBDIR%%/miro/debugutil.pyo %%PYTHON_SITELIBDIR%%/miro/dialogs.py %%PYTHON_SITELIBDIR%%/miro/dialogs.pyc %%PYTHON_SITELIBDIR%%/miro/dialogs.pyo @@ -262,6 +265,7 @@ %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/weakconnect.py %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/weakconnect.pyc %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/weakconnect.pyo +%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/webkitgtkhacks.so %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/widgets.py %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/widgets.pyc %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/widgets.pyo @@ -319,9 +323,9 @@ %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/prefpanel.py %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/prefpanel.pyc %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/prefpanel.pyo -%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/quitwhiledownloading.py -%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/quitwhiledownloading.pyc -%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/quitwhiledownloading.pyo +%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/quitconfirmation.py +%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/quitconfirmation.pyc +%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/quitconfirmation.pyo %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/removefeeds.py %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/removefeeds.pyc %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/removefeeds.pyo @@ -358,6 +362,9 @@ %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/videobox.py %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/videobox.pyc %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/videobox.pyo +%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/videoconversionscontroller.py +%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/videoconversionscontroller.pyc +%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/videoconversionscontroller.pyo %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/watchedfolders.py %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/watchedfolders.pyc %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/watchedfolders.pyo @@ -382,15 +389,18 @@ %%PYTHON_SITELIBDIR%%/miro/httpauth.py %%PYTHON_SITELIBDIR%%/miro/httpauth.pyc %%PYTHON_SITELIBDIR%%/miro/httpauth.pyo +%%PYTHON_SITELIBDIR%%/miro/httpauthtools.py +%%PYTHON_SITELIBDIR%%/miro/httpauthtools.pyc +%%PYTHON_SITELIBDIR%%/miro/httpauthtools.pyo %%PYTHON_SITELIBDIR%%/miro/httpclient.py %%PYTHON_SITELIBDIR%%/miro/httpclient.pyc %%PYTHON_SITELIBDIR%%/miro/httpclient.pyo %%PYTHON_SITELIBDIR%%/miro/iconcache.py %%PYTHON_SITELIBDIR%%/miro/iconcache.pyc %%PYTHON_SITELIBDIR%%/miro/iconcache.pyo -%%PYTHON_SITELIBDIR%%/miro/iso_639.py -%%PYTHON_SITELIBDIR%%/miro/iso_639.pyc -%%PYTHON_SITELIBDIR%%/miro/iso_639.pyo +%%PYTHON_SITELIBDIR%%/miro/iso639.py +%%PYTHON_SITELIBDIR%%/miro/iso639.pyc +%%PYTHON_SITELIBDIR%%/miro/iso639.pyo %%PYTHON_SITELIBDIR%%/miro/item.py %%PYTHON_SITELIBDIR%%/miro/item.pyc %%PYTHON_SITELIBDIR%%/miro/item.pyo @@ -406,12 +416,18 @@ %%PYTHON_SITELIBDIR%%/miro/moviedata.py %%PYTHON_SITELIBDIR%%/miro/moviedata.pyc %%PYTHON_SITELIBDIR%%/miro/moviedata.pyo +%%PYTHON_SITELIBDIR%%/miro/net.py +%%PYTHON_SITELIBDIR%%/miro/net.pyc +%%PYTHON_SITELIBDIR%%/miro/net.pyo %%PYTHON_SITELIBDIR%%/miro/opml.py %%PYTHON_SITELIBDIR%%/miro/opml.pyc %%PYTHON_SITELIBDIR%%/miro/opml.pyo %%PYTHON_SITELIBDIR%%/miro/plat/__init__.py %%PYTHON_SITELIBDIR%%/miro/plat/__init__.pyc %%PYTHON_SITELIBDIR%%/miro/plat/__init__.pyo +%%PYTHON_SITELIBDIR%%/miro/plat/clconverter.py +%%PYTHON_SITELIBDIR%%/miro/plat/clconverter.pyc +%%PYTHON_SITELIBDIR%%/miro/plat/clconverter.pyo %%PYTHON_SITELIBDIR%%/miro/plat/config.py %%PYTHON_SITELIBDIR%%/miro/plat/config.pyc %%PYTHON_SITELIBDIR%%/miro/plat/config.pyo @@ -442,9 +458,6 @@ %%PYTHON_SITELIBDIR%%/miro/plat/frontends/widgets/widgetset.py %%PYTHON_SITELIBDIR%%/miro/plat/frontends/widgets/widgetset.pyc %%PYTHON_SITELIBDIR%%/miro/plat/frontends/widgets/widgetset.pyo -%%PYTHON_SITELIBDIR%%/miro/plat/idletime.py -%%PYTHON_SITELIBDIR%%/miro/plat/idletime.pyc -%%PYTHON_SITELIBDIR%%/miro/plat/idletime.pyo %%PYTHON_SITELIBDIR%%/miro/plat/onetime.py %%PYTHON_SITELIBDIR%%/miro/plat/onetime.pyc %%PYTHON_SITELIBDIR%%/miro/plat/onetime.pyo @@ -515,6 +528,9 @@ %%PYTHON_SITELIBDIR%%/miro/test/__init__.py %%PYTHON_SITELIBDIR%%/miro/test/__init__.pyc %%PYTHON_SITELIBDIR%%/miro/test/__init__.pyo +%%PYTHON_SITELIBDIR%%/miro/test/conversionstest.py +%%PYTHON_SITELIBDIR%%/miro/test/conversionstest.pyc +%%PYTHON_SITELIBDIR%%/miro/test/conversionstest.pyo %%PYTHON_SITELIBDIR%%/miro/test/databasesanitytest.py %%PYTHON_SITELIBDIR%%/miro/test/databasesanitytest.pyc %%PYTHON_SITELIBDIR%%/miro/test/databasesanitytest.pyo @@ -524,6 +540,9 @@ %%PYTHON_SITELIBDIR%%/miro/test/datastructurestest.py %%PYTHON_SITELIBDIR%%/miro/test/datastructurestest.pyc %%PYTHON_SITELIBDIR%%/miro/test/datastructurestest.pyo +%%PYTHON_SITELIBDIR%%/miro/test/downloadertest.py +%%PYTHON_SITELIBDIR%%/miro/test/downloadertest.pyc +%%PYTHON_SITELIBDIR%%/miro/test/downloadertest.pyo %%PYTHON_SITELIBDIR%%/miro/test/feedparsertest.py %%PYTHON_SITELIBDIR%%/miro/test/feedparsertest.pyc %%PYTHON_SITELIBDIR%%/miro/test/feedparsertest.pyo @@ -533,6 +552,9 @@ %%PYTHON_SITELIBDIR%%/miro/test/filetypestest.py %%PYTHON_SITELIBDIR%%/miro/test/filetypestest.pyc %%PYTHON_SITELIBDIR%%/miro/test/filetypestest.pyo +%%PYTHON_SITELIBDIR%%/miro/test/flashscrapertest.py +%%PYTHON_SITELIBDIR%%/miro/test/flashscrapertest.pyc +%%PYTHON_SITELIBDIR%%/miro/test/flashscrapertest.pyo %%PYTHON_SITELIBDIR%%/miro/test/framework.py %%PYTHON_SITELIBDIR%%/miro/test/framework.pyc %%PYTHON_SITELIBDIR%%/miro/test/framework.pyo @@ -554,6 +576,12 @@ %%PYTHON_SITELIBDIR%%/miro/test/messagetest.py %%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyc %%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyo +%%PYTHON_SITELIBDIR%%/miro/test/networktest.py +%%PYTHON_SITELIBDIR%%/miro/test/networktest.pyc +%%PYTHON_SITELIBDIR%%/miro/test/networktest.pyo +%%PYTHON_SITELIBDIR%%/miro/test/opmltest.py +%%PYTHON_SITELIBDIR%%/miro/test/opmltest.pyc +%%PYTHON_SITELIBDIR%%/miro/test/opmltest.pyo %%PYTHON_SITELIBDIR%%/miro/test/parseurltest.py %%PYTHON_SITELIBDIR%%/miro/test/parseurltest.pyc %%PYTHON_SITELIBDIR%%/miro/test/parseurltest.pyo @@ -581,6 +609,9 @@ %%PYTHON_SITELIBDIR%%/miro/test/subscriptiontest.py %%PYTHON_SITELIBDIR%%/miro/test/subscriptiontest.pyc %%PYTHON_SITELIBDIR%%/miro/test/subscriptiontest.pyo +%%PYTHON_SITELIBDIR%%/miro/test/testhttpserver.py +%%PYTHON_SITELIBDIR%%/miro/test/testhttpserver.pyc +%%PYTHON_SITELIBDIR%%/miro/test/testhttpserver.pyo %%PYTHON_SITELIBDIR%%/miro/test/unicodetest.py %%PYTHON_SITELIBDIR%%/miro/test/unicodetest.pyc %%PYTHON_SITELIBDIR%%/miro/test/unicodetest.pyo @@ -602,9 +633,13 @@ %%PYTHON_SITELIBDIR%%/miro/util.py %%PYTHON_SITELIBDIR%%/miro/util.pyc %%PYTHON_SITELIBDIR%%/miro/util.pyo +%%PYTHON_SITELIBDIR%%/miro/videoconversion.py +%%PYTHON_SITELIBDIR%%/miro/videoconversion.pyc +%%PYTHON_SITELIBDIR%%/miro/videoconversion.pyo %%PYTHON_SITELIBDIR%%/miro/xhtmltools.py %%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyc %%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyo + share/applications/miro.desktop share/icons/hicolor/128x128/apps/miro.png share/icons/hicolor/24x24/apps/miro.png @@ -645,6 +680,7 @@ share/locale/hi/LC_MESSAGES/miro.mo share/locale/hr/LC_MESSAGES/miro.mo share/locale/hu/LC_MESSAGES/miro.mo +share/locale/hy/LC_MESSAGES/miro.mo share/locale/id/LC_MESSAGES/miro.mo share/locale/is/LC_MESSAGES/miro.mo share/locale/it/LC_MESSAGES/miro.mo @@ -695,17 +731,26 @@ share/locale/zu/LC_MESSAGES/miro.mo share/mime/packages/miro.xml %%DATADIR%%/resources/ADOPTERS +%%DATADIR%%/resources/CREDITS %%DATADIR%%/resources/app.config +%%DATADIR%%/resources/conversions/android.conv +%%DATADIR%%/resources/conversions/apple.conv +%%DATADIR%%/resources/conversions/others.conv %%DATADIR%%/resources/images/broken-image.gif %%DATADIR%%/resources/images/cancel-button.png %%DATADIR%%/resources/images/channelguide-icon-tablist.png +%%DATADIR%%/resources/images/clear-image.png %%DATADIR%%/resources/images/download-arrow.png %%DATADIR%%/resources/images/feedicon.png %%DATADIR%%/resources/images/folder-icon-tablist.png %%DATADIR%%/resources/images/folder-icon.png +%%DATADIR%%/resources/images/fullscreen_enter.png +%%DATADIR%%/resources/images/fullscreen_exit.png %%DATADIR%%/resources/images/icon-audio.png %%DATADIR%%/resources/images/icon-audio_large.png %%DATADIR%%/resources/images/icon-channel-title.png +%%DATADIR%%/resources/images/icon-conversions.png +%%DATADIR%%/resources/images/icon-conversions_large.png %%DATADIR%%/resources/images/icon-downloading.png %%DATADIR%%/resources/images/icon-downloading_large.png %%DATADIR%%/resources/images/icon-folder.png @@ -779,6 +824,7 @@ %%DATADIR%%/resources/images/playlist-icon.png %%DATADIR%%/resources/images/popin.png %%DATADIR%%/resources/images/popout.png +%%DATADIR%%/resources/images/pref-tab-conversions.png %%DATADIR%%/resources/images/pref-tab-disk-space.png %%DATADIR%%/resources/images/pref-tab-downloads.png %%DATADIR%%/resources/images/pref-tab-feeds.png @@ -859,6 +905,11 @@ %%DATADIR%%/resources/testdata/dean.jpg %%DATADIR%%/resources/testdata/democracy-now-unicode-bug.xml %%DATADIR%%/resources/testdata/hide-result +%%DATADIR%%/resources/testdata/httpserver/foo.txt +%%DATADIR%%/resources/testdata/httpserver/linux-screen.jpg +%%DATADIR%%/resources/testdata/httpserver/redirect.html +%%DATADIR%%/resources/testdata/httpserver/test with spaces.txt +%%DATADIR%%/resources/testdata/httpserver/test.txt %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES/messages.pot %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES/miro.mo %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES/miro.po @@ -908,9 +959,11 @@ @dirrm %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES @dirrm %%DATADIR%%/resources/testdata/locale/fr @dirrm %%DATADIR%%/resources/testdata/locale +@dirrm %%DATADIR%%/resources/testdata/httpserver @dirrm %%DATADIR%%/resources/testdata @dirrm %%DATADIR%%/resources/searchengines @dirrm %%DATADIR%%/resources/images +@dirrm %%DATADIR%%/resources/conversions @dirrm %%DATADIR%%/resources @dirrm %%DATADIR%% @dirrmtry share/locale/nds/LC_MESSAGES >Release-Note: >Audit-Trail: >Unformatted: