[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit ccfeae5dcd8bc5decbf04e54c83422ffba9864eb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 15 15:50:37 2013 +0400

    Drop fix_usr-move_workaround_in_the_presence_of_multi-arch.patch.
    
    Applied in new upstream version.
---
 debian/changelog                                   |  2 +
 ..._workaround_in_the_presence_of_multi-arch.patch | 45 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fca88fd..0f9bb07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.2~alpha1+dfsg-1) UNRELEASED; urgency=low
 
   [ Dmitry Shachnev ]
   * New upstream alpha release.
+  * Drop fix_usr-move_workaround_in_the_presence_of_multi-arch.patch,
+    applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Oct 2013 15:48:12 +0400
 
diff --git a/debian/patches/fix_usr-move_workaround_in_the_presence_of_multi-arch.patch b/debian/patches/fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
deleted file mode 100644
index b7c47f1..0000000
--- a/debian/patches/fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 345432ca89c4a2530fa4fea43d96e8c382a28af7 Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <stephen.kelly at kdab.com>
-Date: Fri, 30 Aug 2013 16:09:06 +0200
-Subject: [PATCH] Fix usr-move workaround in the presence of multi-arch.
-
-The cmake directory may not be $PREFIX/lib/cmake, but
-instead $PREFIX/lib/<arch>/cmake. Getting the PATH of such a
-directory will not lead us to $PREFIX/, but to $PREFIX/lib.
-
-Use a relative calculation instead.
-
-Task-number: QTBUG-33223
-
-Change-Id: Ice4e0f859ab1df238bad4eb942f073e84dd86cc3
----
- mkspecs/features/create_cmake.prf                   |    4 ++--
- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -43,10 +43,10 @@ contains(CMAKE_LIB_DIR,"^\.\./.*") {
-     CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
-     CMAKE_LIB_DIR_IS_ABSOLUTE = True
- } else {
--    CMAKE_RELATIVE_INSTALL_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
-+    CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
-     # We need to go up another two levels because the CMake files are
-     # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
--    CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_DIR}../../"
-+    CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
- }
- 
- CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -13,7 +13,7 @@ get_filename_component(_IMPORT_PREFIX \"
- get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
- get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
- if(_realCurr STREQUAL _realOrig)
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR\" PATH)
-+    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
- else()
-     get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
- endif()
diff --git a/debian/patches/series b/debian/patches/series
index 348d46c..35129ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 sha3_64bit_BE.diff
 linux_no_perf.diff
-fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
 hurd_opengl_incldir.diff
 
 # Debian specific.

-- 
qtbase packaging