[SCM] qtcreator packaging branch, master, updated. debian/3.2.1+dfsg-7-5-ge885d18

Adam Majer adamm at moszumanska.debian.org
Wed Jan 7 07:16:22 UTC 2015


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

The following commit has been merged in the master branch:
commit 36585f234cd5fdfc7f4a9b76164522080765becd
Author: Adam Majer <adamm at zombino.com>
Date:   Fri Dec 26 01:13:40 2014 -0600

    Add missing botane header
---
 debian/patches/missing_header.diff | 12 ++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 13 insertions(+)

diff --git a/debian/patches/missing_header.diff b/debian/patches/missing_header.diff
new file mode 100644
index 0000000..d430ffe
--- /dev/null
+++ b/debian/patches/missing_header.diff
@@ -0,0 +1,12 @@
+Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
+===================================================================
+--- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp	2014-12-25 11:28:21.388740421 -0600
++++ qtcreator/src/libs/ssh/sshcryptofacility.cpp	2014-12-25 22:10:30.002238360 -0600
+@@ -39,6 +39,7 @@
+ 
+ #include <botan/botan.h>
+ #include <botan/cbc.h>
++#include <botan/ctr.h>
+ #include <botan/dsa.h>
+ #include <botan/pkcs8.h>
+ #include <botan/pubkey.h>
diff --git a/debian/patches/series b/debian/patches/series
index 22d6e71..e7e4d5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ qt_versions_trough_qtchooser.patch
 # Debian patches.
 botan_system_lib.diff
 always_autotect_qt_versions
+missing_header.diff

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list