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

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Sep 3 11:52:07 UTC 2016


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

The following commit has been merged in the master branch:
commit 38759a57ea90ea972c6f95b8174923056530edd2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 3 14:50:49 2016 +0300

    Drop skip_test_homedirectory.diff, no longer needed.
---
 debian/changelog                            |  1 +
 debian/patches/series                       |  1 -
 debian/patches/skip_test_homedirectory.diff | 15 ---------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da6a301..d936f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.6.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Set $HOME to a temporary location when running tests.
+  * Drop skip_test_homedirectory.diff, no longer needed.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 03 Sep 2016 14:43:46 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 626c281..a0e8336 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
 skip_test_concurrent.diff
diff --git a/debian/patches/skip_test_homedirectory.diff b/debian/patches/skip_test_homedirectory.diff
deleted file mode 100644
index 4b5bd09..0000000
--- a/debian/patches/skip_test_homedirectory.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: skip homeDirectory test for Debian build
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-07-18
-
---- a/src/lib/corelib/language/tst_language.cpp
-+++ b/src/lib/corelib/language/tst_language.cpp
-@@ -768,6 +768,7 @@
- 
- void TestLanguage::homeDirectory()
- {
-+    QSKIP("buildds do not have home directory");
-     try {
-         defaultParameters.setProjectFilePath(testProject("homeDirectory.qbs"));
-         ResolvedProjectPtr project = loader->loadProject(defaultParameters);

-- 
qbs packaging



More information about the pkg-kde-commits mailing list