[SCM] qtchooser packaging branch, master, updated. debian/31-g980c64c-5-5-g89122db

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 2f165e52c0b10051bdbf9179139400d6dc5ba6d5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Dec 17 12:17:58 2013 -0300

    Remove patch applied upstream.
---
 debian/changelog                                   |  1 +
 .../patches/ensure_harcoded_paths_are_found.patch  | 27 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87f60b7..d14e469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtchooser (39-g4717841) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Remove ensure_harcoded_paths_are_found.patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Dec 2013 12:15:34 -0300
 
diff --git a/debian/patches/ensure_harcoded_paths_are_found.patch b/debian/patches/ensure_harcoded_paths_are_found.patch
deleted file mode 100644
index 16e61ef..0000000
--- a/debian/patches/ensure_harcoded_paths_are_found.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e6fea3d94db12b242e0bf2b3c1c024197a5c695 Mon Sep 17 00:00:00 2001
-From: Sune Vuorela <sune at vuorela.dk>
-Date: Sat, 7 Dec 2013 21:19:50 +0100
-Subject: [PATCH] Always ensure that the hardcoded paths are found
-
-Practice has shown that quite many sets XDG dirs for various purposes
-and that spoils qtchooser finding the distro provided Qt without adding
-like /usr to the XDG dirs variable which kind of kills performance.
-
-Provide a dedicated variable to disable a global installation.
-
-Change-Id: I58953e3b2b3cf43cb67d4c367312e83cfa9ad2b3
----
- src/qtchooser/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/qtchooser/main.cpp
-+++ b/src/qtchooser/main.cpp
-@@ -280,7 +280,7 @@ vector<string> ToolWrapper::searchPaths(
-     paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end());
- 
- #if defined(QTCHOOSER_GLOBAL_DIR)
--    if (qgetenv("XDG_CONFIG_DIRS").empty()) {
-+    if (qgetenv("QTCHOOSER_NO_GLOBAL_DIR").empty()) {
-         vector<string> globalPaths = stringSplit(QTCHOOSER_GLOBAL_DIR);
-         paths.insert(paths.end(), globalPaths.begin(), globalPaths.end());
-     }
diff --git a/debian/patches/series b/debian/patches/series
index d478af6..e78b3cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 enable-tests.patch
-ensure_harcoded_paths_are_found.patch

-- 
qtchooser packaging