[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit bd926f27b6dd79b07ff3b83ae96b861b47910ed2
Author: Pino Toscano <pino at debian.org>
Date:   Wed Apr 3 20:18:45 2013 +0200

    fix build on Hurd
    
    backport upstream commit a4dd84f42abea1ff9cdd15e156c63776c0bf854b
---
 debian/changelog                                   |    3 +++
 debian/patches/series                              |    1 +
 ...upstream_Remove-extra-sys-mount.h-include.patch |   26 ++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4aa9aa1..73ae840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kde4libs (4:4.10.2-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit a4dd84f42abea1ff9cdd15e156c63776c0bf854b to fix
+    building on Hurd; patch upstream_Remove-extra-sys-mount.h-include.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Apr 2013 20:15:12 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 1050bfa..576426d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 install_kcookiescfg.pl_with_exec_perms.diff
+upstream_Remove-extra-sys-mount.h-include.patch
diff --git a/debian/patches/upstream_Remove-extra-sys-mount.h-include.patch b/debian/patches/upstream_Remove-extra-sys-mount.h-include.patch
new file mode 100644
index 0000000..5ef8623
--- /dev/null
+++ b/debian/patches/upstream_Remove-extra-sys-mount.h-include.patch
@@ -0,0 +1,26 @@
+From a4dd84f42abea1ff9cdd15e156c63776c0bf854b Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Wed, 3 Apr 2013 11:41:43 +0200
+Subject: [PATCH] Remove extra <sys/mount.h> include
+
+Added in b856e9b9e94a96ab396662db7a503280fa267dc3, it basically useless.
+(And it is not a standard header, so might be missing on some OSes.)
+---
+ kio/kio/kautomount.cpp |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp
+index e145b04..4ddf6d7 100644
+--- a/kio/kio/kautomount.cpp
++++ b/kio/kio/kautomount.cpp
+@@ -24,7 +24,6 @@
+ #include <kdirnotify.h>
+ #include <kdebug.h>
+ #include <kmountpoint.h>
+-#include <sys/mount.h>
+ 
+ /***********************************************************************
+  *
+-- 
+1.7.10.4
+

-- 
KDE Development Platform Libraries module packaging