[Pkg-mpd-commits] [pkg-mpd] 06/08: drop bug622368.patch, applied upstream

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 2a5a47254f8f1f9e62870f8e47545ff159fd5832
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Aug 9 14:26:43 2013 +0200

    drop bug622368.patch, applied upstream
---
 debian/patches/bug622368.patch |   62 ----------------------------------------
 debian/patches/series          |    1 -
 2 files changed, 63 deletions(-)

diff --git a/debian/patches/bug622368.patch b/debian/patches/bug622368.patch
deleted file mode 100644
index 4531777..0000000
--- a/debian/patches/bug622368.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index 0aa2b16..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-bug622368.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git