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

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit ca5004225808ff92286a23623efb188076c611a4
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 12 18:53:48 2014 +0100

    Remove upstream_CVE-2014-8600.diff
---
 debian/changelog                           |  1 +
 debian/patches/series                      |  1 -
 debian/patches/upstream_CVE-2014-8600.diff | 20 --------------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 454809b..44429a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kio-extras (4:5.1.2-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Remove upstream_CVE-2014-8600.diff
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 12 Dec 2014 14:36:08 +0100
 
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