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

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Mar 14 10:47:31 UTC 2015


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

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

    Update name of qbs_disable_rpath variable.
    
    Following upstream change (commit a8e6324de460745a).
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9ae3fc9..be822cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qbs (1.4~7fd456-2) UNRELEASED; urgency=medium
   * Fix a typo in previous changelog entry.
   * Sort debian/qbs.install.
   * Clean up patches and bump Last-Update timestamps.
+  * Update name of qbs_disable_rpath variable, following upstream
+    change (commit a8e6324de460745a).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Mar 2015 13:35:25 +0300
 
diff --git a/debian/rules b/debian/rules
index 726ffb1..6c75224 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	qmake qbs.pro \
 		CONFIG+=debug \
-		CONFIG+=disable_rpath \
+		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \
 		QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
 		QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \

-- 
qbs packaging



More information about the pkg-kde-commits mailing list