[SCM] libkcompactdisc packaging branch, master, updated. debian/4.10.2-1-4-g364d512

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkcompactdisc.git;a=commitdiff;h=364d512

The following commit has been merged in the master branch:
commit 364d51243113349b89a047cd6c4c346e90e02609
Author: Pino Toscano <pino at debian.org>
Date:   Mon Apr 8 19:13:53 2013 +0200

    remove an extra include in plat_freebsd.c
---
 debian/changelog                           |    2 ++
 debian/patches/kfreebsd_extra_include.diff |   19 +++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7f7112..0fe02d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libkcompactdisc (4:4.10.2-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Backport upstream commit 4d7f2c572dec110ea71eae95f203e057cb4e41e3 to
     disable wmlib on GNU/Hurd.
+  * Remove an extra include in plat_freebsd.c, which should make libkcompactdisc
+    compile on GNU/kFreeBSD; patch kfreebsd_extra_include.diff.
   * Update the symbols file for GNU/kFreeBSD and GNU/Hurd.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 08 Apr 2013 18:47:10 +0200
diff --git a/debian/patches/kfreebsd_extra_include.diff b/debian/patches/kfreebsd_extra_include.diff
new file mode 100644
index 0000000..1bd02f4
--- /dev/null
+++ b/debian/patches/kfreebsd_extra_include.diff
@@ -0,0 +1,19 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Remove extra include on GNU/kFreeBSD.
+ Due to Debian #704598, GNU/kFreeBSD' sys/mount.h cannot be used in
+ C90 C sources, such as plat_freebsd.c when compiled with default CFLAGS
+ provided with kdelibs.
+ It seems redundant, so just remove it.
+Forwarded: no
+Last-Update: 2014-04-08
+
+--- a/wmlib/plat_freebsd.c
++++ b/wmlib/plat_freebsd.c
+@@ -36,7 +36,6 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+-#include <sys/mount.h>
+ #include <sys/stat.h>
+ 
+ #include "include/wm_config.h"
diff --git a/debian/patches/series b/debian/patches/series
index 10b5943..d6cfa52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_target_link_libraries.diff
 upstream_disable-wmlib-on-GNU-Hurd.patch
+kfreebsd_extra_include.diff

-- 
libkcompactdisc packaging