[SCM] qtcreator packaging branch, master, updated. debian/3.5.1+dfsg-2-10-g6abe3b7

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 6abe3b74919915c69632e9189cbea4729763d290
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 19 02:25:52 2016 -0600

    Use /usr/bin instead of /usr/libexec path
---
 debian/changelog                   |  1 +
 debian/patches/remove_libexec.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 70ab6a5..3deb815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtcreator (3.6.0-1) UNRELEASED; urgency=medium
 
   [ Adam Majer ]
   * Refreshed disable_llvm_rpath.diff - still needed for clangbackend binary.
+  * Move libexec executables back to standard bin path
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Dec 2015 14:10:05 -0300
 
diff --git a/debian/patches/remove_libexec.diff b/debian/patches/remove_libexec.diff
new file mode 100644
index 0000000..2ff8cb0
--- /dev/null
+++ b/debian/patches/remove_libexec.diff
@@ -0,0 +1,26 @@
+Index: qtcreator/qtcreator.pri
+===================================================================
+--- qtcreator.orig/qtcreator.pri	2015-12-11 06:45:01.000000000 -0600
++++ qtcreator/qtcreator.pri	2016-01-19 02:21:48.124393948 -0600
+@@ -105,10 +105,7 @@
+     IDE_DATA_PATH    = $$IDE_OUTPUT_PATH/share/qtcreator
+     IDE_DOC_PATH     = $$IDE_OUTPUT_PATH/share/doc/qtcreator
+     IDE_BIN_PATH     = $$IDE_OUTPUT_PATH/bin
+-    win32: \
+         IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
+-    else: \
+-        IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator
+     !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
+ 
+     LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
+@@ -116,10 +113,7 @@
+ 
+     INSTALL_LIBRARY_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
+     INSTALL_PLUGIN_PATH  = $$INSTALL_LIBRARY_PATH/plugins
+-    win32: \
+         INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
+-    else: \
+-        INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator
+     INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
+     INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
+     INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
diff --git a/debian/patches/series b/debian/patches/series
index 8499022..d09db82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ botan_system_lib.diff
 always_autotect_qt_versions
 missing_header.diff
 fix_documentation_path.diff
+remove_libexec.diff

-- 
qtcreator packaging