[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.8.4-2-2-g209ed65

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 209ed65faa7981e5b886f62815fa8fa135c07a3f
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 11 13:06:06 2012 +0200

    fix build failure on Hurd
---
 debian/changelog         |    2 ++
 debian/patches/hurd.diff |   18 ++++++++++++++++++
 debian/patches/series    |    1 +
 3 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bcbbe2..6d46d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kde-workspace (4:4.8.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix build failure on Hurd; patch hurd.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 11 Jun 2012 13:03:28 +0200
 
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
new file mode 100644
index 0000000..9c6a225
--- /dev/null
+++ b/debian/patches/hurd.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix build failure on GNU/Hurd.
+ Since BSD is defined, make sure to include <paths.h> to get the definition
+ of _PATH_UTMP.
+Last-Update: 2012-06-11
+Forwarded: no
+
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -48,6 +48,8 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #ifdef BSD
+ # ifdef BSD_UTMP
+ #  include <utmp.h>
++# elif defined(__GNU__)
++#  include <paths.h>
+ # endif
+ # ifndef _PATH_UTMP
+ #  if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
diff --git a/debian/patches/series b/debian/patches/series
index 490d72f..8738c97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ nlist_ftbfs_krefreebsd.diff
 process_table_unclickable.diff
 new_beams_custom_plots.diff
 relax_kdelibs_dependency.diff
+hurd.diff

-- 
KDE Base Workspace module packaging