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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 82d1d0267f81bc63e003c820e158a2e2144ce1b2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Aug 29 19:20:17 2013 -0300

    Add proper DEP-3 tags to the patch.
---
 debian/patches/workaround_other_distros_workaround.patch |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/debian/patches/workaround_other_distros_workaround.patch b/debian/patches/workaround_other_distros_workaround.patch
index 9adcd35..0dc92ad 100644
--- a/debian/patches/workaround_other_distros_workaround.patch
+++ b/debian/patches/workaround_other_distros_workaround.patch
@@ -1,3 +1,16 @@
+Description: worksaround a workaround done for other distros
+ Upstream ships a workaround for other distros's paths that Debian
+ doesn't have. This turned out to break CMake support in multiarch systems.
+ This patch simply comments out the line that tries to detect the need of
+ the workaround.
+ .
+ This patch should be considered Debian-only and a hack. A proper fix like
+ detecting multi archs paths with ${CMAKE_LIBRARY_ARCHITECTURE} should be
+ used instead.
+Bug: https://bugreports.qt-project.org/browse/QTBUG-33223
+Forwarded: not-needed
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -28,7 +28,8 @@ CMAKE_PARTIAL_MODULE_DEPS = $$replace(CM

-- 
qtbase packaging