[SCM] kcalcore packaging branch, master, updated. debian/4%17.08.0-1-9-g6dafe81

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kcalcore.git;a=commitdiff;h=6dafe81

The following commit has been merged in the master branch:
commit 6dafe81a5364b81556de7215b956aee462127468
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 12 20:45:20 2017 +0100

    merge changes from 4:16.04.2-2
---
 debian/changelog                                   |  5 +++
 debian/patches/series                              |  1 -
 ...rom-qt_qhash_seed-which-is-going-away-in-.patch | 38 ----------------------
 3 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85bda41..e218757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ kcalcore (4:17.08.3-1) UNRELEASED; urgency=medium
   * Add Mulit-Arch hints for libkf5calendarcore-dev.
   * Bump Standards-Version to 4.1.2 (No changes needed).
 
+  [ Pino Toscano ]
+  * Merge changes from 4:16.04.2-2:
+    - upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch:
+      drop, backported from upstream
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 12 Dec 2017 11:49:15 +0100
 
 kcalcore (4:17.08.0-1) experimental; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4ac33ae..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch
diff --git a/debian/patches/upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch b/debian/patches/upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch
deleted file mode 100644
index 4e074df..0000000
--- a/debian/patches/upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 93b2da839a298aab705c1865ee65e009aef53a55 Mon Sep 17 00:00:00 2001
-From: David Faure <faure at kde.org>
-Date: Wed, 15 Mar 2017 08:47:53 +0100
-Subject: [PATCH] Port away from qt_qhash_seed which is going away in Qt 5.9
-
-https://codereview.qt-project.org/188474
----
- autotests/readandwrite.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/autotests/readandwrite.cpp b/autotests/readandwrite.cpp
-index 0c3e969d3..8ebd0cbd9 100644
---- a/autotests/readandwrite.cpp
-+++ b/autotests/readandwrite.cpp
-@@ -36,11 +36,9 @@
- 
- using namespace KCalCore;
- 
--extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; // from qhash.cpp
--
- int main(int argc, char **argv)
- {
--    qt_qhash_seed.fetchAndStoreRelaxed(0); // Disable QHash randomness
-+    qSetGlobalQHashSeed(0); // Disable QHash randomness
- 
-     QCommandLineParser parser;
-     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("verbose"), i18n("Verbose output")));
-@@ -58,7 +56,6 @@ int main(int argc, char **argv)
-     QCoreApplication::setApplicationVersion(QStringLiteral("0.1"));
-     parser.process(app);
-     about.processCommandLine(&parser);
--    // KComponentData componentData(&about);   // needed by KConfig used by KSaveFile TODO: still needed ?
- 
-     const QStringList parsedArgs = parser.positionalArguments();
-     if (parsedArgs.count() != 2) {
--- 
-2.15.1
-

-- 
kcalcore packaging