[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.1-1-38-g06255df

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 06255dff05e0a8e2f575371267d80aa71bfbd3f2
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Apr 4 21:24:40 2013 +0200

    Provide a sample mpd.desktop file for user-session autostart

diff --git a/debian/README.Debian b/debian/README.Debian
index 8cd433a..2ef1f89 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -7,7 +7,9 @@ recommended that you do this through a client such as mpc, or by running
 
 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.
+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.
 
 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/changelog b/debian/changelog
index 81b8486..738a9b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ mpd (0.17.3-1) unstable; urgency=low
   * Disable systemd support on non-linux architectures.
   * Update provided mpd.conf from doc/mpdconf.example, adding
     httpd.bind_to_address in the process (closes: #664204).
+  * Provide a sample mpd.desktop file for user-session autostart
+    (closes: #551875).
   * Enable support for libwrap (closes: #627184).
   * Install the upstream changelog in its proper place and skip redundant
     upstream docs. Instead, generate and install user-manual.html.
@@ -29,7 +31,7 @@ mpd (0.17.3-1) unstable; urgency=low
   [ Alexander Wirt ]
   * Remove myself from the list of uploaders.
 
- -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Sun, 24 Feb 2013 21:02:46 +0100
+ -- Florian Schlichting <fsfs at debian.org>  Thu, 04 Apr 2013 21:22:44 +0200
 
 mpd (0.17.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 887914c..9b8b1c0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mpd
 Section: sound
 Priority: optional
 Maintainer: mpd maintainers <pkg-mpd-maintainers at lists.alioth.debian.org>
-Uploaders: Florian Schlichting <fschlich at zedat.fu-berlin.de>
+Uploaders: Florian Schlichting <fsfs at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1~),
                libao-dev (>= 0.8.3),
diff --git a/debian/copyright b/debian/copyright
index 4aaa0d3..fe6647a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -95,7 +95,7 @@ Copyright: 2003-2004, Warren Dukes (aka shank) <shank at mercury.chem.pitt.edu>
  2004-2005, Eric Wong <eric at petta-tech.com>
  2006-2011, Decklin Foster <decklin at red-bean.com>
  2011-2012, Alexander Wirt <formorer at debian.org>
- 2013, Florian Schlichting <fschlich at zedat.fu-berlin.de>
+ 2013, Florian Schlichting <fsfs at debian.org>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/mpd.desktop b/debian/mpd.desktop
new file mode 100644
index 0000000..6bfa036
--- /dev/null
+++ b/debian/mpd.desktop
@@ -0,0 +1,12 @@
+# Copy this file to your ~/.config/autostart/ folder in order to automatically
+# start MPD under your User-ID when you log into GNOME.
+# 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]
+Type=Application
+Exec=mpd
+Terminal=false
+Hidden=false
+X-GNOME-Autostart-enabled=true
+Name=MPD Music Player Daemon
+Comment=start MPD as user when you log in
diff --git a/debian/mpd.examples b/debian/mpd.examples
index 75aa63f..21aee7c 100644
--- a/debian/mpd.examples
+++ b/debian/mpd.examples
@@ -1 +1,2 @@
 debian/mpd.conf
+debian/mpd.desktop
diff --git a/debian/patches/fix-typos-in-manpage.patch b/debian/patches/fix-typos-in-manpage.patch
index 910046c..0f21606 100644
--- a/debian/patches/fix-typos-in-manpage.patch
+++ b/debian/patches/fix-typos-in-manpage.patch
@@ -1,5 +1,5 @@
 Description: fix typo and hyphens-used-as-minus-sign in mpd.1 and mpd.conf.5
-Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
+Author: Florian Schlichting <fsfs at debian.org>
 Forwarded: http://bugs.musicpd.org/view.php?id=3674
 
 --- a/doc/mpd.conf.5

-- 
Git repository for pkg-mpd