[SCM] qbs packaging branch, master, updated. debian/1.8.1+dfsg-3-3-g1ebc5b8

Dmitry Shachnev mitya57 at moszumanska.debian.org
Mon Sep 11 14:15:27 UTC 2017


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

The following commit has been merged in the master branch:
commit 14cb143d806d4d6f8e5c039282c358e8dfcbc9e8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Sep 11 17:13:47 2017 +0300

    Drop install_missing_header.diff, it was coming from upstream.
---
 debian/changelog                           |  1 +
 debian/patches/install_missing_header.diff | 16 ----------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab70b9e..ad4e50a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.9.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop install_missing_header.diff, it was coming from upstream.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 11 Sep 2017 16:36:28 +0300
 
diff --git a/debian/patches/install_missing_header.diff b/debian/patches/install_missing_header.diff
deleted file mode 100644
index cbb628a..0000000
--- a/debian/patches/install_missing_header.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: install missing public header
-Origin: https://codereview.qt-project.org/199668
-Last-Update: 2017-07-10
-
---- a/src/lib/corelib/tools/tools.pri
-+++ b/src/lib/corelib/tools/tools.pri
-@@ -125,7 +125,8 @@
-         $$PWD/generatorpluginmanager.h \
-         $$PWD/installoptions.h \
-         $$PWD/setupprojectparameters.h \
--        $$PWD/toolchains.h
-+        $$PWD/toolchains.h \
-+        $$PWD/version.h
-     tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
-     INSTALLS += tools_headers
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9c75c6d..585e8ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ disable_tests_qtscript.diff
 skip_test_concurrent.diff
 fix_ftbfs_gcc6.diff
 kfreebsd_soname.diff
-install_missing_header.diff

-- 
qbs packaging



More information about the pkg-kde-commits mailing list