3 files changed, 329 insertions, 252 deletions

diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index be586953f92d..de8e57b427eb 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Miro
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/	\
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
@@ -45,7 +45,7 @@ MANCOMPRESSED=	yes
 .include <bsd.port.pre.mk>
 
 pre-configure:
-.for pyscr in setup.py resources.py
+.for pyscr in setup.py platform/resources.py
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|'		\
 		-e 's|/usr/X11R6|${X11BASE}|g'				\
 		-e 's|/usr/share|${PREFIX}/share|g'			\
@@ -54,8 +54,14 @@ pre-configure:
 		-e 's|${LOCALBASE}/man|${MANPREFIX}/man|'		\
 		${BUILD_WRKSRC}/${pyscr}
 .endfor
+.for pyscr in miro.real timetemplates.py
+	${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|'		\
+		-e '/^PREFIX/s|/usr|${PREFIX}|' ${BUILD_WRKSRC}/${pyscr}
+.endfor
 	${REINPLACE_CMD} -e 's|BOOST_LIB_PATH|${LOCALBASE}/lib|'	\
 		${WRKSRC}/portable/setup_portable.py
+	${REINPLACE_CMD} -e 's|return "Linux"|return "${OPSYS}"|'	\
+		${BUILD_WRKSRC}/platform/__init__.py
 
 do-build:
 	(cd ${BUILD_WRKSRC} &&	\
diff --git a/multimedia/miro/distinfo b/multimedia/miro/distinfo
index dc0fc503b408..f62bf820c5d3 100644
--- a/multimedia/miro/distinfo
+++ b/multimedia/miro/distinfo
@@ -1,3 +1,3 @@
-MD5 (Miro-1.1.2.tar.gz) = 747dc21841ba1ce21b6eb7cd41d57afb
-SHA256 (Miro-1.1.2.tar.gz) = b5bbfbc1e41d483bd0ddf19f1f0cef5d5bd834d010f760d6e3032b44e55cc0bf
-SIZE (Miro-1.1.2.tar.gz) = 13335353
+MD5 (Miro-1.2.tar.gz) = 614d9d42bba3c5d25868ead6ba95d898
+SHA256 (Miro-1.2.tar.gz) = d7f42043a1da6db29b172c408e81d6b7561a4c0258bf76ec40067e25b615865d
+SIZE (Miro-1.2.tar.gz) = 14574478
diff --git a/multimedia/miro/pkg-plist b/multimedia/miro/pkg-plist
index bd990578e046..22a9cdd9af9c 100644
--- a/multimedia/miro/pkg-plist
+++ b/multimedia/miro/pkg-plist
@@ -1,7 +1,6 @@
 bin/miro
 bin/miro.real
 libexec/xine_extractor
-%%PYTHON_SITELIBDIR%%/miro/MozillaBrowser.so
 %%PYTHON_SITELIBDIR%%/miro/__init__.py
 %%PYTHON_SITELIBDIR%%/miro/__init__.pyc
 %%PYTHON_SITELIBDIR%%/miro/__init__.pyo
@@ -11,6 +10,9 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/app.py
 %%PYTHON_SITELIBDIR%%/miro/app.pyc
 %%PYTHON_SITELIBDIR%%/miro/app.pyo
+%%PYTHON_SITELIBDIR%%/miro/appconfig.py
+%%PYTHON_SITELIBDIR%%/miro/appconfig.pyc
+%%PYTHON_SITELIBDIR%%/miro/appconfig.pyo
 %%PYTHON_SITELIBDIR%%/miro/autodler.py
 %%PYTHON_SITELIBDIR%%/miro/autodler.pyc
 %%PYTHON_SITELIBDIR%%/miro/autodler.pyo
@@ -20,150 +22,12 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/clock.py
 %%PYTHON_SITELIBDIR%%/miro/clock.pyc
 %%PYTHON_SITELIBDIR%%/miro/clock.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/__init__.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/__init__.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/__init__.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel_content.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel_content.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel_content.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel_folder.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel_folder.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channel_folder.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channelfoldertab.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channelfoldertab.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/channelfoldertab.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_description.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_description.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_description.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_details.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_details.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_details.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_inner.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_inner.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_inner.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_thumbnail.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_thumbnail.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/download_item_thumbnail.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/external_playback.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/external_playback.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/external_playback.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/external_playback_continue.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/external_playback_continue.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/external_playback_continue.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/feed_settings.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/feed_settings.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/feed_settings.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/feedtab.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/feedtab.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/feedtab.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/guide_loading.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/guide_loading.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/guide_loading.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/guidetab.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/guidetab.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/guidetab.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/library.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/library.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/library.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/multi_channel.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/multi_channel.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/multi_channel.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/multi_playlist.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/multi_playlist.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/multi_playlist.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/new.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/new.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/new.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlist.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlist.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlist.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlist_folder.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlist_folder.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlist_folder.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlistfoldertab.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlistfoldertab.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlistfoldertab.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlisttab.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlisttab.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/playlisttab.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/search.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/search.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/search.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/sort_bar.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/sort_bar.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/sort_bar.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/static_tab_sort_bar.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/static_tab_sort_bar.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/static_tab_sort_bar.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/statictab.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/statictab.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/statictab.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/tablist.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/tablist.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/tablist.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/__init__.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/__init__.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/__init__.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/execute_template.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/execute_template.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/execute_template.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/hide.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/hide.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/hide.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/include.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/include.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/include.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/include_template.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/include_template.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/include_template.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/replace.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/replace.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/replace.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/replace_with_variable.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/replace_with_variable.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/replace_with_variable.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/simple.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/simple.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/simple.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/simpleunicode.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/simpleunicode.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/simpleunicode.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/translationtest.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/translationtest.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/translationtest.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/update.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/update.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/update.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/update_hide.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/update_hide.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/update_hide.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view_container_div.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view_container_div.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view_container_div.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view_double.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view_double.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest/view_double.pyo
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/video_info.py
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/video_info.pyc
-%%PYTHON_SITELIBDIR%%/miro/compiled_templates/video_info.pyo
 %%PYTHON_SITELIBDIR%%/miro/config.py
 %%PYTHON_SITELIBDIR%%/miro/config.pyc
 %%PYTHON_SITELIBDIR%%/miro/config.pyo
-%%PYTHON_SITELIBDIR%%/miro/coverage.py
-%%PYTHON_SITELIBDIR%%/miro/coverage.pyc
-%%PYTHON_SITELIBDIR%%/miro/coverage.pyo
+%%PYTHON_SITELIBDIR%%/miro/controller.py
+%%PYTHON_SITELIBDIR%%/miro/controller.pyc
+%%PYTHON_SITELIBDIR%%/miro/controller.pyo
 %%PYTHON_SITELIBDIR%%/miro/database.so
 %%PYTHON_SITELIBDIR%%/miro/databasehelper.py
 %%PYTHON_SITELIBDIR%%/miro/databasehelper.pyc
@@ -238,51 +102,195 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/folder.py
 %%PYTHON_SITELIBDIR%%/miro/folder.pyc
 %%PYTHON_SITELIBDIR%%/miro/folder.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend.py
-%%PYTHON_SITELIBDIR%%/miro/frontend.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/Application.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/Application.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/Application.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/HTMLDisplay.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/HTMLDisplay.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/HTMLDisplay.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/MainFrame.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/MainFrame.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/MainFrame.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/UIBackendDelegate.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/UIBackendDelegate.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/UIBackendDelegate.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/VideoDisplay.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/VideoDisplay.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/VideoDisplay.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/__init__.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/__init__.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/__init__.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/callbackhandler.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/callbackhandler.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/callbackhandler.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gst_extractor.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gst_extractor.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gst_extractor.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gstrenderer.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gstrenderer.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gstrenderer.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gtk_queue.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gtk_queue.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/gtk_queue.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/mainwindowchanger.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/mainwindowchanger.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/mainwindowchanger.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/startup.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/startup.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/startup.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/trayicon.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/trayicon.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/trayicon.pyo
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/xinerenderer.py
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/xinerenderer.pyc
-%%PYTHON_SITELIBDIR%%/miro/frontend_implementation/xinerenderer.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/events.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/events.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/events.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/interpreter.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/interpreter.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/interpreter.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel_content.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel_content.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel_content.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel_folder.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel_folder.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channel_folder.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channelfoldertab.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channelfoldertab.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/channelfoldertab.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_description.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_description.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_description.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_details.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_details.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_details.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_inner.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_inner.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_inner.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_thumbnail.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_thumbnail.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/download_item_thumbnail.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/external_playback.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/external_playback.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/external_playback.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/external_playback_continue.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/external_playback_continue.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/external_playback_continue.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/feed_settings.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/feed_settings.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/feed_settings.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/feedtab.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/feedtab.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/feedtab.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/guide_loading.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/guide_loading.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/guide_loading.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/guidetab.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/guidetab.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/guidetab.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/library.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/library.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/library.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/multi_channel.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/multi_channel.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/multi_channel.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/multi_playlist.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/multi_playlist.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/multi_playlist.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/new.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/new.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/new.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlist.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlist.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlist.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlist_folder.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlist_folder.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlist_folder.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlistfoldertab.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlistfoldertab.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlistfoldertab.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlisttab.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlisttab.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/playlisttab.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/search.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/search.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/search.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/sort_bar.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/sort_bar.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/sort_bar.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/static_tab_sort_bar.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/static_tab_sort_bar.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/static_tab_sort_bar.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/statictab.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/statictab.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/statictab.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/tablist.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/tablist.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/tablist.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/execute_template.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/execute_template.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/execute_template.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/hide.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/hide.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/hide.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/include.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/include.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/include.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/include_template.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/include_template.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/include_template.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/replace.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/replace.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/replace.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/replace_with_variable.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/replace_with_variable.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/replace_with_variable.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/simple.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/simple.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/simple.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/simpleunicode.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/simpleunicode.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/simpleunicode.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/translationtest.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/translationtest.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/translationtest.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/update.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/update.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/update.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/update_hide.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/update_hide.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/update_hide.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view_container_div.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view_container_div.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view_container_div.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view_double.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view_double.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/view_double.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/video_info.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/video_info.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/video_info.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/contextmenu.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/contextmenu.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/contextmenu.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/displaybase.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/displaybase.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/displaybase.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/keyboard.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/keyboard.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/keyboard.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/main.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/main.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/main.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/playbackcontroller.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/playbackcontroller.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/playbackcontroller.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/template.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/template.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/template.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/template_compiler.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/template_compiler.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/template_compiler.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templatedisplay.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templatedisplay.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templatedisplay.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templatehelper.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templatehelper.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templatehelper.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templateoptimize.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templateoptimize.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/html/templateoptimize.pyo
 %%PYTHON_SITELIBDIR%%/miro/gtcache.py
 %%PYTHON_SITELIBDIR%%/miro/gtcache.pyc
 %%PYTHON_SITELIBDIR%%/miro/gtcache.pyo
@@ -298,12 +306,9 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/iconcache.py
 %%PYTHON_SITELIBDIR%%/miro/iconcache.pyc
 %%PYTHON_SITELIBDIR%%/miro/iconcache.pyo
-%%PYTHON_SITELIBDIR%%/miro/idlenotifier.py
-%%PYTHON_SITELIBDIR%%/miro/idlenotifier.pyc
-%%PYTHON_SITELIBDIR%%/miro/idlenotifier.pyo
-%%PYTHON_SITELIBDIR%%/miro/idletime.py
-%%PYTHON_SITELIBDIR%%/miro/idletime.pyc
-%%PYTHON_SITELIBDIR%%/miro/idletime.pyo
+%%PYTHON_SITELIBDIR%%/miro/iheartmiro.py
+%%PYTHON_SITELIBDIR%%/miro/iheartmiro.pyc
+%%PYTHON_SITELIBDIR%%/miro/iheartmiro.pyo
 %%PYTHON_SITELIBDIR%%/miro/imageresize.py
 %%PYTHON_SITELIBDIR%%/miro/imageresize.pyc
 %%PYTHON_SITELIBDIR%%/miro/imageresize.pyo
@@ -313,9 +318,6 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/item.py
 %%PYTHON_SITELIBDIR%%/miro/item.pyc
 %%PYTHON_SITELIBDIR%%/miro/item.pyo
-%%PYTHON_SITELIBDIR%%/miro/keyboard.py
-%%PYTHON_SITELIBDIR%%/miro/keyboard.pyc
-%%PYTHON_SITELIBDIR%%/miro/keyboard.pyo
 %%PYTHON_SITELIBDIR%%/miro/libtorrent.so
 %%PYTHON_SITELIBDIR%%/miro/license.py
 %%PYTHON_SITELIBDIR%%/miro/license.pyc
@@ -323,33 +325,98 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/maps.py
 %%PYTHON_SITELIBDIR%%/miro/maps.pyc
 %%PYTHON_SITELIBDIR%%/miro/maps.pyo
-%%PYTHON_SITELIBDIR%%/miro/menu.py
-%%PYTHON_SITELIBDIR%%/miro/menu.pyc
-%%PYTHON_SITELIBDIR%%/miro/menu.pyo
 %%PYTHON_SITELIBDIR%%/miro/menubar.py
 %%PYTHON_SITELIBDIR%%/miro/menubar.pyc
 %%PYTHON_SITELIBDIR%%/miro/menubar.pyo
 %%PYTHON_SITELIBDIR%%/miro/moviedata.py
 %%PYTHON_SITELIBDIR%%/miro/moviedata.pyc
 %%PYTHON_SITELIBDIR%%/miro/moviedata.pyo
-%%PYTHON_SITELIBDIR%%/miro/mozsetup.py
-%%PYTHON_SITELIBDIR%%/miro/mozsetup.pyc
-%%PYTHON_SITELIBDIR%%/miro/mozsetup.pyo
 %%PYTHON_SITELIBDIR%%/miro/olddatabaseupgrade.py
 %%PYTHON_SITELIBDIR%%/miro/olddatabaseupgrade.pyc
 %%PYTHON_SITELIBDIR%%/miro/olddatabaseupgrade.pyo
-%%PYTHON_SITELIBDIR%%/miro/onetime.py
-%%PYTHON_SITELIBDIR%%/miro/onetime.pyc
-%%PYTHON_SITELIBDIR%%/miro/onetime.pyo
 %%PYTHON_SITELIBDIR%%/miro/opml.py
 %%PYTHON_SITELIBDIR%%/miro/opml.pyc
 %%PYTHON_SITELIBDIR%%/miro/opml.pyo
-%%PYTHON_SITELIBDIR%%/miro/platformcfg.py
-%%PYTHON_SITELIBDIR%%/miro/platformcfg.pyc
-%%PYTHON_SITELIBDIR%%/miro/platformcfg.pyo
-%%PYTHON_SITELIBDIR%%/miro/platformutils.py
-%%PYTHON_SITELIBDIR%%/miro/platformutils.pyc
-%%PYTHON_SITELIBDIR%%/miro/platformutils.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/MozillaBrowser.so
+%%PYTHON_SITELIBDIR%%/miro/platform/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/platform/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/config.py
+%%PYTHON_SITELIBDIR%%/miro/platform/config.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/config.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/Application.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/Application.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/Application.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/HTMLDisplay.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/HTMLDisplay.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/HTMLDisplay.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/MainFrame.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/MainFrame.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/MainFrame.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/UIBackendDelegate.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/UIBackendDelegate.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/UIBackendDelegate.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/VideoDisplay.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/VideoDisplay.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/VideoDisplay.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/callbackhandler.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/callbackhandler.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/callbackhandler.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/gtk_queue.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/gtk_queue.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/gtk_queue.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/mainwindowchanger.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/mainwindowchanger.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/mainwindowchanger.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/startup.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/startup.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/startup.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/threads.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/threads.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/threads.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/trayicon.py
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/trayicon.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/trayicon.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/idletime.py
+%%PYTHON_SITELIBDIR%%/miro/platform/idletime.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/idletime.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/mozsetup.py
+%%PYTHON_SITELIBDIR%%/miro/platform/mozsetup.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/mozsetup.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/onetime.py
+%%PYTHON_SITELIBDIR%%/miro/platform/onetime.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/onetime.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/options.py
+%%PYTHON_SITELIBDIR%%/miro/platform/options.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/options.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/__init__.py
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/gst_extractor.py
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/gst_extractor.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/gst_extractor.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/gstreamerrenderer.py
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/gstreamerrenderer.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/gstreamerrenderer.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/xinerenderer.py
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/xinerenderer.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/renderers/xinerenderer.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/resources.py
+%%PYTHON_SITELIBDIR%%/miro/platform/resources.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/resources.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/upgrade.py
+%%PYTHON_SITELIBDIR%%/miro/platform/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/upgrade.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/utils.py
+%%PYTHON_SITELIBDIR%%/miro/platform/utils.pyc
+%%PYTHON_SITELIBDIR%%/miro/platform/utils.pyo
+%%PYTHON_SITELIBDIR%%/miro/platform/xlibhelper.so
 %%PYTHON_SITELIBDIR%%/miro/playlist.py
 %%PYTHON_SITELIBDIR%%/miro/playlist.pyc
 %%PYTHON_SITELIBDIR%%/miro/playlist.pyo
@@ -359,12 +426,6 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/rdfa.py
 %%PYTHON_SITELIBDIR%%/miro/rdfa.pyc
 %%PYTHON_SITELIBDIR%%/miro/rdfa.pyo
-%%PYTHON_SITELIBDIR%%/miro/readwritelock.py
-%%PYTHON_SITELIBDIR%%/miro/readwritelock.pyc
-%%PYTHON_SITELIBDIR%%/miro/readwritelock.pyo
-%%PYTHON_SITELIBDIR%%/miro/resources.py
-%%PYTHON_SITELIBDIR%%/miro/resources.pyc
-%%PYTHON_SITELIBDIR%%/miro/resources.pyo
 %%PYTHON_SITELIBDIR%%/miro/schema.py
 %%PYTHON_SITELIBDIR%%/miro/schema.pyc
 %%PYTHON_SITELIBDIR%%/miro/schema.pyo
@@ -380,10 +441,16 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/setup_portable.py
 %%PYTHON_SITELIBDIR%%/miro/setup_portable.pyc
 %%PYTHON_SITELIBDIR%%/miro/setup_portable.pyo
+%%PYTHON_SITELIBDIR%%/miro/signals.py
+%%PYTHON_SITELIBDIR%%/miro/signals.pyc
+%%PYTHON_SITELIBDIR%%/miro/signals.pyo
 %%PYTHON_SITELIBDIR%%/miro/singleclick.py
 %%PYTHON_SITELIBDIR%%/miro/singleclick.pyc
 %%PYTHON_SITELIBDIR%%/miro/singleclick.pyo
 %%PYTHON_SITELIBDIR%%/miro/sorts.so
+%%PYTHON_SITELIBDIR%%/miro/startup.py
+%%PYTHON_SITELIBDIR%%/miro/startup.pyc
+%%PYTHON_SITELIBDIR%%/miro/startup.pyo
 %%PYTHON_SITELIBDIR%%/miro/storedatabase.py
 %%PYTHON_SITELIBDIR%%/miro/storedatabase.pyc
 %%PYTHON_SITELIBDIR%%/miro/storedatabase.pyo
@@ -393,18 +460,6 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/tabs.py
 %%PYTHON_SITELIBDIR%%/miro/tabs.pyc
 %%PYTHON_SITELIBDIR%%/miro/tabs.pyo
-%%PYTHON_SITELIBDIR%%/miro/template.py
-%%PYTHON_SITELIBDIR%%/miro/template.pyc
-%%PYTHON_SITELIBDIR%%/miro/template.pyo
-%%PYTHON_SITELIBDIR%%/miro/template_compiler.py
-%%PYTHON_SITELIBDIR%%/miro/template_compiler.pyc
-%%PYTHON_SITELIBDIR%%/miro/template_compiler.pyo
-%%PYTHON_SITELIBDIR%%/miro/templatehelper.py
-%%PYTHON_SITELIBDIR%%/miro/templatehelper.pyc
-%%PYTHON_SITELIBDIR%%/miro/templatehelper.pyo
-%%PYTHON_SITELIBDIR%%/miro/templateoptimize.py
-%%PYTHON_SITELIBDIR%%/miro/templateoptimize.pyc
-%%PYTHON_SITELIBDIR%%/miro/templateoptimize.pyo
 %%PYTHON_SITELIBDIR%%/miro/test/__init__.py
 %%PYTHON_SITELIBDIR%%/miro/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/miro/test/__init__.pyo
@@ -453,6 +508,9 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/test/schematest.py
 %%PYTHON_SITELIBDIR%%/miro/test/schematest.pyc
 %%PYTHON_SITELIBDIR%%/miro/test/schematest.pyo
+%%PYTHON_SITELIBDIR%%/miro/test/signalstest.py
+%%PYTHON_SITELIBDIR%%/miro/test/signalstest.pyc
+%%PYTHON_SITELIBDIR%%/miro/test/signalstest.pyo
 %%PYTHON_SITELIBDIR%%/miro/test/storedatabasetest.py
 %%PYTHON_SITELIBDIR%%/miro/test/storedatabasetest.pyc
 %%PYTHON_SITELIBDIR%%/miro/test/storedatabasetest.pyo
@@ -471,12 +529,9 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/theme.py
 %%PYTHON_SITELIBDIR%%/miro/theme.pyc
 %%PYTHON_SITELIBDIR%%/miro/theme.pyo
-%%PYTHON_SITELIBDIR%%/miro/timetemplates.py
-%%PYTHON_SITELIBDIR%%/miro/timetemplates.pyc
-%%PYTHON_SITELIBDIR%%/miro/timetemplates.pyo
-%%PYTHON_SITELIBDIR%%/miro/upgrade.py
-%%PYTHON_SITELIBDIR%%/miro/upgrade.pyc
-%%PYTHON_SITELIBDIR%%/miro/upgrade.pyo
+%%PYTHON_SITELIBDIR%%/miro/trapcall.py
+%%PYTHON_SITELIBDIR%%/miro/trapcall.pyc
+%%PYTHON_SITELIBDIR%%/miro/trapcall.pyo
 %%PYTHON_SITELIBDIR%%/miro/util.py
 %%PYTHON_SITELIBDIR%%/miro/util.pyc
 %%PYTHON_SITELIBDIR%%/miro/util.pyo
@@ -487,7 +542,6 @@ libexec/xine_extractor
 %%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyc
 %%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyo
 %%PYTHON_SITELIBDIR%%/miro/xine.so
-%%PYTHON_SITELIBDIR%%/miro/xlibhelper.so
 %%DESKTOPDIR%%/miro.desktop
 %%DATADIR%%/resources/app.config
 %%DATADIR%%/resources/channels.png
@@ -704,9 +758,8 @@ libexec/xine_extractor
 %%DATADIR%%/resources/searchengines/blogdigger.xml
 %%DATADIR%%/resources/searchengines/dailymotion.xml
 %%DATADIR%%/resources/searchengines/google.xml
-%%DATADIR%%/resources/searchengines/mefeedia.xml
 %%DATADIR%%/resources/searchengines/revver.xml
-%%DATADIR%%/resources/searchengines/veoh.xml.broken
+%%DATADIR%%/resources/searchengines/veoh.xml
 %%DATADIR%%/resources/searchengines/yahoosearch.xml
 %%DATADIR%%/resources/searchengines/yahoovideo.xml
 %%DATADIR%%/resources/searchengines/youtube.xml
@@ -728,6 +781,7 @@ libexec/xine_extractor
 %%DATADIR%%/resources/templates/feed-settings
 %%DATADIR%%/resources/templates/feedtab
 %%DATADIR%%/resources/templates/guide-loading
+%%DATADIR%%/resources/templates/guide-loading.js
 %%DATADIR%%/resources/templates/guidetab
 %%DATADIR%%/resources/templates/library
 %%DATADIR%%/resources/templates/multi-channel
@@ -780,6 +834,7 @@ share/locale/br/LC_MESSAGES/miro.mo
 share/locale/bs/LC_MESSAGES/miro.mo
 share/locale/ca/LC_MESSAGES/miro.mo
 share/locale/cs/LC_MESSAGES/miro.mo
+share/locale/csb/LC_MESSAGES/miro.mo
 share/locale/cy/LC_MESSAGES/miro.mo
 share/locale/da/LC_MESSAGES/miro.mo
 share/locale/de/LC_MESSAGES/miro.mo
@@ -810,11 +865,14 @@ share/locale/ka/LC_MESSAGES/miro.mo
 share/locale/ko/LC_MESSAGES/miro.mo
 share/locale/ku/LC_MESSAGES/miro.mo
 share/locale/lt/LC_MESSAGES/miro.mo
+share/locale/lv/LC_MESSAGES/miro.mo
 share/locale/mk/LC_MESSAGES/miro.mo
 share/locale/ml/LC_MESSAGES/miro.mo
 share/locale/mr/LC_MESSAGES/miro.mo
 share/locale/ms/LC_MESSAGES/miro.mo
 share/locale/nb/LC_MESSAGES/miro.mo
+share/locale/nds/LC_MESSAGES/miro.mo
+share/locale/ne/LC_MESSAGES/miro.mo
 share/locale/nl/LC_MESSAGES/miro.mo
 share/locale/nn/LC_MESSAGES/miro.mo
 share/locale/pa/LC_MESSAGES/miro.mo
@@ -823,15 +881,18 @@ share/locale/pt/LC_MESSAGES/miro.mo
 share/locale/pt_BR/LC_MESSAGES/miro.mo
 share/locale/ro/LC_MESSAGES/miro.mo
 share/locale/ru/LC_MESSAGES/miro.mo
+share/locale/si/LC_MESSAGES/miro.mo
 share/locale/sk/LC_MESSAGES/miro.mo
 share/locale/sl/LC_MESSAGES/miro.mo
 share/locale/sq/LC_MESSAGES/miro.mo
 share/locale/sr/LC_MESSAGES/miro.mo
 share/locale/sv/LC_MESSAGES/miro.mo
+share/locale/ta/LC_MESSAGES/miro.mo
 share/locale/te/LC_MESSAGES/miro.mo
 share/locale/th/LC_MESSAGES/miro.mo
 share/locale/tl/LC_MESSAGES/miro.mo
 share/locale/tr/LC_MESSAGES/miro.mo
+share/locale/uk/LC_MESSAGES/miro.mo
 share/locale/vi/LC_MESSAGES/miro.mo
 share/locale/zh_CN/LC_MESSAGES/miro.mo
 share/locale/zh_HK/LC_MESSAGES/miro.mo
@@ -840,12 +901,17 @@ share/mime/packages/miro.xml
 share/pixmaps/miro-128x128.png
 share/pixmaps/miro-24x24.png
 share/pixmaps/miro-72x72.png
+@dirrm share/locale/nds/LC_MESSAGES
+@dirrm share/locale/nds
 @dirrm share/locale/fy/LC_MESSAGES
 @dirrm share/locale/fy
-@dirrm share/locale/fil/LC_MESSAGES
-@dirrm share/locale/fil
 @dirrm share/locale/fo/LC_MESSAGES
 @dirrm share/locale/fo
+@dirrm share/locale/fil/LC_MESSAGES
+@dirrm share/locale/fil
+@dirrm share/locale/csb/LC_MESSAGES
+@dirrm share/locale/csb
+@dirrmtry %%DESKTOPDIR%%
 @dirrm %%DATADIR%%/resources/testdata
 @dirrm %%DATADIR%%/resources/templates/unittest
 @dirrm %%DATADIR%%/resources/templates
@@ -855,13 +921,18 @@ share/pixmaps/miro-72x72.png
 @dirrm %%DATADIR%%/resources/css
 @dirrm %%DATADIR%%/resources
 @dirrm %%DATADIR%%
-@dirrmtry %%DESKTOPDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/miro/test
-@dirrm %%PYTHON_SITELIBDIR%%/miro/frontend_implementation
-@dirrm %%PYTHON_SITELIBDIR%%/miro/dl_daemon/private
-@dirrm %%PYTHON_SITELIBDIR%%/miro/dl_daemon
-@dirrm %%PYTHON_SITELIBDIR%%/miro/compiled_templates/unittest
-@dirrm %%PYTHON_SITELIBDIR%%/miro/compiled_templates
+@dirrm %%PYTHON_SITELIBDIR%%/miro/test/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/platform/renderers/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/platform/frontends/html/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/platform/frontends/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/platform/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/unittest/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/html/compiled_templates/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/html/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/cli/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/dl_daemon/private/
+@dirrm %%PYTHON_SITELIBDIR%%/miro/dl_daemon/
 @dirrm %%PYTHON_SITELIBDIR%%/miro
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime