[SCM] kdesu packaging branch, master, updated. debian/5.14.0-1-7-ga0205c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdesu.git;a=commitdiff;h=685b7db

The following commit has been merged in the master branch:
commit 685b7dbb1eed90b666c3c7786d2aaadd374c7f2a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Oct 6 22:10:57 2015 +0200

    Drop upstream patch: upstream_kwarning_to_qwarning.diff
---
 debian/changelog                                  |  1 +
 debian/patches/series                             |  1 -
 debian/patches/upstream_kwarning_to_qwarning.diff | 23 -----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9cfeca..a2e687a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kdesu (5.15.0-1~) UNRELEASED; urgency=medium
 
   * Add upstream patch: upstream_kwarning_to_qwarning.diff
   * New upstream release (5.15.0).
+  * Drop upstream patch: upstream_kwarning_to_qwarning.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 05 Oct 2015 15:08:06 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 1406bbd..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_kwarning_to_qwarning.diff
diff --git a/debian/patches/upstream_kwarning_to_qwarning.diff b/debian/patches/upstream_kwarning_to_qwarning.diff
deleted file mode 100644
index 1990d3d..0000000
--- a/debian/patches/upstream_kwarning_to_qwarning.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 3d252cc2aa3fa3530483154a93a377bbd4372196
-Author: Pino Toscano <pino at kde.org>
-Date:   Fri Sep 18 23:25:48 2015 +0200
-
-    kWarning -> qWarning
-    
-    fix build when using the stub implementation of SocketSecurity
-
-diff --git a/src/kdesud/secure.cpp b/src/kdesud/secure.cpp
-index 22326a4..a36c051 100644
---- a/src/kdesud/secure.cpp
-+++ b/src/kdesud/secure.cpp
-@@ -87,8 +87,8 @@ SocketSecurity::SocketSecurity(int sockfd) : pid(-1), gid(-1), uid(-1)
-     static bool warned_him = false;
- 
-     if (!warned_him) {
--        kWarning() << "Using void socket security. Please add support for your" ;
--        kWarning() << "platform to src/kdesud/secure.cpp" ;
-+        qWarning() << "Using void socket security. Please add support for your" ;
-+        qWarning() << "platform to src/kdesud/secure.cpp" ;
-         warned_him = true;
-     }
- 

-- 
kdesu packaging