[SCM] qttools packaging branch, experimental, updated. debian/5.2.1-8-11-g683cfb7

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 3e7b2ce32effbffaad235ab62f4b853d71bd8374
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 24 10:29:05 2014 -0300

    Remove fix_path_to_lrelease.patch, applied upstream.
---
 debian/changelog                          |  1 +
 debian/patches/fix_path_to_lrelease.patch | 49 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a13746..1026390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qttools-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * Install headers into their new multi-arch path. Mark the development
     packages as Multi-Arch: same.
   * Bump Qt build dependencies.
+  * Remove fix_path_to_lrelease.patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 May 2014 23:02:27 -0300
 
diff --git a/debian/patches/fix_path_to_lrelease.patch b/debian/patches/fix_path_to_lrelease.patch
deleted file mode 100644
index e8a4eff..0000000
--- a/debian/patches/fix_path_to_lrelease.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 499da2177c2175f187d751fd6fb3c8548113901d Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <stephen.kelly at kdab.com>
-Date: Mon, 17 Mar 2014 09:58:54 +0100
-Subject: [PATCH] CMake: Fix path to lrelease on debian.
-
-Use a patch similar to qtbase/v5.2.0-alpha1~74^2^2~38 (Fix usr-move
-workaround in the presence of multi-arch., 2013-08-30) to include
-the appropriate calculation.
-
-Task-number: QTBUG-36673
-Change-Id: Iea0b6c64c5959d7d6dfce922c41031183c1c23d9
----
- src/linguist/Qt5LinguistToolsConfig.cmake.in | 2 +-
- src/linguist/linguist.pro                    | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
-index fac7cc6..ce71646 100644
---- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
-+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
-@@ -13,7 +13,7 @@ get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
- get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
- get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5LinguistTools\" REALPATH)
- if(_realCurr STREQUAL _realOrig)
--    get_filename_component(_qt5_linguisttools_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR\" PATH)
-+    get_filename_component(_qt5_linguisttools_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
- else()
-     get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
- endif()
-diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
-index 2979a23..9cf4aa6 100644
---- a/src/linguist/linguist.pro
-+++ b/src/linguist/linguist.pro
-@@ -18,10 +18,10 @@ contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND
- 
- CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
- !contains(CMAKE_LIB_DIR,"^\.\./.*") {
--    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}../../"
- } else {
-     CMAKE_LIB_DIR_IS_ABSOLUTE = True
- }
--- 
-1.8.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 5a0aeea..c853ff8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 lrelease-zlib.patch
 hurd-path_max.diff
-fix_path_to_lrelease.patch

-- 
qttools packaging