[SCM] konsole packaging branch, kubuntu_stable, updated. debian/4.14.2-1-54-g7eacddd

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=7eacddd

The following commit has been merged in the kubuntu_stable branch:
commit 7eacddd379aba86a8809322dfd0b66a0e7016f78
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Aug 20 12:09:47 2015 +0100

    remove upstream patch
---
 debian/patches/series              |  1 -
 debian/patches/upstream_gcc52.diff | 22 ----------------------
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 68e3727..bccb940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debian-T-addition.diff
-upstream_gcc52.diff
diff --git a/debian/patches/upstream_gcc52.diff b/debian/patches/upstream_gcc52.diff
deleted file mode 100644
index acea320..0000000
--- a/debian/patches/upstream_gcc52.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 457d86d79a1496014b45a5bc6b14c23c4bdf4fa9
-Author: Kurt Hindenburg <kurt.hindenburg at gmail.com>
-Date:   Sat Aug 8 09:49:10 2015 -0400
-
-    Export HistoryScroll to fix compiling issue with gcc 5.2
-    
-    REVIEW: 123881
-    (cherry picked from commit 5f58169ba6fb18887b0e98aa390496df6fe8f242)
-
-diff --git a/src/History.h b/src/History.h
-index 6314ef9..dcd3819 100644
---- a/src/History.h
-+++ b/src/History.h
-@@ -83,7 +83,7 @@ private:
- //////////////////////////////////////////////////////////////////////
- class HistoryType;
- 
--class HistoryScroll
-+class KONSOLEPRIVATE_EXPORT HistoryScroll
- {
- public:
-     explicit HistoryScroll(HistoryType*);

-- 
konsole packaging