[SCM] mpd-sima/master: Do not use /etc/default/mpd-sima with systemd init

[kaliko-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 671aca8934f233926fe21a55910781ae96c62999
Author: geoffroy Youri Berret <efrim at azylum.org>
Date:   Mon Sep 14 20:02:35 2015 +0200

    Do not use /etc/default/mpd-sima with systemd init

diff --git a/debian/mpd-sima.default b/debian/mpd-sima.default
index ab66fb1..df69716 100644
--- a/debian/mpd-sima.default
+++ b/debian/mpd-sima.default
@@ -1,9 +1,7 @@
-## Defaults for the mpd-sima init script, sourced by /etc/init.d/mpd-sima on Debian
-## systems.  Comment and change values as needed.
+## Defaults for the mpd-sima init script, sourced by SysV init.
+## Comment and change values as needed.
 
-## Change this to prevent mpd-sima from being started at startup
-## NOTA BENE:
-## only works with SysV init
-## With systemd init: "touch /etc/mpd-sima_not_to_be_run" to prevent mpd-sima from being started
+# Pay attention:
+# the following variable is honored only with SysV init
+# Please use "systemctl disable mpd-sima" to prevent auto start with systemd init
 START_MPD_SIMA=true
-
diff --git a/debian/mpd-sima.service b/debian/mpd-sima.service
index f6eb831..7ee2454 100644
--- a/debian/mpd-sima.service
+++ b/debian/mpd-sima.service
@@ -1,11 +1,9 @@
 [Unit]
 Description=MPD_sima autoqueue utility
 After=network.target
-ConditionPathExists=!/etc/mpd-sima_not_to_be_run
 
 [Service]
 User=mpd-sima
-EnvironmentFile=-/etc/default/mpd-sima
 Type=simple
 ExecStart=/usr/bin/mpd-sima --var_dir=/var/lib/mpd-sima/ --config=/etc/mpd-sima.cfg
 #ExecReload=/bin/kill -HUP $MAINPID

-- 
mpd-sima packaging