diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-05-04 18:07:24 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-05-04 18:07:24 +0000 |
| commit | 9a363ea67f764aa0bd1723d15a63384f04d7dd55 (patch) | |
| tree | ca1bd6f9eb722794e65963f37fb802fde4dacfef | |
| parent | x86 stable wrt security bug #344059 (diff) | |
| download | gentoo-2-9a363ea67f764aa0bd1723d15a63384f04d7dd55.tar.gz gentoo-2-9a363ea67f764aa0bd1723d15a63384f04d7dd55.tar.bz2 gentoo-2-9a363ea67f764aa0bd1723d15a63384f04d7dd55.zip | |
Patch mpdconf.dist instead of mpdconf.example so we install upstream's example with the docs
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
| -rw-r--r-- | media-sound/mpd/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/mpd/files/mpd-0.16.conf.patch | 6 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.16.2.ebuild | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 353eb515e0b0..c37bde2e63bf 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mpd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.250 2011/05/03 09:52:33 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.251 2011/05/04 18:07:24 angelos Exp $ + + 04 May 2011; Christoph Mende <angelos@gentoo.org> mpd-0.16.2.ebuild, + files/mpd-0.16.conf.patch: + Patch mpdconf.dist instead of mpdconf.example so we install upstream's + example with the docs 03 May 2011; Thomas Kahle <tomka@gentoo.org> mpd-0.16.2.ebuild: x86 stable per bug 364469 diff --git a/media-sound/mpd/files/mpd-0.16.conf.patch b/media-sound/mpd/files/mpd-0.16.conf.patch index 05c2ea1b9fb1..8f193c82df00 100644 --- a/media-sound/mpd/files/mpd-0.16.conf.patch +++ b/media-sound/mpd/files/mpd-0.16.conf.patch @@ -1,7 +1,7 @@ -Index: mpd-0.16/doc/mpdconf.example +Index: mpd-0.16/doc/mpdconf.dist =================================================================== ---- mpd-0.16.orig/doc/mpdconf.example -+++ mpd-0.16/doc/mpdconf.example +--- mpd-0.16.orig/doc/mpdconf.dist ++++ mpd-0.16/doc/mpdconf.dist @@ -10,14 +10,14 @@ # be disabled and audio files will only be accepted over ipc socket (using # file:// protocol) or streaming files over an accepted protocol. diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild index 61b71d89a86e..630a71311ccc 100644 --- a/media-sound/mpd/mpd-0.16.2.ebuild +++ b/media-sound/mpd/mpd-0.16.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.6 2011/05/03 09:52:33 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.7 2011/05/04 18:07:24 angelos Exp $ EAPI=4 inherit eutils flag-o-matic linux-info multilib @@ -154,7 +154,7 @@ src_install() { emake DESTDIR="${D}" install insinto /etc - newins doc/mpdconf.example mpd.conf + newins doc/mpdconf.dist mpd.conf newinitd "${FILESDIR}"/mpd.init mpd |