src/content_manager.cc | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 follow symlinks when determining mime type
 This is the last remenants of the original symlinks patch to correctly handle
 adding symlinks to a directory using inotify. All the inotify code has already
 been applied upstream.
 .
 This last part fixes the MIME detection for symlinks by enabling MAGIC_SYMLINK
 when magic_open is called.

src/main.cc | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 re-open log file on sighup
 When SIGHUP is received, re-open the log file so that logrotate works
 properly.

src/cds_objects.cc | 2 1 + 1 - 0 !
src/config_manager.cc | 4 2 + 2 - 0 !
src/server.cc | 2 1 + 1 - 0 !
3 files changed, 4 insertions(+), 4 deletions(-)

 more spelling fixes found by lintian

src/server.cc | 2 1 + 1 - 0 !
src/web_callbacks.cc | 12 6 + 6 - 0 !
2 files changed, 7 insertions(+), 7 deletions(-)

 fix ftbfs with pupnp 1.8.3
 In pupnp 1.8.3, the UpnpAddVirtualDir function and various callbacks
 gained some extra cookie parameters. These parameters can mostly be
 ignored to get the same behavior as before, so add some extra dummy
 parameters to do this.