Merge branch 'master' into next

config/mpfire/mpd.conf

@@ -7,7 +7,6 @@ port "6600"
 music_directory "/var/mp3"
 playlist_directory "/var/ipfire/mpfire"
 log_file "/var/log/mpd.log"
-error_file "/var/log/mpd.error.log"
 pid_file "/var/run/mpd.pid"
 ##########################################################
 

config/rootfiles/packages/cups

@@ -883,7 +883,6 @@ usr/share/doc/cups/help
 #usr/share/doc/cups/help/man-cupsenable.html
 #usr/share/doc/cups/help/man-cupstestdsc.html
 #usr/share/doc/cups/help/man-cupstestppd.html
-#usr/share/doc/cups/help/man-drv.html
 #usr/share/doc/cups/help/man-filter.html
 #usr/share/doc/cups/help/man-lp.html
 #usr/share/doc/cups/help/man-lpadmin.html
@@ -948,6 +947,7 @@ usr/share/doc/cups/images
 #usr/share/doc/cups/images/cups-postscript-chain.png
 #usr/share/doc/cups/images/cups-raster-chain.png
 #usr/share/doc/cups/images/cups.png
+#usr/share/doc/cups/images/generic.png
 #usr/share/doc/cups/images/left.gif
 #usr/share/doc/cups/images/raster.png
 #usr/share/doc/cups/images/right.gif
@@ -1012,7 +1012,6 @@ usr/share/doc/cups/robots.txt
 #usr/share/man/man5/printers.conf.5.gz
 #usr/share/man/man5/subscriptions.conf.5.gz
 #usr/share/man/man7/backend.7.gz
-#usr/share/man/man7/drv.7.gz
 #usr/share/man/man7/filter.7.gz
 #usr/share/man/man7/notifier.7.gz
 #usr/share/man/man8/accept.8.gz

config/rootfiles/packages/libmpdclient

@@ -24,6 +24,7 @@
 #usr/include/mpd/response.h
 #usr/include/mpd/search.h
 #usr/include/mpd/send.h
+#usr/include/mpd/settings.h
 #usr/include/mpd/song.h
 #usr/include/mpd/stats.h
 #usr/include/mpd/status.h
@@ -34,7 +35,7 @@
 #usr/lib/libmpdclient.la
 usr/lib/libmpdclient.so
 usr/lib/libmpdclient.so.2
-usr/lib/libmpdclient.so.2.0.0
+usr/lib/libmpdclient.so.2.0.1
 #usr/lib/pkgconfig/libmpdclient.pc
 #usr/share/doc/libmpdclient
 #usr/share/doc/libmpdclient/COPYING