[SCM] qbs packaging branch, experimental, updated. debian/1.4.1+dfsg-3-7-g06c2d75

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=e71092a

The following commit has been merged in the experimental branch:
commit e71092ad5d7c7dfc9d6752134d9f9aed0d3f5245
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jul 13 12:44:55 2015 +0300

    Fixup the previous kFreeBSD fix; add B-D on libutil-freebsd-dev.
---
 debian/changelog                 | 2 ++
 debian/control                   | 1 +
 debian/patches/bsd_includes.diff | 7 +++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe67725..2c432b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.4.1+dfsg-5) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Fixup the previous kFreeBSD fix; add B-D on libutil-freebsd-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 13 Jul 2015 12:42:36 +0300
 
diff --git a/debian/control b/debian/control
index 2847f61..1030400 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Dmitry Shachnev <mitya57 at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Adam Majer <adamm at zombino.com>
 Build-Depends: debhelper (>= 9),
+               libutil-freebsd-dev [kfreebsd-any],
                pkg-kde-tools,
                qtbase5-dev,
                qtdeclarative5-dev,
diff --git a/debian/patches/bsd_includes.diff b/debian/patches/bsd_includes.diff
index 474dddb..2a72dca 100644
--- a/debian/patches/bsd_includes.diff
+++ b/debian/patches/bsd_includes.diff
@@ -1,16 +1,15 @@
-Description: add missing includes for kinfo_getproc(3) on kFreeBSD
+Description: add missing include for kinfo_getproc(3) on kFreeBSD
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: no
-Last-Update: 2015-07-12
+Last-Update: 2015-07-13
 
 --- a/src/lib/corelib/tools/processutils.cpp
 +++ b/src/lib/corelib/tools/processutils.cpp
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,7 @@
  #   include <unistd.h>
  #   include <cstdio>
  #elif defined(Q_OS_BSD4)
 +#   include <libutil.h>
-+#   include <sys/types.h>
  #   include <sys/user.h>
  #else
  #   error Missing implementation of processNameByPid for this platform.

-- 
qbs packaging