[SCM] qtcreator packaging branch, master, updated. debian/3.6.1-1-5-ge25faa6

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit e25faa6043f6da9c0df68b05e1eaa59b941094ba
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 11 15:19:07 2016 -0300

    Refresh botan_system_lib.diff.
---
 debian/changelog                     |  1 +
 debian/patches/botan_system_lib.diff | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7077c0..d01129a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtcreator (4.0.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Instruct uscan to repack the original source with xz compression.
   * Remove 02_use_x-terminal-emulator.diff, already present upstream.
+  * Refresh botan_system_lib.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 May 2016 14:59:38 -0300
 
diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
index d242d09..63b1145 100644
--- a/debian/patches/botan_system_lib.diff
+++ b/debian/patches/botan_system_lib.diff
@@ -12,7 +12,7 @@ Last-Reviewed: 2014-08-19
 
 --- a/src/libs/ssh/sshcryptofacility.cpp
 +++ b/src/libs/ssh/sshcryptofacility.cpp
-@@ -38,6 +38,11 @@
+@@ -34,6 +34,11 @@
  #include "sshpacket_p.h"
  
  #include <botan/botan.h>
@@ -26,7 +26,7 @@ Last-Reviewed: 2014-08-19
  #include <QList>
 --- a/src/libs/ssh/sshcryptofacility_p.h
 +++ b/src/libs/ssh/sshcryptofacility_p.h
-@@ -32,9 +32,11 @@
+@@ -27,9 +27,11 @@
  #define SSHCRYPTOFACILITY_P_H
  
  #include <botan/botan.h>
@@ -40,7 +40,7 @@ Last-Reviewed: 2014-08-19
  namespace Internal {
 --- a/src/libs/ssh/sshkeyexchange.cpp
 +++ b/src/libs/ssh/sshkeyexchange.cpp
-@@ -38,6 +38,12 @@
+@@ -34,6 +34,12 @@
  #include "sshincomingpacket_p.h"
  
  #include <botan/botan.h>
@@ -51,11 +51,11 @@ Last-Reviewed: 2014-08-19
 +#include <botan/pubkey.h>
 +#include <botan/rsa.h>
  
- #ifdef CREATOR_SSH_DEBUG
- #include <iostream>
+ #include <string>
+ 
 --- a/src/libs/ssh/sshkeygenerator.cpp
 +++ b/src/libs/ssh/sshkeygenerator.cpp
-@@ -37,6 +37,11 @@
+@@ -32,6 +32,11 @@
  #include "sshpacket_p.h"
  
  #include <botan/botan.h>
@@ -69,7 +69,7 @@ Last-Reviewed: 2014-08-19
  #include <QInputDialog>
 --- a/src/libs/ssh/sshkeypasswordretriever_p.h
 +++ b/src/libs/ssh/sshkeypasswordretriever_p.h
-@@ -31,6 +31,7 @@
+@@ -27,6 +27,7 @@
  #define KEYPASSWORDRETRIEVER_H
  
  #include <botan/botan.h>

-- 
qtcreator packaging