[SCM] kio-extras packaging branch, kubuntu_vivid_archive, updated. eb46744e3a80cb2030f4ac211f051e6e50a838fe

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kio-extras.git;a=commitdiff;h=d08d919

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d08d919ec30af851c0a8fca29e128fe063ea53bc
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Nov 21 20:01:12 2014 +0100

    drop upstream patches as they are upstream, duh
---
 debian/patches/series                      |  1 -
 debian/patches/upstream_CVE-2014-8600.diff | 20 --------------------
 2 files changed, 21 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 11263b6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_CVE-2014-8600.diff
diff --git a/debian/patches/upstream_CVE-2014-8600.diff b/debian/patches/upstream_CVE-2014-8600.diff
deleted file mode 100644
index c59189c..0000000
--- a/debian/patches/upstream_CVE-2014-8600.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/bookmarks/kio_bookmarks.cpp
-+++ b/bookmarks/kio_bookmarks.cpp
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- 
- #include <qregexp.h>
-+#include <qtextdocument.h>
- #include <qurlquery.h>
- 
- #include <kapplication.h>
-@@ -198,7 +199,7 @@
-     echoImage(regexp.cap(1), regexp.cap(2), QUrlQuery(url).queryItemValue("size"));
-   } else {
-     echoHead();
--    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
-+    echo("<p class=\"message\">" + i18n("Wrong request: %1", Qt::escape(url.toDisplayString())) + "</p>");
-   }
-   finished();
- }
-

-- 
kio-extras packaging