summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-05-15 03:47:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-05-15 03:47:32 +0000
commitb9f898c4094e8d9d87628996177dfdbb091ddc85 (patch)
tree0912f21f33f896c3ce7742b62f2b25c437ae7972 /media-sound/mpd/files
parentDo not put ruby into RDEPEND and do not build with -Werror #269887 by James E... (diff)
downloadgentoo-2-b9f898c4094e8d9d87628996177dfdbb091ddc85.tar.gz
gentoo-2-b9f898c4094e8d9d87628996177dfdbb091ddc85.tar.bz2
gentoo-2-b9f898c4094e8d9d87628996177dfdbb091ddc85.zip
Version bump wrt #268881.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/mpd/files')
-rw-r--r--media-sound/mpd/files/0.15_beta1-mpdconf.patch (renamed from media-sound/mpd/files/0.15_alpha1-mpdconf.patch)25
1 files changed, 12 insertions, 13 deletions
diff --git a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch b/media-sound/mpd/files/0.15_beta1-mpdconf.patch
index 8407f79135bd..b0fface1ba16 100644
--- a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch
+++ b/media-sound/mpd/files/0.15_beta1-mpdconf.patch
@@ -1,7 +1,6 @@
-diff --git a/doc/mpdconf.example b/doc/mpdconf.example
-index e231296..77f6d11 100644
---- a/doc/mpdconf.example
-+++ b/doc/mpdconf.example
+diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.example
+--- mpd-0.15~beta1.orig/doc/mpdconf.example 2009-04-30 17:35:31.000000000 +0300
++++ mpd-0.15~beta1/doc/mpdconf.example 2009-05-15 05:39:38.000000000 +0300
@@ -1,4 +1,4 @@
-# An example configuration file for MPD
+# A default Gentoo configuration file for MPD
@@ -13,7 +12,7 @@ index e231296..77f6d11 100644
# file:// protocol) or streaming files over an accepted protocol.
#
-#music_directory "~/music"
-+music_directory "/var/lib/mpd/music"
++music_directory "/var/lib/mpd/music"
#
# This setting sets the MPD internal playlist directory. The purpose of this
# directory is storage for playlists created by MPD. The server will use
@@ -21,7 +20,7 @@ index e231296..77f6d11 100644
# format. This setting defaults to playlist saving being disabled.
#
-#playlist_directory "~/.mpd/playlists"
-+playlist_directory "/var/lib/mpd/playlists"
++playlist_directory "/var/lib/mpd/playlists"
#
# This setting sets the location of the MPD database. This file is used to
# load the database at server start up and store the database while the
@@ -30,7 +29,7 @@ index e231296..77f6d11 100644
# files over an accepted protocol.
#
-#db_file "~/.mpd/database"
-+db_file "/var/lib/mpd/database"
++db_file "/var/lib/mpd/database"
#
# These settings are the locations for the daemon log files for the daemon.
# These logs are great for troubleshooting, depending on your log_level
@@ -39,14 +38,14 @@ index e231296..77f6d11 100644
# setting defaults to logging to syslog, otherwise logging is disabled.
#
-#log_file "~/.mpd/log"
-+log_file "/var/log/mpd/mpd.log"
++log_file "/var/log/mpd/mpd.log"
#
# This setting sets the location of the file which stores the process ID
# for use of mpd --kill and some init scripts. This setting is disabled by
# default and the pid file will not be stored.
#
-#pid_file "~/.mpd/pid"
-+pid_file "/var/run/mpd/mpd.pid"
++pid_file "/var/run/mpd/mpd.pid"
#
# This setting sets the location of the file which contains information about
# most variables to get MPD back into the same general shape it was in before
@@ -54,7 +53,7 @@ index e231296..77f6d11 100644
# state will be reset on server start up.
#
-#state_file "~/.mpd/state"
-+state_file "/var/lib/mpd/state"
++state_file "/var/lib/mpd/state"
#
###############################################################################
@@ -63,7 +62,7 @@ index e231296..77f6d11 100644
# current user.
#
-#user "nobody"
-+user "mpd"
++user "mpd"
#
# This setting sets the address for the daemon to listen on. Careful attention
# should be paid if this is assigned to anything other then the default, any.
@@ -71,11 +70,11 @@ index e231296..77f6d11 100644
#
# For network
-#bind_to_address "any"
-+bind_to_address "localhost"
++bind_to_address "localhost"
#
# And for Unix Socket
-#bind_to_address "~/.mpd/socket"
-+bind_to_address "/var/lib/mpd/socket"
++bind_to_address "/var/lib/mpd/socket"
#
# This setting is the TCP port that is desired for the daemon to get assigned
# to.