[SCM] qtcreator packaging branch, master, updated. debian/3.6.0-1-2-g27d0071

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 27d0071886b62bd432702243c5d588f6c246f9a3
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 19 15:18:38 2016 -0600

    Move libexec executables under /usr/lib/<package>/libexec
---
 debian/changelog                   |  3 ++-
 debian/patches/remove_libexec.diff | 24 ++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 347bc23..f8a0a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtcreator (3.6.0-2) UNRELEASED; urgency=medium
 
-  * 
+  [ Adam Majer ]
+  * Move libexec executables out from under /usr/bin to under /usr/lib
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Jan 2016 15:03:51 -0600
 
diff --git a/debian/patches/remove_libexec.diff b/debian/patches/remove_libexec.diff
index 2ff8cb0..cffc9ca 100644
--- a/debian/patches/remove_libexec.diff
+++ b/debian/patches/remove_libexec.diff
@@ -1,26 +1,22 @@
 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: \
+--- qtcreator.orig/qtcreator.pri	2016-01-19 15:05:12.463608574 -0600
++++ qtcreator/qtcreator.pri	2016-01-19 15:09:06.793906678 -0600
+@@ -108,7 +108,7 @@
+     win32: \
          IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
--    else: \
+     else: \
 -        IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator
++        IDE_LIBEXEC_PATH = $$IDE_LIBRARY_PATH/libexec
      !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: \
+@@ -119,7 +119,7 @@
+     win32: \
          INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
--    else: \
+     else: \
 -        INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator
++        INSTALL_LIBEXEC_PATH = $$INSTALL_LIBRARY_PATH/libexec
      INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
      INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
      INSTALL_BIN_PATH     = $$QTC_PREFIX/bin

-- 
qtcreator packaging