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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 123165db85c2f16bbc3aef3c3563b70af6820a85
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Aug 30 12:18:01 2013 -0300

    Refresh patch.
    
    Seems there have been other changes in upstream that created the offset.
---
 ..._usr-move_workaround_in_the_presence_of_multi-arch.patch |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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
index 4e186db..65b6200 100644
--- 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
@@ -15,11 +15,9 @@ Change-Id: Ice4e0f859ab1df238bad4eb942f073e84dd86cc3
  mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index d8bef46..c52d804 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -37,10 +37,10 @@ contains(CMAKE_LIB_DIR,"^\.\./.*") {
+@@ -43,10 +43,10 @@ contains(CMAKE_LIB_DIR,"^\.\./.*") {
      CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
      CMAKE_LIB_DIR_IS_ABSOLUTE = True
  } else {
@@ -32,11 +30,9 @@ index d8bef46..c52d804 100644
  }
  
  CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 2ffb980..5ae3f74 100644
 --- 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 \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
+@@ -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)
@@ -45,6 +41,3 @@ index 2ffb980..5ae3f74 100644
  else()
      get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
  endif()
--- 
-1.8.4.rc3
-

-- 
qtbase packaging