[SCM] qtcreator packaging branch, master, updated. debian/4.5.0-2-6-gcbdc5e0

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit c66ecd50dc57f4715e5c8e24dd251893fbe62175
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Feb 6 15:39:16 2018 -0300

    Refresh patches.
---
 debian/changelog                           |  2 ++
 debian/control                             |  1 -
 debian/patches/fix_documentation_path.diff |  8 ++------
 debian/patches/remove_libexec.diff         | 15 ++++++---------
 debian/rules                               |  2 +-
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1eefa2..fe18c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtcreator (4.5.0-3) UNRELEASED; urgency=medium
   * Switch back to using the embedded botan's code. Version 1.10 will get
     removed from the archive. QTCREATORBUG-19745 was filed against upstream
     to improve this situation.
+    - Remove botan build dependency.
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 05 Feb 2018 17:15:51 -0300
 
diff --git a/debian/control b/debian/control
index 472e8ff..e084a36 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Adam Majer <adamm at zombino.com>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Simon Quigley <tsimonq2 at ubuntu.com>
 Build-Depends: debhelper (>= 10),
-               libbotan1.10-dev,
                libclang-3.9-dev [amd64 i386],
                libicu-dev,
                libjs-jquery,
diff --git a/debian/patches/fix_documentation_path.diff b/debian/patches/fix_documentation_path.diff
index b1371c8..adc6106 100644
--- a/debian/patches/fix_documentation_path.diff
+++ b/debian/patches/fix_documentation_path.diff
@@ -1,12 +1,10 @@
 ---
- src/plugins/coreplugin/icore.cpp |    2 +-
+ qtcreator.pri |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/qtcreator.pri
 +++ b/qtcreator.pri
-@@ -131,11 +131,11 @@ osx {
-     isEmpty(IDE_OUTPUT_PATH): IDE_OUTPUT_PATH = $$IDE_BUILD_TREE
- 
+@@ -134,7 +134,7 @@ osx {
      IDE_LIBRARY_PATH = $$IDE_OUTPUT_PATH/$$IDE_LIBRARY_BASENAME/qtcreator
      IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins
      IDE_DATA_PATH    = $$IDE_OUTPUT_PATH/share/qtcreator
@@ -15,5 +13,3 @@
      IDE_BIN_PATH     = $$IDE_OUTPUT_PATH/bin
      win32: \
          IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
-     else: \
-         IDE_LIBEXEC_PATH = $$IDE_LIBRARY_PATH/libexec
diff --git a/debian/patches/remove_libexec.diff b/debian/patches/remove_libexec.diff
index dff93d8..2d96a45 100644
--- a/debian/patches/remove_libexec.diff
+++ b/debian/patches/remove_libexec.diff
@@ -1,8 +1,10 @@
+---
+ qtcreator.pri |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- a/qtcreator.pri
 +++ b/qtcreator.pri
-@@ -136,22 +136,22 @@ osx {
-     IDE_DOC_PATH     = $$IDE_OUTPUT_PATH/share/doc/qtcreator
-     IDE_BIN_PATH     = $$IDE_OUTPUT_PATH/bin
+@@ -139,7 +139,7 @@ osx {
      win32: \
          IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
      else: \
@@ -11,10 +13,7 @@
      !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
  
      LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
-     LINK_PLUGIN_PATH  = $$LINK_LIBRARY_PATH/plugins
- 
-     INSTALL_LIBRARY_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
-     INSTALL_PLUGIN_PATH  = $$INSTALL_LIBRARY_PATH/plugins
+@@ -150,7 +150,7 @@ osx {
      win32: \
          INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
      else: \
@@ -23,5 +22,3 @@
      INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
      INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
      INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
-     INSTALL_APP_PATH     = $$QTC_PREFIX/bin
- }
diff --git a/debian/rules b/debian/rules
index 74d572f..475349b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ override_dh_auto_configure:
 		PREFIX=/usr/ \
 		LLVM_INSTALL_DIR="$(LLVM_INSTALL_DIR)" \
 		CONFIG+=disable_external_rpath \
-		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
+		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 $(extra_configure_opts)
 
 override_dh_auto_install:
 ifneq (,$(filter qtcreator-doc, $(shell dh_listpackages)))

-- 
qtcreator packaging