[SCM] qbs packaging branch, experimental, updated. debian/1.4-7fd456-1-5-gd187b8e

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit b2d89f3c10f3fabdc4872358072f8cf48fe139bf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Mar 14 13:40:12 2015 +0300

    Clean up patches and bump Last-Update timestamps.
---
 debian/changelog                  | 1 +
 debian/patches/remove_rpaths.diff | 8 +++-----
 debian/patches/skip_test.diff     | 8 +++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd58f79..9ae3fc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qbs (1.4~7fd456-2) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Fix a typo in previous changelog entry.
   * Sort debian/qbs.install.
+  * Clean up patches and bump Last-Update timestamps.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Mar 2015 13:35:25 +0300
 
diff --git a/debian/patches/remove_rpaths.diff b/debian/patches/remove_rpaths.diff
index 608b508..357d3d8 100644
--- a/debian/patches/remove_rpaths.diff
+++ b/debian/patches/remove_rpaths.diff
@@ -1,12 +1,10 @@
 Description: do not pass wrong -L flag when linking with libqbscore
 Author: Adam Majer <adamm at zombino.com>
 Forwarded: not-needed
-Last-Update: 2015-01-08
+Last-Update: 2015-03-13
 
-Index: qbs/src/lib/corelib/use_installed_corelib.pri
-===================================================================
---- qbs.orig/src/lib/corelib/use_installed_corelib.pri	2015-03-12 18:53:43.451299470 -0500
-+++ qbs/src/lib/corelib/use_installed_corelib.pri	2015-03-12 18:54:43.995297832 -0500
+--- a/src/lib/corelib/use_installed_corelib.pri
++++ b/src/lib/corelib/use_installed_corelib.pri
 @@ -4,11 +4,9 @@
  
  QBSLIBDIR=$${PWD}/../../lib
diff --git a/debian/patches/skip_test.diff b/debian/patches/skip_test.diff
index 50c1133..6aef57a 100644
--- a/debian/patches/skip_test.diff
+++ b/debian/patches/skip_test.diff
@@ -2,12 +2,10 @@ Description: skip failing TestBlackbox::dependenciesProperty() test
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Bug: https://bugreports.qt-project.org/browse/QBS-695
 Forwarded: not-needed
-Last-Update: 2014-10-07
+Last-Update: 2015-03-13
 
-Index: qbs/tests/auto/blackbox/tst_blackbox.cpp
-===================================================================
---- qbs.orig/tests/auto/blackbox/tst_blackbox.cpp	2015-03-12 18:53:12.971300295 -0500
-+++ qbs/tests/auto/blackbox/tst_blackbox.cpp	2015-03-12 18:53:12.967300295 -0500
+--- a/tests/auto/blackbox/tst_blackbox.cpp
++++ b/tests/auto/blackbox/tst_blackbox.cpp
 @@ -398,6 +398,7 @@
  
  void TestBlackbox::dependenciesProperty()

-- 
qbs packaging