[SCM] KDE Base Workspace module packaging branch, kde4.8, updated. debian/4.8.3-1-4-g4823b43

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.8 branch:
commit 850847a95b046fbaa3c4173f42e17691f97d04e7
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Jun 1 18:08:22 2012 +0200

    Add nlist_ftbfs_krefreebsd.diff.
---
 debian/changelog                           |    1 +
 debian/patches/nlist_ftbfs_krefreebsd.diff |   14 ++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad281dd..98d3b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kde-workspace (4:4.8.3-2) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Add watch file.
+  * Add nlist_ftbfs_krefreebsd.diff, avoids FTBFS'es on kfreebsd.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 Jun 2012 15:36:15 +0200
 
diff --git a/debian/patches/nlist_ftbfs_krefreebsd.diff b/debian/patches/nlist_ftbfs_krefreebsd.diff
new file mode 100644
index 0000000..bf82a1b
--- /dev/null
+++ b/debian/patches/nlist_ftbfs_krefreebsd.diff
@@ -0,0 +1,14 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Description: This patch removes the nlist.h include for [k]FreeBSD systems.
+ This include is making kde-workspace FTBFS on gnu/kfreebsd while it isn't
+ actually used.
+--- a/ksysguard/ksysguardd/FreeBSD/cpuinfo.c
++++ b/ksysguard/ksysguardd/FreeBSD/cpuinfo.c
+@@ -27,7 +27,6 @@
+ 
+ #include <devstat.h>
+ #include <fcntl.h>
+-#include <nlist.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/debian/patches/series b/debian/patches/series
index 1829f00..d1601ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ enable_debianabimanager.diff
 initialize_variables_crashfix.diff
 enable_dlrestrcitions.diff
 kdm_vt_switching_on_kfreebsd.diff
+nlist_ftbfs_krefreebsd.diff

-- 
KDE Base Workspace module packaging