[Pkg-mpd-commits] [pkg-mpd] 02/12: move the XDG autostart file from examples into /etc

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit dd2405f085cbf8ea48153c15172b1bb36bb5b26e
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Nov 21 22:57:23 2013 +0100

    move the XDG autostart file from examples into /etc
---
 debian/README.Debian | 18 ++++++++++--------
 debian/mpd.desktop   |  4 ++--
 debian/mpd.examples  |  1 -
 debian/mpd.install   |  3 ++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index fccc43d..20a00d7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,15 +1,17 @@
 Music Player Daemon (MPD) for Debian
 ------------------------------------
 
-After installation, you will need to populate the MPD database. It is
-recommended that you do this through a client such as mpc, or by running
-"invoke-rc.d mpd force-restart".
+After installation, you will need to populate the MPD database. Update
+mpd.conf to point to your music directory, or move/symlink your music into the
+directory configured for mpd. Then, request a database update, preferably
+through a client such as running "mpc update", or by restarting the mpd
+daemon.
 
-To prevent mpd from running as a system service, edit /etc/default/mpd and
-set "START_MPD=false". A normal user account may then run mpd from their
-session using their own ~/.mpdconf and adjusted paths. A sample mpd.desktop
-file that can be copied to ~/.config/autostart/ is provided for your
-convenience.
+To prevent mpd from running as a system service, edit /etc/default/mpd and set
+"START_MPD=false" if you're using traditional sysvinit; in case of systemd,
+disable mpd.service by running "systemctl disable mpd.service". mpd is then
+started through the XDG autostart mechanism upon logging into your desktop
+environment, provided it can find a valid config file (such as ~/.mpdconf).
 
 In the default /etc/mpd.conf, bind_to_address is set to "localhost" in
 order to prevent other (possibly untrusted) hosts from accessing MPD.
diff --git a/debian/mpd.desktop b/debian/mpd.desktop
index 6bfa036..13a86f7 100644
--- a/debian/mpd.desktop
+++ b/debian/mpd.desktop
@@ -1,5 +1,5 @@
-# Copy this file to your ~/.config/autostart/ folder in order to automatically
-# start MPD under your User-ID when you log into GNOME.
+# This will automatically start MPD as your user when you log into GNOME/KDE,
+# provided that the system-wide MPD has been disabled.
 # Make sure to create your own ~/.mpdconf containing the path to your music,
 # and adjust the other paths such that MPD can write to its log and databases.
 [Desktop Entry]
diff --git a/debian/mpd.examples b/debian/mpd.examples
index cfec328..5dbd820 100644
--- a/debian/mpd.examples
+++ b/debian/mpd.examples
@@ -1,2 +1 @@
 doc/mpdconf.example
-debian/mpd.desktop
diff --git a/debian/mpd.install b/debian/mpd.install
index e298e3f..50d9cdb 100644
--- a/debian/mpd.install
+++ b/debian/mpd.install
@@ -1,2 +1,3 @@
 debian/mpd.conf			etc
-usr/bin/mpd             usr/bin
+usr/bin/mpd                     usr/bin
+debian/mpd.desktop              etc/xdg/autostart

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git