[SCM] qtcreator packaging branch, master, updated. debian/2.8.1-3-5-g30b6882

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 30b6882fd2298b846a82a76fef80d72552ccaa8a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Feb 20 22:46:51 2014 -0300

    Readapt botan_system_lib.diff.
---
 debian/changelog                     | 1 +
 debian/patches/botan_system_lib.diff | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b6a371..e452ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtcreator (3.0.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Fix watch file.
   * Refresh rpath_nonlinux.diff.
+  * Readapt botan_system_lib.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Feb 2014 22:24:57 -0300
 
diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
index 4c31448..52fd2ac 100644
--- a/debian/patches/botan_system_lib.diff
+++ b/debian/patches/botan_system_lib.diff
@@ -1,5 +1,6 @@
 Description: Use the system botan library instead of the bundled one.
 Author: Felix Geyer <debfx at ubuntu.com>
+Last-Reviewed: 2014-02-20
 
 --- a/src/libs/3rdparty/botan/botan.pri
 +++ b/src/libs/3rdparty/botan/botan.pri
@@ -42,7 +43,7 @@ Author: Felix Geyer <debfx at ubuntu.com>
 -
 -    win32-msvc* {
 -        QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
--        DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S
+-        DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS
 -    } else {
 -        QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long
 -        QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long
@@ -57,7 +58,7 @@ Author: Felix Geyer <debfx at ubuntu.com>
 -}
 -
 -linux*|freebsd* {
--    LIBS += -lrt
+-    LIBS += -lrt $$QMAKE_LIBS_DYNLOAD
 -}
 -}
 +CONFIG += link_pkgconfig
@@ -107,7 +108,7 @@ Author: Felix Geyer <debfx at ubuntu.com>
  #include <iostream>
 --- a/src/libs/ssh/sshkeygenerator.cpp
 +++ b/src/libs/ssh/sshkeygenerator.cpp
-@@ -34,6 +34,11 @@
+@@ -35,6 +35,11 @@
  #include "sshpacket_p.h"
  
  #include <botan/botan.h>

-- 
qtcreator packaging