[SCM] qtcreator packaging branch, experimental, updated. debian/4.2.0-1-3-g2327649
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Fri Jun 2 03:11:07 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=2327649
The following commit has been merged in the experimental branch:
commit 23276499832b85308b1a7cba3ce346e468085b86
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Thu Jun 1 21:08:07 2017 -0500
Refresh patches and remove fix_documentation_path.diff as it's no longer needed.
---
debian/changelog | 2 ++
debian/patches/always_autotect_qt_versions | 6 ++---
debian/patches/botan_system_lib.diff | 30 ++++++++----------------
debian/patches/fix_documentation_path.diff | 17 --------------
debian/patches/fix_qt_version_autodetection.diff | 14 ++++-------
debian/patches/missing_header.diff | 6 ++---
debian/patches/remove_libexec.diff | 24 ++++---------------
debian/patches/rpath_nonlinux.diff | 18 +++++---------
debian/patches/series | 1 -
9 files changed, 31 insertions(+), 87 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8eb6ac8..5906835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtcreator (4.3.0-1) UNRELEASED; urgency=medium
[ Simon Quigley ]
* New upstream release.
* Bump Standards-version to 4.0.0.
+ * Refresh patches and remove fix_documentation_path.diff as it's no longer
+ needed.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 01 Jun 2017 20:41:24 -0500
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
index f372f31..9c96dc5 100644
--- a/debian/patches/always_autotect_qt_versions
+++ b/debian/patches/always_autotect_qt_versions
@@ -1,7 +1,5 @@
-Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
-===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+--- a/src/plugins/qtsupport/qtversionmanager.cpp
++++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -96,7 +96,7 @@ bool qtVersionNumberCompare(BaseQtVersio
return a->qtVersion() > b->qtVersion() || (a->qtVersion() == b->qtVersion() && a->uniqueId() < b->uniqueId());
}
diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
index cb53009..6a1a6f3 100644
--- a/debian/patches/botan_system_lib.diff
+++ b/debian/patches/botan_system_lib.diff
@@ -10,10 +10,8 @@ Last-Reviewed: 2014-08-19
src/libs/ssh/sshkeypasswordretriever_p.h | 1 +
5 files changed, 19 insertions(+)
-Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
-===================================================================
---- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp
-+++ qtcreator/src/libs/ssh/sshcryptofacility.cpp
+--- a/src/libs/ssh/sshcryptofacility.cpp
++++ b/src/libs/ssh/sshcryptofacility.cpp
@@ -34,6 +34,11 @@
#include "sshpacket_p.h"
@@ -26,10 +24,8 @@ Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
#include <QDebug>
#include <QList>
-Index: qtcreator/src/libs/ssh/sshcryptofacility_p.h
-===================================================================
---- qtcreator.orig/src/libs/ssh/sshcryptofacility_p.h
-+++ qtcreator/src/libs/ssh/sshcryptofacility_p.h
+--- a/src/libs/ssh/sshcryptofacility_p.h
++++ b/src/libs/ssh/sshcryptofacility_p.h
@@ -26,9 +26,11 @@
#pragma once
@@ -42,10 +38,8 @@ Index: qtcreator/src/libs/ssh/sshcryptofacility_p.h
namespace QSsh {
namespace Internal {
-Index: qtcreator/src/libs/ssh/sshkeyexchange.cpp
-===================================================================
---- qtcreator.orig/src/libs/ssh/sshkeyexchange.cpp
-+++ qtcreator/src/libs/ssh/sshkeyexchange.cpp
+--- a/src/libs/ssh/sshkeyexchange.cpp
++++ b/src/libs/ssh/sshkeyexchange.cpp
@@ -34,6 +34,12 @@
#include "sshincomingpacket_p.h"
@@ -59,10 +53,8 @@ Index: qtcreator/src/libs/ssh/sshkeyexchange.cpp
#include <string>
-Index: qtcreator/src/libs/ssh/sshkeygenerator.cpp
-===================================================================
---- qtcreator.orig/src/libs/ssh/sshkeygenerator.cpp
-+++ qtcreator/src/libs/ssh/sshkeygenerator.cpp
+--- a/src/libs/ssh/sshkeygenerator.cpp
++++ b/src/libs/ssh/sshkeygenerator.cpp
@@ -32,6 +32,11 @@
#include "sshpacket_p.h"
@@ -75,10 +67,8 @@ Index: qtcreator/src/libs/ssh/sshkeygenerator.cpp
#include <QDateTime>
#include <QInputDialog>
-Index: qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h
-===================================================================
---- qtcreator.orig/src/libs/ssh/sshkeypasswordretriever_p.h
-+++ qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h
+--- a/src/libs/ssh/sshkeypasswordretriever_p.h
++++ b/src/libs/ssh/sshkeypasswordretriever_p.h
@@ -26,6 +26,7 @@
#pragma once
diff --git a/debian/patches/fix_documentation_path.diff b/debian/patches/fix_documentation_path.diff
deleted file mode 100644
index 3245ae3..0000000
--- a/debian/patches/fix_documentation_path.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- src/plugins/coreplugin/icore.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: qtcreator/src/plugins/coreplugin/icore.cpp
-===================================================================
---- qtcreator.orig/src/plugins/coreplugin/icore.cpp
-+++ qtcreator/src/plugins/coreplugin/icore.cpp
-@@ -420,7 +420,7 @@ QString ICore::userResourcePath()
- QString ICore::documentationPath()
- {
- const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
-- ? "/../Resources/doc" : "/../share/doc/qtcreator");
-+ ? "/../Resources/doc" : "/../share/qtcreator/doc");
- return QDir::cleanPath(QCoreApplication::applicationDirPath() + docPath);
- }
-
diff --git a/debian/patches/fix_qt_version_autodetection.diff b/debian/patches/fix_qt_version_autodetection.diff
index 1e71155..ade2935 100644
--- a/debian/patches/fix_qt_version_autodetection.diff
+++ b/debian/patches/fix_qt_version_autodetection.diff
@@ -5,10 +5,8 @@ Description: Fix piling up of Qt configurations.
Last-Update: 2015-11-02
Forwarded: no
-Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
-===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+--- a/src/plugins/qtsupport/qtversionmanager.cpp
++++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -445,7 +445,7 @@ static void updateSystemQt()
QMap<QString, int> currentAutoVersions;
@@ -18,11 +16,9 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
currentAutoVersions.insert(i.value()->qmakeCommand().toString(), i.key());
}
}
-Index: qtcreator/src/libs/utils/buildablehelperlibrary.cpp
-===================================================================
---- qtcreator.orig/src/libs/utils/buildablehelperlibrary.cpp
-+++ qtcreator/src/libs/utils/buildablehelperlibrary.cpp
-@@ -81,8 +81,15 @@ FileName BuildableHelperLibrary::findSys
+--- a/src/libs/utils/buildablehelperlibrary.cpp
++++ b/src/libs/utils/buildablehelperlibrary.cpp
+@@ -82,8 +82,15 @@ FileName BuildableHelperLibrary::findSys
if (dir.exists(qmake)) {
const QString qmakePath = dir.absoluteFilePath(qmake);
diff --git a/debian/patches/missing_header.diff b/debian/patches/missing_header.diff
index 0edcef5..b8401de 100644
--- a/debian/patches/missing_header.diff
+++ b/debian/patches/missing_header.diff
@@ -1,7 +1,5 @@
-Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
-===================================================================
---- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp
-+++ qtcreator/src/libs/ssh/sshcryptofacility.cpp
+--- a/src/libs/ssh/sshcryptofacility.cpp
++++ b/src/libs/ssh/sshcryptofacility.cpp
@@ -35,6 +35,7 @@
#include <botan/botan.h>
diff --git a/debian/patches/remove_libexec.diff b/debian/patches/remove_libexec.diff
index e06dea3..7e0a7c3 100644
--- a/debian/patches/remove_libexec.diff
+++ b/debian/patches/remove_libexec.diff
@@ -1,8 +1,6 @@
-Index: qtcreator/qtcreator.pri
-===================================================================
---- qtcreator.orig/qtcreator.pri
-+++ qtcreator/qtcreator.pri
-@@ -108,7 +108,7 @@ osx {
+--- a/qtcreator.pri
++++ b/qtcreator.pri
+@@ -138,7 +138,7 @@ osx {
win32: \
IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
else: \
@@ -11,7 +9,7 @@ Index: qtcreator/qtcreator.pri
!isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
-@@ -119,7 +119,7 @@ osx {
+@@ -149,7 +149,7 @@ osx {
win32: \
INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
else: \
@@ -20,17 +18,3 @@ Index: qtcreator/qtcreator.pri
INSTALL_DATA_PATH = $$QTC_PREFIX/share/qtcreator
INSTALL_DOC_PATH = $$QTC_PREFIX/share/doc/qtcreator
INSTALL_BIN_PATH = $$QTC_PREFIX/bin
-Index: qtcreator/src/plugins/coreplugin/icore.cpp
-===================================================================
---- qtcreator.orig/src/plugins/coreplugin/icore.cpp
-+++ qtcreator/src/plugins/coreplugin/icore.cpp
-@@ -441,7 +441,8 @@ QString ICore::libexecPath()
- case Utils::OsTypeLinux:
- case Utils::OsTypeOtherUnix:
- case Utils::OsTypeOther:
-- path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/qtcreator");
-+ path = QCoreApplication::applicationDirPath()
-+ + QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator/libexec");
- break;
- }
- return QDir::cleanPath(path);
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index 9987f7b..ead5d5a 100644
--- a/debian/patches/rpath_nonlinux.diff
+++ b/debian/patches/rpath_nonlinux.diff
@@ -11,10 +11,8 @@ Forwarded: no
src/tools/qtcreatorwidgets/qtcreatorwidgets.pro | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
-Index: qtcreator/src/rpath.pri
-===================================================================
---- qtcreator.orig/src/rpath.pri
-+++ qtcreator/src/rpath.pri
+--- a/src/rpath.pri
++++ b/src/rpath.pri
@@ -1,6 +1,6 @@
macx {
QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../,-rpath, at executable_path/../
@@ -23,10 +21,8 @@ Index: qtcreator/src/rpath.pri
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
QMAKE_RPATHDIR += \$\$ORIGIN
-Index: qtcreator/src/qtcreatorplugin.pri
-===================================================================
---- qtcreator.orig/src/qtcreatorplugin.pri
-+++ qtcreator/src/qtcreatorplugin.pri
+--- a/src/qtcreatorplugin.pri
++++ b/src/qtcreatorplugin.pri
@@ -94,7 +94,7 @@ contains(QT_CONFIG, reduce_exports):CONF
TEMPLATE = lib
@@ -36,10 +32,8 @@ Index: qtcreator/src/qtcreatorplugin.pri
target.path = $$INSTALL_PLUGIN_PATH
INSTALLS += target
-Index: qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
-===================================================================
---- qtcreator.orig/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
-+++ qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+--- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
++++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
@@ -13,7 +13,7 @@ isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib
}
diff --git a/debian/patches/series b/debian/patches/series
index b9a9c6c..ba9b1d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@ botan_system_lib.diff
always_autotect_qt_versions
fix_qt_version_autodetection.diff
missing_header.diff
-fix_documentation_path.diff
remove_libexec.diff
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list