[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.3.1-3-12-g9ded60b

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/ktorrent.git;a=commitdiff;h=9ded60b

The following commit has been merged in the master branch:
commit 9ded60bda3ec456c8319cfa7479b2315653dc1c6
Author: Pino Toscano <pino at debian.org>
Date:   Sun Feb 14 17:27:23 2016 +0100

    kubuntu_magnet-mimetype.diff: replace with upstream version
---
 debian/changelog                                   |  3 +++
 debian/patches/kubuntu_magnet-mimetype.diff        | 13 ----------
 debian/patches/series                              |  1 +
 ...pport-x-scheme-handler-magnet-mimetype-an.patch | 29 ++++++++++++++++++++++
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12c4848..e13e3d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ ktorrent (4.3.1-4) UNRELEASED; urgency=medium
   * Remove manual CPPFLAGS handling, no more needed in debhelper compat 9.
   * Remove extra libsoprano-dev build dependency, which was added as workaround
     for a bug in kdelibs5-dev.
+  * Replace kubuntu_magnet-mimetype.diff with part of the upstream commit
+    f090d11e8837d944dedb40f873713abe4e15d4b4; patch
+    upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 14 Feb 2016 15:11:00 +0100
 
diff --git a/debian/patches/kubuntu_magnet-mimetype.diff b/debian/patches/kubuntu_magnet-mimetype.diff
deleted file mode 100644
index 8209518..0000000
--- a/debian/patches/kubuntu_magnet-mimetype.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ktorrent-4.3.1/ktorrent/ktorrent.desktop
-===================================================================
---- ktorrent-4.3.1.orig/ktorrent/ktorrent.desktop	2013-01-14 17:12:24.000000000 +0000
-+++ ktorrent-4.3.1/ktorrent/ktorrent.desktop	2014-03-04 19:02:40.209018100 +0000
-@@ -118,7 +118,7 @@
- Icon=ktorrent
- Type=Application
- X-DocPath=ktorrent/index.html
--MimeType=application/x-bittorrent;application/x-torrent;
-+MimeType=application/x-bittorrent;application/x-torrent;x-scheme-handler/magnet;
- X-DBUS-StartupType=Unique
- X-DBUS-ServiceName=org.ktorrent.ktorrent
- Comment=A BitTorrent program for KDE
diff --git a/debian/patches/series b/debian/patches/series
index c7a56c6..956c5b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 dont_link_with_kutils.patch
 kubuntu_magnet-mimetype.diff
+upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch
 upstream_webinterface-rename-major-minor-to-major_version-min.patch
diff --git a/debian/patches/upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch b/debian/patches/upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch
new file mode 100644
index 0000000..37a69e8
--- /dev/null
+++ b/debian/patches/upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch
@@ -0,0 +1,29 @@
+From f090d11e8837d944dedb40f873713abe4e15d4b4 Mon Sep 17 00:00:00 2001
+From: Joris Guisson <joris.guisson at gmail.com>
+Date: Sat, 8 Nov 2014 12:35:09 +0100
+Subject: [PATCH] Properly support x-scheme-handler/magnet mimetype, and drop
+ old hard-coded magnet.protocol.
+
+Patch from Rex Dieter
+
+Review: 108648
+---
+ ktorrent/ktorrent.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ktorrent/ktorrent.desktop b/ktorrent/ktorrent.desktop
+index d326f63..dff843f 100755
+--- a/ktorrent/ktorrent.desktop
++++ b/ktorrent/ktorrent.desktop
+@@ -119,7 +119,7 @@ Exec=ktorrent %i -caption %c %u
+ Icon=ktorrent
+ Type=Application
+ X-DocPath=ktorrent/index.html
+-MimeType=application/x-bittorrent;application/x-torrent;
++MimeType=application/x-bittorrent;application/x-torrent;x-scheme-handler/magnet;
+ X-DBUS-StartupType=Unique
+ X-DBUS-ServiceName=org.ktorrent.ktorrent
+ Comment=A BitTorrent program for KDE
+-- 
+2.7.0
+

-- 
KTorrent Debian packaging.