[SCM] qtcreator packaging branch, master, updated. debian/3.3.0+dfsg-1-13-gfcb22e1
Adam Majer
adamm at moszumanska.debian.org
Fri Jun 26 03:17:14 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=5af113a
The following commit has been merged in the master branch:
commit 5af113af703808bf75c5ac3fc0457b4bf81fb8af
Author: Adam Majer <adamm at zombino.com>
Date: Sun Mar 8 17:23:42 2015 -0500
Update for Creator 3.4.0 beta1 release
Build depends on qbs need to be bumped
---
debian/changelog | 7 +++
debian/control | 2 +-
debian/patches/botan_system_lib.diff | 94 +++++-------------------------
debian/patches/fix_documentation_path.diff | 8 +--
4 files changed, 27 insertions(+), 84 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index af997ee..870d3f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtcreator (3.4.0+dfsg~b1-1) experimental; urgency=medium
+
+ * New upstream release
+ + Added support for autocompletion of Qt5 style connect
+
+ -- Adam Majer <adamm at zombino.com> Sat, 07 Mar 2015 16:06:47 -0600
+
qtcreator (3.3.1+dfsg-1) experimental; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index 9903458..28066f4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
libx11-dev,
libxext-dev,
pkg-config,
- qbs-dev (>= 1.3.3+dfsg~),
+ qbs-dev (>= 1.3.4+dfsg~),
qml-module-qtquick2 (>= 5.3.2~),
qtbase5-dev (>= 5.3.2+dfsg~),
qtbase5-private-dev (>= 5.3.2+dfsg~),
diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
index 2ad6f5d..082c803 100644
--- a/debian/patches/botan_system_lib.diff
+++ b/debian/patches/botan_system_lib.diff
@@ -11,74 +11,10 @@ Last-Reviewed: 2014-08-19
src/libs/ssh/sshkeypasswordretriever_p.h | 1
6 files changed, 21 insertions(+), 57 deletions(-)
-Index: qtcreator/src/libs/3rdparty/botan/botan.pri
+Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility.cpp
===================================================================
---- qtcreator.orig/src/libs/3rdparty/botan/botan.pri 2014-12-25 11:28:21.392740421 -0600
-+++ qtcreator/src/libs/3rdparty/botan/botan.pri 2014-12-25 11:28:21.388740421 -0600
-@@ -1,57 +1,2 @@
--INCLUDEPATH *= $$PWD/..
--HEADERS += $$PWD/botan.h
--
--equals(USE_SYSTEM_BOTAN, 1) {
-- DEFINES += USE_SYSTEM_BOTAN
-- CONFIG += link_pkgconfig
-- PKGCONFIG += botan-1.10
--} else {
--
--SOURCES += $$PWD/botan.cpp
--
--CONFIG += exceptions
--
--DEPENDPATH += .
--
--DEFINES += BOTAN_DLL=
--unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
-- BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
-- BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
--*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
-- BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \
-- BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER
--macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
--*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
--*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG
--*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
--
--CONFIG(x86_64):DEFINES += BOTAN_TARGET_ARCH_IS_X86_64
--
--win32 {
-- DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \
-- BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \
-- BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE \
-- BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
-- BOTAN_HAS_MUTEX_WIN32
--
-- win32-msvc* {
-- QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs
-- QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
-- 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
-- }
-- LIBS += -ladvapi32 -luser32
--}
--
--unix:*-g++* {
-- QMAKE_CFLAGS += -fPIC -fpermissive -finline-functions -Wno-long-long
-- QMAKE_CXXFLAGS += -fPIC -fpermissive -finline-functions -Wno-long-long
-- QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04
--}
--
--linux*|freebsd* {
-- LIBS += -lrt $$QMAKE_LIBS_DYNLOAD
--}
--}
-+CONFIG += link_pkgconfig
-+PKGCONFIG += botan-1.10
-Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
-===================================================================
---- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp 2014-12-25 11:28:21.392740421 -0600
-+++ qtcreator/src/libs/ssh/sshcryptofacility.cpp 2014-12-25 11:28:21.388740421 -0600
+--- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshcryptofacility.cpp 2015-03-07 17:26:46.077464409 -0600
++++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility.cpp 2015-03-07 17:26:46.073464409 -0600
@@ -38,6 +38,11 @@
#include "sshpacket_p.h"
@@ -91,10 +27,10 @@ Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
#include <QDebug>
#include <QList>
-Index: qtcreator/src/libs/ssh/sshcryptofacility_p.h
+Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility_p.h
===================================================================
---- qtcreator.orig/src/libs/ssh/sshcryptofacility_p.h 2014-12-25 11:28:21.392740421 -0600
-+++ qtcreator/src/libs/ssh/sshcryptofacility_p.h 2014-12-25 11:28:21.388740421 -0600
+--- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshcryptofacility_p.h 2015-03-07 17:26:46.077464409 -0600
++++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility_p.h 2015-03-07 17:26:46.073464409 -0600
@@ -32,9 +32,11 @@
#define SSHCRYPTOFACILITY_P_H
@@ -107,10 +43,10 @@ Index: qtcreator/src/libs/ssh/sshcryptofacility_p.h
namespace QSsh {
namespace Internal {
-Index: qtcreator/src/libs/ssh/sshkeyexchange.cpp
+Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeyexchange.cpp
===================================================================
---- qtcreator.orig/src/libs/ssh/sshkeyexchange.cpp 2014-12-25 11:28:21.392740421 -0600
-+++ qtcreator/src/libs/ssh/sshkeyexchange.cpp 2014-12-25 11:28:21.388740421 -0600
+--- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshkeyexchange.cpp 2015-03-07 17:26:46.077464409 -0600
++++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeyexchange.cpp 2015-03-07 17:26:46.073464409 -0600
@@ -37,6 +37,12 @@
#include "sshincomingpacket_p.h"
@@ -124,10 +60,10 @@ Index: qtcreator/src/libs/ssh/sshkeyexchange.cpp
#ifdef CREATOR_SSH_DEBUG
#include <iostream>
-Index: qtcreator/src/libs/ssh/sshkeygenerator.cpp
+Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeygenerator.cpp
===================================================================
---- qtcreator.orig/src/libs/ssh/sshkeygenerator.cpp 2014-12-25 11:28:21.392740421 -0600
-+++ qtcreator/src/libs/ssh/sshkeygenerator.cpp 2014-12-25 11:28:21.388740421 -0600
+--- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshkeygenerator.cpp 2015-03-07 17:26:46.077464409 -0600
++++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeygenerator.cpp 2015-03-07 17:26:46.073464409 -0600
@@ -36,6 +36,11 @@
#include "sshpacket_p.h"
@@ -140,10 +76,10 @@ Index: qtcreator/src/libs/ssh/sshkeygenerator.cpp
#include <QDateTime>
#include <QInputDialog>
-Index: qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h
+Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeypasswordretriever_p.h
===================================================================
---- qtcreator.orig/src/libs/ssh/sshkeypasswordretriever_p.h 2014-12-25 11:28:21.392740421 -0600
-+++ qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h 2014-12-25 11:28:21.388740421 -0600
+--- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshkeypasswordretriever_p.h 2015-03-07 17:26:46.077464409 -0600
++++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeypasswordretriever_p.h 2015-03-07 17:26:46.073464409 -0600
@@ -31,6 +31,7 @@
#define KEYPASSWORDRETRIEVER_H
diff --git a/debian/patches/fix_documentation_path.diff b/debian/patches/fix_documentation_path.diff
index d1f774d..fcaaa01 100644
--- a/debian/patches/fix_documentation_path.diff
+++ b/debian/patches/fix_documentation_path.diff
@@ -1,8 +1,8 @@
-Index: qtcreator/src/plugins/coreplugin/icore.cpp
+Index: qtcreator-3.4.0+dfsg~b1/src/plugins/coreplugin/icore.cpp
===================================================================
---- qtcreator.orig/src/plugins/coreplugin/icore.cpp 2014-12-08 06:58:49.000000000 -0600
-+++ qtcreator/src/plugins/coreplugin/icore.cpp 2015-01-01 02:56:43.042709789 -0600
-@@ -422,7 +422,7 @@
+--- qtcreator-3.4.0+dfsg~b1.orig/src/plugins/coreplugin/icore.cpp 2015-03-07 17:33:01.497454249 -0600
++++ qtcreator-3.4.0+dfsg~b1/src/plugins/coreplugin/icore.cpp 2015-03-07 17:33:01.493454250 -0600
+@@ -411,7 +411,7 @@
QString ICore::documentationPath()
{
const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list