[SCM] qtbase packaging branch, master, updated. debian/5.1.1+dfsg-1-2-g8e1b2b5

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8e1b2b598e08becafeb3bc5723a5551434675309
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Aug 29 18:42:04 2013 -0300

    Workaround a workaround.
---
 debian/changelog                                         |    4 ++++
 debian/patches/series                                    |    2 ++
 debian/patches/workaround_other_distros_workaround.patch |   12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0dc4a68..52387e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.1.1+dfsg-2) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add workaround_other_distros_workaround.patch as a Debian-specific patch to
+    workaround a workaround for other distros (Closes: #721176).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 28 Aug 2013 16:12:34 -0300
 
 qtbase-opensource-src (5.1.1+dfsg-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 63b9b5b..3d12213 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ sha3_64bit_BE.diff
 linux_no_perf.diff
 
 # Debian specific.
+workaround_other_distros_workaround.patch
+
diff --git a/debian/patches/workaround_other_distros_workaround.patch b/debian/patches/workaround_other_distros_workaround.patch
new file mode 100644
index 0000000..9adcd35
--- /dev/null
+++ b/debian/patches/workaround_other_distros_workaround.patch
@@ -0,0 +1,12 @@
+--- a/mkspecs/features/create_cmake.prf
++++ b/mkspecs/features/create_cmake.prf
+@@ -28,7 +28,8 @@ CMAKE_PARTIAL_MODULE_DEPS = $$replace(CM
+ # that to an absolute path. This is only done for installations to
+ # the /usr or / prefix.
+ CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS])
+-contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
++# Workaround Qt BUG https://bugreports.qt-project.org/browse/QTBUG-33223
++#contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
+ 
+ CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])
+ contains(CMAKE_INCLUDE_DIR, "^\.\./.*") {

-- 
qtbase packaging