- Update to 2.5.2

PR:		137534
Submitted by:	Ports Fury

7 files changed, 137 insertions, 94 deletions

diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 1b2927c93c1f..326cf834f52c 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Miro
-PORTVERSION=	2.0.5
+PORTVERSION=	2.5.2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/	\
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
@@ -37,6 +37,7 @@ USE_GETTEXT=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	${PORTNAME:L}
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}"
+INSTALLS_ICONS=	yes
 INSTALLS_EGGINFO=	yes
 
 MANCOMPRESSED=	yes
diff --git a/multimedia/miro/distinfo b/multimedia/miro/distinfo
index bee090fa9015..4c2ecf939abd 100644
--- a/multimedia/miro/distinfo
+++ b/multimedia/miro/distinfo
@@ -1,3 +1,3 @@
-MD5 (Miro-2.0.5.tar.gz) = bb589058844b441c8f0bd0b79532ca87
-SHA256 (Miro-2.0.5.tar.gz) = 1857a6606e4a9c5d3e51a71de525df9f4e6c41fdce8d874fc8d9f67b8844c78d
-SIZE (Miro-2.0.5.tar.gz) = 7333786
+MD5 (Miro-2.5.2.tar.gz) = e4e6a6979949c001ab06e813db7da06f
+SHA256 (Miro-2.5.2.tar.gz) = 3564f934140e7a6d79654d391a1fcb7311ad7a3fdb3149d0554444bc56d289dd
+SIZE (Miro-2.5.2.tar.gz) = 9734697
diff --git a/multimedia/miro/files/patch-platform__gtk-x11__plat__options.py b/multimedia/miro/files/patch-platform__gtk-x11__plat__options.py
index 5b4079bacd07..1b4dec955b7e 100644
--- a/multimedia/miro/files/patch-platform__gtk-x11__plat__options.py
+++ b/multimedia/miro/files/patch-platform__gtk-x11__plat__options.py
@@ -1,20 +1,17 @@
---- platform/gtk-x11/plat/options.py.orig	2009-02-12 06:37:07.000000000 +0900
-+++ platform/gtk-x11/plat/options.py	2009-02-12 18:24:15.000000000 +0900
-@@ -39,7 +39,7 @@
- from miro.prefs import Pref
+--- platform/gtk-x11/plat/options.py.orig	2009-07-25 12:41:11.000000000 +0900
++++ platform/gtk-x11/plat/options.py	2009-07-30 15:45:34.000000000 +0900
+@@ -46,12 +46,12 @@
+         self.help = help
  
- USE_RENDERER = Pref(key="useRenderer",
--                    default=u"gstreamer",
-+                    default=u"xine",
-                     platformSpecific=False,
-                     alias="renderer",
-                     help="Which renderer to use.  (gstreamer, xine)" )
-@@ -51,7 +51,7 @@
-                   help="Which visualization plugin to use for audio files.  (goom or none)" )
+ USE_RENDERER = GTKPref(key="useRenderer",
+-                       default=u"gstreamer",
++                       default=u"xine",
+                        alias="renderer",
+                        help="Which renderer to use.  (gstreamer, xine)" )
+ 
+ USE_XINE_XV_HACK = GTKPref(key="UseXineXVHack",
+-                           default=True,
++                           default=False,
+                            alias="xine-xvhack",
+                            help="Whether or not to use the Xine xv hack.  (true, false)" )
  
- USE_XINE_XV_HACK = Pref(key="UseXineXVHack",
--                        default=True,
-+                        default=False,
-                         platformSpecific=False,
-                         alias="xine-xvhack",
-                         help="Whether or not to use the Xine xv hack.  (true, false)" )
diff --git a/multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py b/multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py
index 2d1272519e82..90ab30f6be3f 100644
--- a/multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py
+++ b/multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py
@@ -1,19 +1,17 @@
---- platform/gtk-x11/plat/resources.py.orig	2009-02-12 06:37:07.000000000 +0900
-+++ platform/gtk-x11/plat/resources.py	2009-02-13 01:56:28.000000000 +0900
-@@ -29,10 +29,10 @@
- import os
- import urllib
+--- 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.environ.get('MIRO_RESOURCE_ROOT', '/usr/share/miro/resources/')
-+resource_root = os.environ.get('MIRO_RESOURCE_ROOT', '%%PREFIX%%/share/miro/resources/')
- resource_root = os.path.abspath(resource_root)
+ 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/'))
  
--share_root = os.environ.get('MIRO_SHARE_ROOT', '/usr/share/')
-+share_root = os.environ.get('MIRO_SHARE_ROOT', '%%PREFIX%%/share/')
- share_root = os.path.abspath(share_root)
- 
- # Note: some of these functions are probably not absolutely correct in
-@@ -63,7 +63,7 @@
+ def root():
+     return resource_root
+@@ -71,7 +71,7 @@
      return u"file://%s" % urllib.quote(absolute_path)
  
  def theme_path(theme, relative_path):
diff --git a/multimedia/miro/files/patch-platform_gtk-x11_setup.py b/multimedia/miro/files/patch-platform_gtk-x11_setup.py
index ce051668eab3..493bb897de3e 100644
--- a/multimedia/miro/files/patch-platform_gtk-x11_setup.py
+++ b/multimedia/miro/files/patch-platform_gtk-x11_setup.py
@@ -1,6 +1,6 @@
---- platform/gtk-x11/setup.py.orig	2009-06-26 13:15:47.000000000 +0900
-+++ platform/gtk-x11/setup.py	2009-07-05 22:35:44.000000000 +0900
-@@ -111,14 +111,15 @@
+--- platform/gtk-x11/setup.py.orig	2009-07-25 12:41:12.000000000 +0900
++++ platform/gtk-x11/setup.py	2009-07-30 15:52:08.000000000 +0900
+@@ -112,14 +112,15 @@
  # XPCOM_LIB = "firefox-xpcom"
  # GTKMOZEMBED_LIB = "firefox-gtkmozembed"
  # XULRUNNER_19 = False
@@ -20,7 +20,7 @@
  
  
  ###############################################################################
-@@ -284,6 +285,9 @@
+@@ -285,6 +286,9 @@
              options_dict['library_dirs'].append(rest)
          elif prefix == '-l':
              options_dict['libraries'].append(rest)
@@ -30,7 +30,7 @@
          else:
              options_dict['extra_compile_args'].append(comp)
  
-@@ -314,7 +318,7 @@
+@@ -315,7 +319,7 @@
      print "Using %s" % BOOST_LIB
  
  def compile_xine_extractor():
@@ -39,7 +39,7 @@
                     (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
      if rv != 0:
          raise RuntimeError("xine_extractor compilation failed.  Possibly missing libxine, gdk-pixbuf-2.0, or glib-2.0.")
-@@ -352,7 +356,7 @@
+@@ -353,7 +357,7 @@
          exit;
      fi
  
@@ -48,7 +48,7 @@
  else
      %(runtimelib)smiro.real "$@"
  fi
-@@ -365,6 +369,7 @@
+@@ -366,6 +370,7 @@
      Extension("miro.fasttypes",
          sources = [os.path.join(portable_dir, 'fasttypes.cpp')],
          libraries = [BOOST_LIB],
@@ -56,7 +56,7 @@
      )
  
  
-@@ -401,12 +406,12 @@
+@@ -402,12 +407,12 @@
                            "-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
                            "-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
                            "-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1",
@@ -71,7 +71,7 @@
  
      # get mt or non-mt versions of the boost libraries
      libraries += [mt_or_not("boost_python"),
-@@ -431,6 +436,7 @@
+@@ -432,6 +437,7 @@
      return Extension("miro.libtorrent",
                       include_dirs=include_dirs,
                       libraries=libraries,
@@ -79,7 +79,7 @@
                       extra_compile_args=extra_compile_args,
                       sources=sources)
  
-@@ -557,7 +563,7 @@
+@@ -558,7 +564,7 @@
  xlib_ext = \
      Extension("miro.plat.xlibhelper",
          [ os.path.join(platform_package_dir,'xlibhelper.pyx') ],
@@ -88,7 +88,7 @@
          libraries = ['X11'],
      )
  
-@@ -643,31 +649,31 @@
+@@ -644,36 +650,36 @@
  # 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']
@@ -103,12 +103,18 @@
 +    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 the desktop file, icons, mime data, and man page.
+ # add ADOPTERS file, the desktop file, mime data, and man page
  data_files += [
--    ('/usr/share/pixmaps',
-+    ('%%PREFIX%%/share/pixmaps',
-      glob(os.path.join(platform_dir, 'miro-*.png'))),
+-    ('/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'))),
@@ -129,7 +135,7 @@
       [os.path.join(platform_dir, 'xine/xine_extractor')]),
  ]
  
-@@ -691,7 +697,7 @@
+@@ -697,7 +703,7 @@
  
      def install_app_config(self):
          source = os.path.join(resource_dir, 'app.config.template')
@@ -138,7 +144,7 @@
  
          config_file = util.read_simple_config_file(source)
          print "Trying to figure out the svn revision...."
-@@ -731,7 +737,7 @@
+@@ -737,7 +743,7 @@
  
          for source in glob (os.path.join (locale_dir, "*.mo")):
              lang = os.path.basename(source)[:-3]
@@ -147,7 +153,7 @@
              if self.root:
                  dest = change_root(self.root, dest)
              self.mkpath(os.path.dirname(dest))
-@@ -760,7 +766,7 @@
+@@ -766,7 +772,7 @@
  
  #### install_theme installs a specified theme .zip
  class install_theme(Command):
@@ -156,7 +162,7 @@
      user_options = [("theme=", None, 'ZIP file containing the theme')]
  
      def initialize_options(self):
-@@ -788,7 +794,7 @@
+@@ -794,7 +800,7 @@
              raise DistutilsOptionError, "invalid theme file"
          self.zipfile = zf
          self.theme_name = themeName
diff --git a/multimedia/miro/files/patch-portable__util.py b/multimedia/miro/files/patch-portable__util.py
deleted file mode 100644
index 5dfe713c5436..000000000000
--- a/multimedia/miro/files/patch-portable__util.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- portable/util.py.orig	2009-06-26 13:15:52.000000000 +0900
-+++ portable/util.py	2009-07-06 02:26:25.000000000 +0900
-@@ -752,7 +752,11 @@
-         self.__add(data)
- 
-     def handle_charref(self, ref):
--        self.__add(unichr(int(ref)))
-+        if ref.startswith('x'):
-+            charnum = int(ref[1:], 16)
-+        else:
-+            charnum = int(ref)
-+        self.__add(unichr(charnum))
- 
-     def start_p(self, attributes):
-         self.__add("\n")
diff --git a/multimedia/miro/pkg-plist b/multimedia/miro/pkg-plist
index 718c40e1f8de..9f7da58c9341 100644
--- a/multimedia/miro/pkg-plist
+++ b/multimedia/miro/pkg-plist
@@ -12,6 +12,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/appconfig.py
 %%PYTHON_SITELIBDIR%%/miro/appconfig.pyc
 %%PYTHON_SITELIBDIR%%/miro/appconfig.pyo
+%%PYTHON_SITELIBDIR%%/miro/autodiscover.py
+%%PYTHON_SITELIBDIR%%/miro/autodiscover.pyc
+%%PYTHON_SITELIBDIR%%/miro/autodiscover.pyo
 %%PYTHON_SITELIBDIR%%/miro/autodler.py
 %%PYTHON_SITELIBDIR%%/miro/autodler.pyc
 %%PYTHON_SITELIBDIR%%/miro/autodler.pyo
@@ -21,13 +24,21 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/clock.py
 %%PYTHON_SITELIBDIR%%/miro/clock.pyc
 %%PYTHON_SITELIBDIR%%/miro/clock.pyo
+%%PYTHON_SITELIBDIR%%/miro/commandline.py
+%%PYTHON_SITELIBDIR%%/miro/commandline.pyc
+%%PYTHON_SITELIBDIR%%/miro/commandline.pyo
 %%PYTHON_SITELIBDIR%%/miro/config.py
 %%PYTHON_SITELIBDIR%%/miro/config.pyc
 %%PYTHON_SITELIBDIR%%/miro/config.pyo
 %%PYTHON_SITELIBDIR%%/miro/controller.py
 %%PYTHON_SITELIBDIR%%/miro/controller.pyc
 %%PYTHON_SITELIBDIR%%/miro/controller.pyo
-%%PYTHON_SITELIBDIR%%/miro/database.so
+%%PYTHON_SITELIBDIR%%/miro/convert20database.py
+%%PYTHON_SITELIBDIR%%/miro/convert20database.pyc
+%%PYTHON_SITELIBDIR%%/miro/convert20database.pyo
+%%PYTHON_SITELIBDIR%%/miro/database.py
+%%PYTHON_SITELIBDIR%%/miro/database.pyc
+%%PYTHON_SITELIBDIR%%/miro/database.pyo
 %%PYTHON_SITELIBDIR%%/miro/databasehelper.py
 %%PYTHON_SITELIBDIR%%/miro/databasehelper.pyc
 %%PYTHON_SITELIBDIR%%/miro/databasehelper.pyo
@@ -37,6 +48,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/databaseupgrade.py
 %%PYTHON_SITELIBDIR%%/miro/databaseupgrade.pyc
 %%PYTHON_SITELIBDIR%%/miro/databaseupgrade.pyo
+%%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.py
+%%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.pyc
+%%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.pyo
 %%PYTHON_SITELIBDIR%%/miro/dialogs.py
 %%PYTHON_SITELIBDIR%%/miro/dialogs.pyc
 %%PYTHON_SITELIBDIR%%/miro/dialogs.pyo
@@ -86,6 +100,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/feedparser.py
 %%PYTHON_SITELIBDIR%%/miro/feedparser.pyc
 %%PYTHON_SITELIBDIR%%/miro/feedparser.pyo
+%%PYTHON_SITELIBDIR%%/miro/feedparserutil.py
+%%PYTHON_SITELIBDIR%%/miro/feedparserutil.pyc
+%%PYTHON_SITELIBDIR%%/miro/feedparserutil.pyo
 %%PYTHON_SITELIBDIR%%/miro/feedupdate.py
 %%PYTHON_SITELIBDIR%%/miro/feedupdate.pyc
 %%PYTHON_SITELIBDIR%%/miro/feedupdate.pyo
@@ -95,9 +112,6 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/fileutil.py
 %%PYTHON_SITELIBDIR%%/miro/fileutil.pyc
 %%PYTHON_SITELIBDIR%%/miro/fileutil.pyo
-%%PYTHON_SITELIBDIR%%/miro/filters.py
-%%PYTHON_SITELIBDIR%%/miro/filters.pyc
-%%PYTHON_SITELIBDIR%%/miro/filters.pyo
 %%PYTHON_SITELIBDIR%%/miro/flashscraper.py
 %%PYTHON_SITELIBDIR%%/miro/flashscraper.pyc
 %%PYTHON_SITELIBDIR%%/miro/flashscraper.pyo
@@ -176,6 +190,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.py
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.pyc
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/audio.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/audio.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/audio.pyo
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.py
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.pyc
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.pyo
@@ -216,6 +233,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.py
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.pyc
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/sniffer.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/sniffer.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/sniffer.pyo
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.py
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.pyc
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.pyo
@@ -306,6 +326,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.py
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.pyc
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.pyo
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/segmented.py
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/segmented.pyc
+%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/segmented.pyo
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.py
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.pyc
 %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.pyo
@@ -357,16 +380,10 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/iconcache.py
 %%PYTHON_SITELIBDIR%%/miro/iconcache.pyc
 %%PYTHON_SITELIBDIR%%/miro/iconcache.pyo
-%%PYTHON_SITELIBDIR%%/miro/indexes.py
-%%PYTHON_SITELIBDIR%%/miro/indexes.pyc
-%%PYTHON_SITELIBDIR%%/miro/indexes.pyo
 %%PYTHON_SITELIBDIR%%/miro/item.py
 %%PYTHON_SITELIBDIR%%/miro/item.pyc
 %%PYTHON_SITELIBDIR%%/miro/item.pyo
 %%PYTHON_SITELIBDIR%%/miro/libtorrent.so
-%%PYTHON_SITELIBDIR%%/miro/maps.py
-%%PYTHON_SITELIBDIR%%/miro/maps.pyc
-%%PYTHON_SITELIBDIR%%/miro/maps.pyo
 %%PYTHON_SITELIBDIR%%/miro/menubar.py
 %%PYTHON_SITELIBDIR%%/miro/menubar.pyc
 %%PYTHON_SITELIBDIR%%/miro/menubar.pyo
@@ -376,6 +393,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/messages.py
 %%PYTHON_SITELIBDIR%%/miro/messages.pyc
 %%PYTHON_SITELIBDIR%%/miro/messages.pyo
+%%PYTHON_SITELIBDIR%%/miro/models.py
+%%PYTHON_SITELIBDIR%%/miro/models.pyc
+%%PYTHON_SITELIBDIR%%/miro/models.pyo
 %%PYTHON_SITELIBDIR%%/miro/moviedata.py
 %%PYTHON_SITELIBDIR%%/miro/moviedata.pyc
 %%PYTHON_SITELIBDIR%%/miro/moviedata.pyo
@@ -453,6 +473,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/plat/utils.pyc
 %%PYTHON_SITELIBDIR%%/miro/plat/utils.pyo
 %%PYTHON_SITELIBDIR%%/miro/plat/xlibhelper.so
+%%PYTHON_SITELIBDIR%%/miro/player.py
+%%PYTHON_SITELIBDIR%%/miro/player.pyc
+%%PYTHON_SITELIBDIR%%/miro/player.pyo
 %%PYTHON_SITELIBDIR%%/miro/playlist.py
 %%PYTHON_SITELIBDIR%%/miro/playlist.pyc
 %%PYTHON_SITELIBDIR%%/miro/playlist.pyo
@@ -462,6 +485,9 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/schema.py
 %%PYTHON_SITELIBDIR%%/miro/schema.pyc
 %%PYTHON_SITELIBDIR%%/miro/schema.pyo
+%%PYTHON_SITELIBDIR%%/miro/schemav79.py
+%%PYTHON_SITELIBDIR%%/miro/schemav79.pyc
+%%PYTHON_SITELIBDIR%%/miro/schemav79.pyo
 %%PYTHON_SITELIBDIR%%/miro/search.py
 %%PYTHON_SITELIBDIR%%/miro/search.pyc
 %%PYTHON_SITELIBDIR%%/miro/search.pyo
@@ -499,9 +525,6 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/test/databasetest.py
 %%PYTHON_SITELIBDIR%%/miro/test/databasetest.pyc
 %%PYTHON_SITELIBDIR%%/miro/test/databasetest.pyo
-%%PYTHON_SITELIBDIR%%/miro/test/databaseupgradetest.py
-%%PYTHON_SITELIBDIR%%/miro/test/databaseupgradetest.pyc
-%%PYTHON_SITELIBDIR%%/miro/test/databaseupgradetest.pyo
 %%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.py
 %%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.pyc
 %%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.pyo
@@ -526,6 +549,12 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.py
 %%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.pyc
 %%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.pyo
+%%PYTHON_SITELIBDIR%%/miro/test/iconcachetest.py
+%%PYTHON_SITELIBDIR%%/miro/test/iconcachetest.pyc
+%%PYTHON_SITELIBDIR%%/miro/test/iconcachetest.pyo
+%%PYTHON_SITELIBDIR%%/miro/test/itemtest.py
+%%PYTHON_SITELIBDIR%%/miro/test/itemtest.pyc
+%%PYTHON_SITELIBDIR%%/miro/test/itemtest.pyo
 %%PYTHON_SITELIBDIR%%/miro/test/messagetest.py
 %%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyc
 %%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyo
@@ -577,16 +606,18 @@ bin/miro.real
 %%PYTHON_SITELIBDIR%%/miro/util.py
 %%PYTHON_SITELIBDIR%%/miro/util.pyc
 %%PYTHON_SITELIBDIR%%/miro/util.pyo
-%%PYTHON_SITELIBDIR%%/miro/views.py
-%%PYTHON_SITELIBDIR%%/miro/views.pyc
-%%PYTHON_SITELIBDIR%%/miro/views.pyo
 %%PYTHON_SITELIBDIR%%/miro/xhtmltools.py
 %%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyc
 %%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyo
 %%PYTHON_SITELIBDIR%%/miro/xine.so
 libexec/miro/xine_extractor
 share/applications/miro.desktop
+share/icons/hicolor/128x128/apps/miro.png
+share/icons/hicolor/24x24/apps/miro.png
+share/icons/hicolor/48x48/apps/miro.png
+share/icons/hicolor/72x72/apps/miro.png
 share/locale/ar/LC_MESSAGES/miro.mo
+share/locale/be/LC_MESSAGES/miro.mo
 share/locale/bg/LC_MESSAGES/miro.mo
 share/locale/bn/LC_MESSAGES/miro.mo
 share/locale/br/LC_MESSAGES/miro.mo
@@ -625,6 +656,8 @@ share/locale/it/LC_MESSAGES/miro.mo
 share/locale/ja/LC_MESSAGES/miro.mo
 share/locale/ka/LC_MESSAGES/miro.mo
 share/locale/kk/LC_MESSAGES/miro.mo
+share/locale/km/LC_MESSAGES/miro.mo
+share/locale/kn/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
@@ -664,6 +697,7 @@ share/locale/zh_HK/LC_MESSAGES/miro.mo
 share/locale/zh_TW/LC_MESSAGES/miro.mo
 share/locale/zu/LC_MESSAGES/miro.mo
 share/mime/packages/miro.xml
+%%DATADIR%%/resources/ADOPTERS
 %%DATADIR%%/resources/app.config
 %%DATADIR%%/resources/images/broken-image.gif
 %%DATADIR%%/resources/images/cancel-button.png
@@ -675,6 +709,8 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/images/feedicon.png
 %%DATADIR%%/resources/images/folder-icon-tablist.png
 %%DATADIR%%/resources/images/folder-icon.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-downloading.png
 %%DATADIR%%/resources/images/icon-downloading_large.png
@@ -687,6 +723,8 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/images/icon-library_large.png
 %%DATADIR%%/resources/images/icon-new.png
 %%DATADIR%%/resources/images/icon-new_large.png
+%%DATADIR%%/resources/images/icon-other.png
+%%DATADIR%%/resources/images/icon-other_large.png
 %%DATADIR%%/resources/images/icon-playlist.png
 %%DATADIR%%/resources/images/icon-rss.png
 %%DATADIR%%/resources/images/icon-search.png
@@ -695,9 +733,12 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/images/icon-streaming.png
 %%DATADIR%%/resources/images/icon-streaming_large.png
 %%DATADIR%%/resources/images/icon-updating.png
-%%DATADIR%%/resources/images/list-view-button.png
-%%DATADIR%%/resources/images/list-view-button_active.png
+%%DATADIR%%/resources/images/icon-video.png
+%%DATADIR%%/resources/images/icon-video_large.png
+%%DATADIR%%/resources/images/list-view-button-icon.png
 %%DATADIR%%/resources/images/load-indicator.gif
+%%DATADIR%%/resources/images/mini-icon-audio.png
+%%DATADIR%%/resources/images/mini-icon-video.png
 %%DATADIR%%/resources/images/navback.png
 %%DATADIR%%/resources/images/navback_active.png
 %%DATADIR%%/resources/images/navback_disabled.png
@@ -713,8 +754,7 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/images/navstop.png
 %%DATADIR%%/resources/images/navstop_active.png
 %%DATADIR%%/resources/images/navstop_disabled.png
-%%DATADIR%%/resources/images/normal-view-button.png
-%%DATADIR%%/resources/images/normal-view-button_active.png
+%%DATADIR%%/resources/images/normal-view-button-icon.png
 %%DATADIR%%/resources/images/pause-button.png
 %%DATADIR%%/resources/images/pause.png
 %%DATADIR%%/resources/images/pause_active.png
@@ -749,12 +789,23 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/images/search_icon_google.png
 %%DATADIR%%/resources/images/search_icon_mefeedia.png
 %%DATADIR%%/resources/images/search_icon_metavid.png
+%%DATADIR%%/resources/images/search_icon_mininova.png
 %%DATADIR%%/resources/images/search_icon_revver.png
 %%DATADIR%%/resources/images/search_icon_veoh.png
 %%DATADIR%%/resources/images/search_icon_yahoosearch.png
 %%DATADIR%%/resources/images/search_icon_yahoovideo.png
 %%DATADIR%%/resources/images/search_icon_youtube.png
 %%DATADIR%%/resources/images/search_icon_youtubeuser.png
+%%DATADIR%%/resources/images/segmented-off-center.png
+%%DATADIR%%/resources/images/segmented-off-far-left.png
+%%DATADIR%%/resources/images/segmented-off-far-right.png
+%%DATADIR%%/resources/images/segmented-off-middle-left.png
+%%DATADIR%%/resources/images/segmented-off-middle-right.png
+%%DATADIR%%/resources/images/segmented-on-center.png
+%%DATADIR%%/resources/images/segmented-on-far-left.png
+%%DATADIR%%/resources/images/segmented-on-far-right.png
+%%DATADIR%%/resources/images/segmented-on-middle-left.png
+%%DATADIR%%/resources/images/segmented-on-middle-right.png
 %%DATADIR%%/resources/images/separator.png
 %%DATADIR%%/resources/images/share-delicious.png
 %%DATADIR%%/resources/images/share-digg.png
@@ -774,6 +825,7 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/images/stop.png
 %%DATADIR%%/resources/images/stop_active.png
 %%DATADIR%%/resources/images/thumb-default-audio.png
+%%DATADIR%%/resources/images/thumb-default-folder.png
 %%DATADIR%%/resources/images/thumb-default-video.png
 %%DATADIR%%/resources/images/thumb-overlay.png
 %%DATADIR%%/resources/images/video-download-cancel.png
@@ -792,12 +844,13 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/searchengines/everyzing.xml
 %%DATADIR%%/resources/searchengines/google.xml
 %%DATADIR%%/resources/searchengines/metavid.xml
+%%DATADIR%%/resources/searchengines/mininova.xml
 %%DATADIR%%/resources/searchengines/revver.xml
 %%DATADIR%%/resources/searchengines/veoh.xml.disabled
 %%DATADIR%%/resources/searchengines/yahoosearch.xml
-%%DATADIR%%/resources/searchengines/yahoovideo.xml
 %%DATADIR%%/resources/searchengines/youtube.xml
 %%DATADIR%%/resources/searchengines/youtubeuser.xml
+%%DATADIR%%/resources/testdata/dean.jpg
 %%DATADIR%%/resources/testdata/democracy-now-unicode-bug.xml
 %%DATADIR%%/resources/testdata/hide-result
 %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES/messages.pot
@@ -813,6 +866,10 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/testdata/olddatabase.bug.3163
 %%DATADIR%%/resources/testdata/olddatabase.bug.4039
 %%DATADIR%%/resources/testdata/olddatabase.bug.4039.part2
+%%DATADIR%%/resources/testdata/olddatabase.predbupgrade88
+%%DATADIR%%/resources/testdata/olddatabase.v71
+%%DATADIR%%/resources/testdata/olddatabase.v78
+%%DATADIR%%/resources/testdata/olddatabase.v79
 %%DATADIR%%/resources/testdata/replace-result
 %%DATADIR%%/resources/testdata/stripperdata/README
 %%DATADIR%%/resources/testdata/stripperdata/test1.expected
@@ -836,9 +893,6 @@ share/mime/packages/miro.xml
 %%DATADIR%%/resources/testdata/stripperdata/testburma.expected
 %%DATADIR%%/resources/testdata/stripperdata/testburma.in
 %%DATADIR%%/resources/testdata/translation-result
-share/pixmaps/miro-128x128.png
-share/pixmaps/miro-24x24.png
-share/pixmaps/miro-72x72.png
 share/pixmaps/miro.xpm
 @dirrm %%DATADIR%%/resources/testdata/stripperdata
 @dirrm %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES
@@ -851,6 +905,8 @@ share/pixmaps/miro.xpm
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/fy/LC_MESSAGES