Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
	mopidy/__init__.py
	tests/version_test.py

MANIFEST.in

@@ -1,5 +1,5 @@
 include LICENSE pylintrc *.rst data/mopidy.desktop
-include mopidy/backends/libspotify/spotify_appkey.key
+include mopidy/backends/spotify/spotify_appkey.key
 recursive-include docs *
 prune docs/_build
 recursive-include requirements *

docs/changes.rst

@@ -16,6 +16,20 @@ No description yet.
 - No changes yet.
 
 
+0.3.1 (2010-01-22)
+==================
+
+A couple of fixes to the 0.3.0 release is needed to get a smooth installation.
+
+**Bugfixes**
+
+- The Spotify application key was missing from the Python package.
+
+- Installation of the Python package as a normal user failed because it did not
+  have permissions to install ``mopidy.desktop``. The file is now only
+  installed if the installation is executed as the root user.
+
+
 0.3.0 (2010-01-22)
 ==================
 

setup.py

@@ -69,7 +69,10 @@ for dirpath, dirnames, filenames in os.walk(project_dir):
         data_files.append([dirpath,
             [os.path.join(dirpath, f) for f in filenames]])
 
-data_files.append(('/usr/local/share/applications', ['data/mopidy.desktop']))
+if os.geteuid() == 0:
+    # Only try to install this file if we are root
+    data_files.append(
+        ('/usr/local/share/applications', ['data/mopidy.desktop']))
 
 setup(
     name='Mopidy',

tests/version_test.py

@@ -15,5 +15,6 @@ class VersionTest(unittest.TestCase):
         self.assert_(SV('0.1.0') < SV('0.2.0'))
         self.assert_(SV('0.1.0') < SV('1.0.0'))
         self.assert_(SV('0.2.0') < SV('0.3.0'))
-        self.assert_(SV('0.3.0') < SV(get_version()))
+        self.assert_(SV('0.3.0') < SV('0.3.1'))
+        self.assert_(SV('0.3.1') < SV(get_version()))
         self.assert_(SV(get_version()) < SV('0.4.1'))