[SCM] qbs packaging branch, master, updated. debian/1.3.3+dfsg-2-3-g0b2ef0c

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 0b2ef0cf3cf702e35cb74700163a1b1fc7bc14cb
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 6 14:16:53 2015 -0600

    Remove rpath in project include files when referencing system libaries
---
 debian/changelog                  |  5 +++++
 debian/patches/remove_rpaths.diff | 17 +++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 529bcd8..da93fd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ qbs (1.3.3+dfsg-3) UNRELEASED; urgency=medium
   * Add ${misc:Pre-Depends} to Pre-Depends for qbs, libqbscore1, and
     libqbsqtprofilesetup1.
 
+  [ Adam Majer ]
+  *  Remove rpath from project include files used by 3rd party
+     software. On Debian, rpath should not be set when referencing
+     system installed libraries.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 31 Dec 2014 16:52:15 +0100
 
 qbs (1.3.3+dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/remove_rpaths.diff b/debian/patches/remove_rpaths.diff
new file mode 100644
index 0000000..6b391fc
--- /dev/null
+++ b/debian/patches/remove_rpaths.diff
@@ -0,0 +1,17 @@
+Index: qbs/src/lib/corelib/use_installed_corelib.pri
+===================================================================
+--- qbs.orig/src/lib/corelib/use_installed_corelib.pri	2014-12-01 05:15:45.000000000 -0600
++++ qbs/src/lib/corelib/use_installed_corelib.pri	2015-01-06 14:07:10.766010382 -0600
+@@ -4,11 +4,9 @@
+ 
+ QBSLIBDIR=$${PWD}/../../lib
+ unix {
+-    LIBS += -L$$QBSLIBDIR -lqbscore
++    LIBS += -lqbscore
+ }
+ 
+-!disable_rpath:unix:QMAKE_LFLAGS += -Wl,-rpath,$${QBSLIBDIR}
+-
+ !CONFIG(static, static|shared) {
+     QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e20fb9d..0695402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 endianness.diff
 skip_test.diff
+remove_rpaths.diff

-- 
qbs packaging