debian/0000755000000000000000000000000012137432616007173 5ustar debian/mpdris2.install0000644000000000000000000000030312137430272012133 0ustar etc/xdg/autostart usr/bin usr/share/doc/mpdris2/AUTHORS usr/share/doc/mpdris2/README usr/share/doc/mpdris2/examples/mpDris2.conf usr/share/applications usr/share/dbus-1/services usr/share/locale debian/rules0000755000000000000000000000055312137430272010252 0ustar #!/usr/bin/make -f %: dh $@ --with autoreconf,python2 --parallel override_dh_auto_build: dh_auto_build sed -e 's!@docdir@!/usr/share/doc/mpdris2!' \ < debian/mpDris2.1.in \ > debian/mpDris2.1 override_dh_auto_install: dh_auto_install --destdir=debian/tmp override_dh_install: rm -f debian/tmp/usr/share/doc/mpdris2/COPYING dh_install --list-missing debian/control0000644000000000000000000000227512137430272010600 0ustar Source: mpdris2 Section: sound Priority: optional Maintainer: Simon McVittie Build-Depends: autoconf, automake, autotools-dev (>= 20100122-1~), debhelper (>= 9), dh-autoreconf, gettext, intltool, python (>= 2.6.6-3~) Standards-Version: 3.9.3 Homepage: https://github.com/eonpatapon/mpDris2 Vcs-Git: git://git.debian.org/git/collab-maint/mpdris2.git Vcs-Browser: http://git.debian.org/?p=collab-maint/mpdris2.git Package: mpdris2 Architecture: all Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${python:Depends}, dbus, python (>= 2.5), python-dbus, python-gobject, python-mpd Recommends: python-notify Suggests: mpd Provides: mpd-client Description: media player interface (MPRIS2) bridge for MPD mpDris2 is an implementation of the MPRIS2 media player interface as a client for MPD, allowing MPRIS2 clients to control MPD and observe its track changes via a standard D-Bus interface. . It can also respond to multimedia keys if running under GNOME, and send track-change notifications if python-notify is installed. debian/source/0000755000000000000000000000000012137430272010467 5ustar debian/source/format0000644000000000000000000000001412137430272011675 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000000142712137430272011045 0ustar mpdris2 (0.4-1) unstable; urgency=low * New upstream version - 0001-Regenerate-edited-files...: remove, applied upstream - 0002-Follow-the-XDG-Base-Directory-spec...: remove, applied upstream - 0003-Put-example-configuration-in...: refresh * Add patches (applied upstream for 0.5) to put additional metadata on notifications for better GNOME Shell 3.8 integration -- Simon McVittie Mon, 29 Apr 2013 09:32:54 +0100 mpdris2 (0.3-2) unstable; urgency=low * Build-depend on intltool (patch from Colin Watson, Closes: #693431) -- Simon McVittie Fri, 16 Nov 2012 13:13:48 +0000 mpdris2 (0.3-1) unstable; urgency=low * New Debian package (Closes: #687258) -- Simon McVittie Fri, 26 Oct 2012 11:27:49 +0100 debian/mpDris2.1.in0000644000000000000000000000441012137430272011175 0ustar .TH MPDRIS2 1 "September 2012" "" "D-Bus services" \" This man page was written by Simon McVittie for the Debian project, \" but may be used by others. \" Copyright © 2012 Simon McVittie \" It may be distributed under the same terms as mpDris2 itself. .SH NAME mpDris2 \- media player interface (MPRIS2) bridge for MPD .SH SYNOPSIS .BR mpDris2 .RI [ OPTIONS ] .SH DESCRIPTION .B mpDris2 is an implementation of the MPRIS2 media player interface as a client for MPD, allowing MPRIS2 clients to control MPD and observe its track changes via a standard D-Bus interface. .PP It can also respond to multimedia keys if running under GNOME, and send track-change notifications if python-notify is installed. .PP It is normally run automatically via D-Bus service activation. On systems following the freedesktop.org Desktop Application Autostart Specification, it will be run automatically on login. .SH CONFIGURATION \fBmpDris2\fR is normally configured via the file \fIXDG_CONFIG_DIRS\fB/mpDris2/mpDris2.conf\fR (typically \fB~/.config/mpDris2/mpDris2.conf\fR), whose contents are documented in \fB@docdir@/README\fR. Settings in this configuration file can be overridden by command-line options and environment variables. .SH OPTIONS .TP \fB-p\fR \fIPATH\fR, \fB--path=\fIPATH\fR Set the location of the directory from which mpd reads music, overriding the configuration file. The default is to use the path specified in the configuration file, or try some likely directories (\fIXDG_MUSIC_DIR\fR from the environment or \fIXDG_CONFIG_DIRS\fB/user-dirs.dirs\fR, \fB~/Music\fR, \fB~/music\fR). .TP \fB-h\fR, \fB--help\fR Show a help message .TP \fB-d\fR, \fB--debug\fR Emit debug logging messages .SH ENVIRONMENT .TP \fBXDG_CONFIG_HOME\fR=\fIDIRECTORY\fR, \fBXDG_CONFIG_DIRS\fR=\fISEARCHPATH\fR Used to find the configuration file \fIXDG_CONFIG_DIRS\fB/mpDris2/mpDris2.conf\fR according to the XDG Base Directory Specification. .TP \fBMPD_HOST\fR=\fIHOSTNAME\fR Set the hostname of the mpd server, overrriding the configuration file. .TP \fBMPD_PORT\fR=\fIPORT\fR Set the port number of the mpd server, overriding the configuration file. .TP \fBXDG_MUSIC_DIR\fR=\fIDIRECTORY\fR Used to find the default music directory if not specified in the configuration file or as a command-line option. .SH SEE ALSO .BR mpd (1) debian/compat0000644000000000000000000000000212137430272010365 0ustar 9 debian/mpdris2.maintscript0000644000000000000000000000013712137430272013027 0ustar mv_conffile /etc/xdg/autostart/mpDris2.desktop /etc/xdg/autostart/mpdris2.desktop 0.4~ mpdris2 debian/copyright0000644000000000000000000000165412137430272011130 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: mpDris2 Files: * Copyright: © Erik Karlsson © Jean-Philippe Braun © Christoph Reiter © Mantas Mikulėnas License: GPL-3+ Files: debian/* Copyright: © 2012 Simon McVittie License: GPL-3+ License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . On Debian systems a copy of the GNU General Public License, version 3 can be found in /usr/share/common-licenses/GPL-3. debian/watch0000644000000000000000000000011412137430272010214 0ustar version=3 https://github.com/eonpatapon/mpDris2/tags .*/tarball/(\d[\d\.]+) debian/patches/0000755000000000000000000000000012137430272010616 5ustar debian/patches/0001-Rename-desktop-entry-to-all-lower-case.patch0000644000000000000000000000467312137430272021471 0ustar From: Simon McVittie Date: Mon, 22 Apr 2013 21:37:27 +0100 Subject: Rename desktop entry to all-lower-case GNOME Shell appears to normalize desktop entry IDs (basenames) to all-lower-case. I have no idea whether this is standard, but if we consistently use lower-case we won't have to worry about it. Bug: https://github.com/eonpatapon/mpDris2/pull/46 Applied-upstream: 0.5, commit:15723e27ca8ab59a8e744a88de02f0d2fef742bb --- src/Makefile.am | 4 ++-- src/mpDris2.desktop | 10 ---------- src/mpDris2.in | 2 +- src/mpdris2.desktop | 10 ++++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 src/mpDris2.desktop create mode 100644 src/mpdris2.desktop diff --git a/src/Makefile.am b/src/Makefile.am index b842d7f..a009560 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,8 +3,8 @@ dbusdir = ${datadir}/dbus-1/services/ autostartdir = ${sysconfdir}/xdg/autostart/ bin_SCRIPTS = mpDris2 -dist_desktop_DATA = mpDris2.desktop -autostart_DATA = mpDris2.desktop +dist_desktop_DATA = mpdris2.desktop +autostart_DATA = mpdris2.desktop dist_doc_DATA = mpDris2.conf nodist_dbus_DATA = org.mpris.MediaPlayer2.mpd.service diff --git a/src/mpDris2.desktop b/src/mpDris2.desktop deleted file mode 100644 index 977ca29..0000000 --- a/src/mpDris2.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Music Player Daemon -Comment=MPRIS 2 support for MPD -Exec=mpDris2 -Icon=sound -StartupNotify=false -Type=Application -Categories=Audio;Music;Player; -NoDisplay=true -X-DBUS-ServiceName=org.mpris.MediaPlayer2.mpd diff --git a/src/mpDris2.in b/src/mpDris2.in index 7d3daff..1639efb 100755 --- a/src/mpDris2.in +++ b/src/mpDris2.in @@ -658,7 +658,7 @@ class MPRISInterface(dbus.service.Object): __root_props = { "CanQuit": (False, None), "CanRaise": (False, None), - "DesktopEntry": ("mpDris2", None), + "DesktopEntry": ("mpdris2", None), "HasTrackList": (False, None), "Identity": (identity, None), "SupportedUriSchemes": (dbus.Array(signature="s"), None), diff --git a/src/mpdris2.desktop b/src/mpdris2.desktop new file mode 100644 index 0000000..977ca29 --- /dev/null +++ b/src/mpdris2.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Music Player Daemon +Comment=MPRIS 2 support for MPD +Exec=mpDris2 +Icon=sound +StartupNotify=false +Type=Application +Categories=Audio;Music;Player; +NoDisplay=true +X-DBUS-ServiceName=org.mpris.MediaPlayer2.mpd debian/patches/series0000644000000000000000000000026112137430272012032 0ustar 0001-Rename-desktop-entry-to-all-lower-case.patch 0002-Set-X-GNOME-UsesNotifications-so-we-appear-in-gnome-.patch 0003-Put-example-configuration-in-u-s-d-mpdris2-examples.patch debian/patches/0003-Put-example-configuration-in-u-s-d-mpdris2-examples.patch0000644000000000000000000000270412137430272024011 0ustar From: Simon McVittie Date: Tue, 23 Apr 2013 09:35:56 +0100 Subject: Put example configuration in /u/s/d/mpdris2/examples According to Debian policy. Origin: vendor, Debian Forwarded: not-needed, Debian-specific --- README | 3 ++- src/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README b/README index 3bb308c..36bc878 100644 --- a/README +++ b/README @@ -32,7 +32,8 @@ Default prefix is ``/usr/local``. By default, mpDris2 will try to connect to localhost:6600. To set a different host or port copy the example configuration file -``/usr/[local]/share/doc/mpdris2/mpDris2.conf`` to ``~/.config/mpDris2/mpDris2.conf``. +``/usr/[local]/share/doc/mpdris2/examples/mpDris2.conf`` to +``~/.config/mpDris2/mpDris2.conf``. Use the configuration to enable notifications and multimedia keys support (on the GNOME desktop). diff --git a/src/Makefile.am b/src/Makefile.am index a009560..c1b6c4a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,12 @@ desktopdir = ${datadir}/applications/ dbusdir = ${datadir}/dbus-1/services/ autostartdir = ${sysconfdir}/xdg/autostart/ +examplesdir = ${docdir}/examples/ bin_SCRIPTS = mpDris2 dist_desktop_DATA = mpdris2.desktop autostart_DATA = mpdris2.desktop -dist_doc_DATA = mpDris2.conf +dist_examples_DATA = mpDris2.conf nodist_dbus_DATA = org.mpris.MediaPlayer2.mpd.service EXTRA_DIST = org.mpris.MediaPlayer2.mpd.service.in mpDris2.in debian/patches/0002-Set-X-GNOME-UsesNotifications-so-we-appear-in-gnome-.patch0000644000000000000000000000214612137430272023555 0ustar From: Simon McVittie Date: Mon, 22 Apr 2013 21:33:35 +0100 Subject: Set X-GNOME-UsesNotifications so we appear in gnome-control-center Bug: https://github.com/eonpatapon/mpDris2/pull/46 Applied-upstream: 0.5, commit:f6537cf64fb6ba388064fd458ac6bf6fc4a87848 --- src/mpDris2.in | 1 + src/mpdris2.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/src/mpDris2.in b/src/mpDris2.in index 1639efb..e207278 100755 --- a/src/mpDris2.in +++ b/src/mpDris2.in @@ -603,6 +603,7 @@ class Notify: """ Issue a new notification """ if self._notification: self._notification = pynotify.Notification(title, body, uri) + self._notification.set_hint('desktop-entry', 'mpdris2') self._notification.show() def rnotify(self, title, body, uri=''): diff --git a/src/mpdris2.desktop b/src/mpdris2.desktop index 977ca29..73af19c 100644 --- a/src/mpdris2.desktop +++ b/src/mpdris2.desktop @@ -8,3 +8,4 @@ Type=Application Categories=Audio;Music;Player; NoDisplay=true X-DBUS-ServiceName=org.mpris.MediaPlayer2.mpd +X-GNOME-UsesNotifications=true debian/mpdris2.manpages0000644000000000000000000000002112137430272012255 0ustar debian/mpDris2.1 debian/gbp.conf0000644000000000000000000000012012137430272010577 0ustar [DEFAULT] debian-branch = debian upstream-branch = upstream pristine-tar = True