[SCM] qbs packaging branch, master, updated. debian/1.5.1+dfsg-1-4-gffaeffb

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 2f7ace237408da545781442b7e89865830ddf486
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 1 21:20:25 2016 +0300

    Update to 1.5.2 release.
---
 debian/changelog             |  6 +++++-
 debian/patches/kfreebsd.diff | 41 -----------------------------------------
 debian/patches/series        |  1 -
 3 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b3b359..e3d4a53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-qbs (1.5.1+dfsg-2) UNRELEASED; urgency=medium
+qbs (1.5.2+dfsg-1) UNRELEASED; urgency=medium
 
   [ Adam Majer ]
   * Remove /usr/include from INCLUDEPATH list of installed
     .pri file. Adding this default included path causes FTBFS
     for software using qbs with GCC 6 (fix_ftbfs_gcc6.diff)
 
+  [ Dmitry Shachnev ]
+  * New upstream release.
+  * Drop kfreebsd.diff, a similar patch was applied upstream.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 22:39:33 +0200
 
 qbs (1.5.1+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
deleted file mode 100644
index 72cf357..0000000
--- a/debian/patches/kfreebsd.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: add implementation of processNameByPid for GNU/kFreeBSD
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2015-08-24
-
---- a/src/lib/corelib/tools/processutils.cpp
-+++ b/src/lib/corelib/tools/processutils.cpp
-@@ -41,7 +41,9 @@
- #   include <unistd.h>
- #   include <cstdio>
- #elif defined(Q_OS_BSD4)
--#   include <libutil.h>
-+#   include <sys/cdefs.h>
-+#   include <sys/param.h>
-+#   include <sys/sysctl.h>
- #   include <sys/types.h>
- #   include <sys/user.h>
- #else
-@@ -82,9 +84,21 @@
-     readlink(exePath, buf, sizeof(buf));
-     return FileInfo::fileName(QString::fromUtf8(buf));
- #elif defined(Q_OS_BSD4)
--    kinfo_proc *proc = kinfo_getproc(pid);
-+    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
-+    size_t len = 0;
-+    if (sysctl(mib, 4, NULL, &len, NULL, 0) < 0)
-+        return QString();
-+    kinfo_proc *proc = static_cast<kinfo_proc *>(malloc(len));
-     if (!proc)
-         return QString();
-+    if (sysctl(mib, 4, proc, &len, NULL, 0) < 0) {
-+        free(proc);
-+        return QString();
-+    }
-+    if (proc->ki_pid != pid) {
-+        free(proc);
-+        return QString();
-+    }
-     QString name = QString::fromUtf8(proc->ki_comm);
-     free(proc);
-     return name;
diff --git a/debian/patches/series b/debian/patches/series
index e4d1fa1..626c281 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
-kfreebsd.diff
 skip_test_concurrent.diff
 fix_ftbfs_gcc6.diff

-- 
qbs packaging