[SCM] qtchooser packaging branch, master, updated. debian/26-3-5-g06c0c07

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b280b6c63327d7fccb4b40c50fc749d6aa223567
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 18 19:43:03 2013 -0300

    Remove create-a-system-default-path.patch, it has been applied upstream.
---
 debian/changelog                                  |    1 +
 debian/patches/create-a-system-default-path.patch |   57 ---------------------
 debian/patches/series                             |    1 -
 3 files changed, 1 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e9e9ad..f169c2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtchooser (31-1) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Improve debian/watch (Thanks Pino!).
+  * Remove create-a-system-default-path.patch, it has been applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 May 2013 19:36:35 -0300
 
diff --git a/debian/patches/create-a-system-default-path.patch b/debian/patches/create-a-system-default-path.patch
deleted file mode 100644
index 602d1b1..0000000
--- a/debian/patches/create-a-system-default-path.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Sune Vuorela <sune at vuorela.dk>
-Date: Sat, 29 Dec 2012 23:56:27 +0100
-Subject: create a system default path
-
-Make it possible to build qtchooser with a system default search path
-
-build using make QTCHOOSER_GLOBAL_DIR=/usr/share/ will make qtchooser
-fall back to search in /usr/share/qtchooser/ as a last option
-
-Modified by Lisandro Damián Nicanor Pérez Meyer.
-This patch has not been accepted upstream (see link below), but
-we are able to ship it until we create a better patch for our use case.
-
-Origin: upstream, https://codereview.qt-project.org/#change,44027
-Last-Update: 2013-03-20
-
---- a/src/qtchooser/Makefile
-+++ b/src/qtchooser/Makefile
-@@ -17,6 +17,10 @@ TARGET        = qtchooser
- OBJECTS_TEST  = main-test.o
- TARGET_TEST   = test/qtchooser
- 
-+ifneq ($(QTCHOOSER_GLOBAL_DIR),)
-+	QTCHOOSER_GLOBAL_DIR_VAR:=-DQTCHOOSER_GLOBAL_DIR=\"$(QTCHOOSER_GLOBAL_DIR)\"
-+endif
-+
- first: all
- check: $(TARGET_TEST)
- 
-@@ -49,10 +53,10 @@ uninstall:
- ####### Compile
- 
- main.o: main.cpp
--	$(CXX) -c -Wall -Wextra $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-+	$(CXX) -c -Wall -Wextra $(QTCHOOSER_GLOBAL_DIR_VAR) $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
- 
- main-test.o: main.cpp
--	$(CXX) -c -Wall -Wextra -DQTCHOOSER_TEST_MODE -g $(CXXFLAGS) $(INCPATH) -o main-test.o main.cpp
-+	$(CXX) -c -Wall -Wextra -DQTCHOOSER_TEST_MODE $(QTCHOOSER_GLOBAL_DIR_VAR) -g $(CXXFLAGS) $(INCPATH) -o main-test.o main.cpp
- 
- ####### Install
- 
---- a/src/qtchooser/main.cpp
-+++ b/src/qtchooser/main.cpp
-@@ -265,6 +265,12 @@ vector<string> ToolWrapper::searchPaths(
-     // search the XDG config location directories
-     paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str());
- 
-+#if defined(QTCHOOSER_GLOBAL_DIR)
-+    // Add QTCHOOSER_GLOBAL_DIR at the beginning.
-+    vector<string> globalDir = stringSplit(QTCHOOSER_GLOBAL_DIR);
-+    paths.insert(paths.begin(), globalDir.begin(), globalDir.end());
-+#endif
-+
-     string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config");
-     paths.push_back(localDir);
- 
diff --git a/debian/patches/series b/debian/patches/series
index fb2aac7..adf80f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-create-a-system-default-path.patch
 enable-tests.patch
 fix-PATH_MAX.diff

-- 
qtchooser packaging