From c4e930a17bc34f2b8c5e7e847b142a2395b497cc Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 25 Jun 2015 23:16:45 +0200
Subject: [PATCH 1/4] mpd: Fix 'title' to 'track' and back conversion in list
 cmd

(cherry picked from commit 0d032a25fa8f8db60fb8c2de2cf00d145e9749a5)
---
 mopidy/mpd/protocol/music_db.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mopidy/mpd/protocol/music_db.py b/mopidy/mpd/protocol/music_db.py
index de800f4b..1e80f2a0 100644
--- a/mopidy/mpd/protocol/music_db.py
+++ b/mopidy/mpd/protocol/music_db.py
@@ -32,7 +32,7 @@ _LIST_MAPPING = {
     'performer': 'performer'}
 
 _LIST_NAME_MAPPING = {
-    'title': 'Title',
+    'track': 'Title',
     'album': 'Album',
     'albumartist': 'AlbumArtist',
     'artist': 'Artist',
@@ -260,9 +260,10 @@ def list_(context, *args):
     params = list(args)
     if not params:
         raise exceptions.MpdArgError('incorrect arguments')
-    field = params.pop(0).lower()
 
-    if field not in _LIST_MAPPING:
+    field = params.pop(0).lower()
+    field = _LIST_MAPPING.get(field)
+    if field is None:
         raise exceptions.MpdArgError('incorrect arguments')
 
     if len(params) == 1:

From 1345f23b20f990530b31e2da3e19566645d0d057 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 25 Jun 2015 23:23:48 +0200
Subject: [PATCH 2/4] docs: Update changelog

---
 docs/changelog.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d3e3d21a..e5445a2c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,15 @@ Changelog
 This changelog is used to track all major changes to Mopidy.
 
 
+v1.0.7 (unreleased)
+===================
+
+Bug fix release.
+
+- Fix error in the MPD command ``list title ...``. The error was introduced in
+  v1.0.6.
+
+
 v1.0.6 (2015-06-25)
 ===================
 

From 97a5ae737f678a96648592c6f912409341ce02a7 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 26 Jun 2015 00:34:24 +0200
Subject: [PATCH 3/4] docs: Update changelog for v1.0.7

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e5445a2c..818619e4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 This changelog is used to track all major changes to Mopidy.
 
 
-v1.0.7 (unreleased)
+v1.0.7 (2015-06-26)
 ===================
 
 Bug fix release.

From bc2f56d0bf40d2126536ed1847c5b97f793cab8a Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 26 Jun 2015 00:34:59 +0200
Subject: [PATCH 4/4] Bump version to 1.0.7

---
 mopidy/__init__.py    | 2 +-
 tests/test_version.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mopidy/__init__.py b/mopidy/__init__.py
index 5f2384a8..7ab3b9e6 100644
--- a/mopidy/__init__.py
+++ b/mopidy/__init__.py
@@ -30,4 +30,4 @@ except ImportError:
 warnings.filterwarnings('ignore', 'could not open display')
 
 
-__version__ = '1.0.6'
+__version__ = '1.0.7'
diff --git a/tests/test_version.py b/tests/test_version.py
index 82e30834..f8afd3db 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -61,5 +61,6 @@ class VersionTest(unittest.TestCase):
         self.assertVersionLess('1.0.2', '1.0.3')
         self.assertVersionLess('1.0.3', '1.0.4')
         self.assertVersionLess('1.0.4', '1.0.5')
-        self.assertVersionLess('1.0.5', __version__)
-        self.assertVersionLess(__version__, '1.0.7')
+        self.assertVersionLess('1.0.5', '1.0.6')
+        self.assertVersionLess('1.0.6', __version__)
+        self.assertVersionLess(__version__, '1.0.8')