From 8c2585771cedc809a96ae4971b23e1fabc9d9404 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 1 Sep 2015 23:31:41 +0200
Subject: [PATCH] local: Really deprecate local/data_dir

---
 docs/changelog.rst       | 6 ++++++
 mopidy/local/__init__.py | 2 +-
 mopidy/local/ext.conf    | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0856437c..9aef5d61 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,12 @@ v1.2.0 (UNRELEASED)
 
 Feature release.
 
+Local
+-----
+
+- Made :confval:`local/data_dir` really deprecated. This change breaks older
+  versions of Mopidy-Local-SQLite and Mopidy-Local-Images.
+
 Cleanups
 --------
 
diff --git a/mopidy/local/__init__.py b/mopidy/local/__init__.py
index 552e5341..3ee2703e 100644
--- a/mopidy/local/__init__.py
+++ b/mopidy/local/__init__.py
@@ -23,7 +23,7 @@ class Extension(ext.Extension):
         schema = super(Extension, self).get_config_schema()
         schema['library'] = config.String()
         schema['media_dir'] = config.Path()
-        schema['data_dir'] = config.Path(optional=True)
+        schema['data_dir'] = config.Deprecated()
         schema['playlists_dir'] = config.Deprecated()
         schema['tag_cache_file'] = config.Deprecated()
         schema['scan_timeout'] = config.Integer(
diff --git a/mopidy/local/ext.conf b/mopidy/local/ext.conf
index c8fe6b86..b37a3a7a 100644
--- a/mopidy/local/ext.conf
+++ b/mopidy/local/ext.conf
@@ -2,7 +2,6 @@
 enabled = true
 library = json
 media_dir = $XDG_MUSIC_DIR
-data_dir = $XDG_DATA_DIR/mopidy/local
 scan_timeout = 1000
 scan_flush_threshold = 100
 scan_follow_symlinks = false