[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.4-1-5-gf99fd22

[Florian Schlichting]

The following commit has been merged in the master branch:
commit b0065fd86cebdc9bbe6f7a089fd1eea96c2d4839
Author: Florian Schlichting <fsfs at debian.org>
Date:   Wed May 1 23:58:09 2013 +0200

    bug622368.patch: mpd.conf(5) appears to mis-document parameters as required

diff --git a/debian/patches/bug622368.patch b/debian/patches/bug622368.patch
new file mode 100644
index 0000000..4531777
--- /dev/null
+++ b/debian/patches/bug622368.patch
@@ -0,0 +1,62 @@
+Description: fix #622368: mpd.conf(5) appears to mis-document parameters as required
+ mpd.conf.5 lists follow_outside_symlinks and follow_inside_symlinks
+ under REQUIRED, yet also documents a default value for these options,
+ which only makes sense if they're not actually required.
+ also: move sticker_file to "optional parameters"
+Bug: http://bugs.musicpd.org/view.php?id=3745
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622368
+
+--- a/doc/mpd.conf.5
++++ b/doc/mpd.conf.5
+@@ -29,29 +29,18 @@
+ configuration file.
+ .SH REQUIRED PARAMETERS
+ .TP
+-.B follow_outside_symlinks <yes or no>
+-Control if MPD will follow symbolic links pointing outside the music dir.
+-You must recreate the database after changing this option.
+-The default is "yes".
+-.TP
+-.B follow_inside_symlinks <yes or no>
+-Control if MPD will follow symbolic links pointing inside the music dir,
+-potentially adding duplicates to the database.
+-You must recreate the database after changing this option.
+-The default is "yes".
+-.TP
+ .B db_file <file>
+ This specifies where the db file will be stored.
+ .TP
+-.B sticker_file <file>
+-The location of the sticker database.  This is a database which
+-manages dynamic information attached to songs.
+-.TP
+ .B log_file <file>
+ This specifies where the log file should be located.
+ The special value "syslog" makes MPD use the local syslog daemon.
+ .SH OPTIONAL PARAMETERS
+ .TP
++.B sticker_file <file>
++The location of the sticker database.  This is a database which
++manages dynamic information attached to songs.
++.TP
+ .B pid_file <file>
+ This specifies the file to save mpd's process ID in.
+ .TP
+@@ -99,6 +88,17 @@
+ "verbose" records excessive amounts of information for debugging purposes.  The
+ default is "default".
+ .TP
++.B follow_outside_symlinks <yes or no>
++Control if MPD will follow symbolic links pointing outside the music dir.
++You must recreate the database after changing this option.
++The default is "yes".
++.TP
++.B follow_inside_symlinks <yes or no>
++Control if MPD will follow symbolic links pointing inside the music dir,
++potentially adding duplicates to the database.
++You must recreate the database after changing this option.
++The default is "yes".
++.TP
+ .B zeroconf_enabled <yes or no>
+ If yes, and MPD has been compiled with support for Avahi or Bonjour, service
+ information will be published with Zeroconf.  The default is yes.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0aa2b16
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bug622368.patch

-- 
Git repository for pkg-mpd