[SCM] qca-qt5 packaging branch, kubuntu_wily_archive, updated. 14d4432754e54bfe34028a18166434bf702b2152

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca-qt5.git;a=commitdiff;h=14d4432

The following commit has been merged in the kubuntu_wily_archive branch:
commit 14d4432754e54bfe34028a18166434bf702b2152
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 9 16:33:14 2015 +0100

    Remove upstream patch use_q_slots-q_signals_instead_of_slots-signals.diff
---
 debian/changelog                                   |  6 +++++
 debian/patches/series                              |  1 -
 ...q_slots-q_signals_instead_of_slots-signals.diff | 31 ----------------------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6cbc7f4..ea179fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qca-qt5 (2.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Remove upstream patch use_q_slots-q_signals_instead_of_slots-signals.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 09 Oct 2015 16:32:53 +0100
+
 qca-qt5 (2.1.0.3-0ubuntu4) wily; urgency=medium
 
   * update symbols for gcc 5
diff --git a/debian/patches/series b/debian/patches/series
index 4f7782f..e7856c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ pipeunittest_more_wait.diff
 hurd_msync.diff
 kubuntu_ignore_filewatch_test.diff
 kubuntu_mkspecs-dir.diff
-use_q_slots-q_signals_instead_of_slots-signals.diff
diff --git a/debian/patches/use_q_slots-q_signals_instead_of_slots-signals.diff b/debian/patches/use_q_slots-q_signals_instead_of_slots-signals.diff
deleted file mode 100644
index 0c19724..0000000
--- a/debian/patches/use_q_slots-q_signals_instead_of_slots-signals.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 66b9754170759d9333d5fc1e348642814d0310dd Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich at redhat.com>
-Date: Thu, 17 Sep 2015 16:14:24 +0200
-Subject: [PATCH] Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers
- from include dir REVIEW:125289
-
----
- include/QtCrypto/qca_safetimer.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/QtCrypto/qca_safetimer.h b/include/QtCrypto/qca_safetimer.h
-index 68dde5c..2de0d43 100644
---- a/include/QtCrypto/qca_safetimer.h
-+++ b/include/QtCrypto/qca_safetimer.h
-@@ -44,12 +44,12 @@ public:
- 	void setSingleShot(bool singleShot);
- 	int timerId() const;
- 
--public slots:
-+public Q_SLOTS:
- 	void start(int msec);
- 	void start();
- 	void stop();
- 
--signals:
-+Q_SIGNALS:
- 	void timeout();
- 
- protected:
--- 
-2.1.4

-- 
qca-qt5 packaging