[SCM] KTorrent Debian packaging. branch, experimental, updated. debian/4.3.1-5-7-g4d5d5d6

Pino Toscano pino at moszumanska.debian.org
Sat Jul 2 22:37:25 UTC 2016 

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

The following commit has been merged in the experimental branch:
commit c0b925a0bfb41cbb15b1549e28f270303dcdcc78
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 3 00:34:43 2016 +0200

    update the patches
    
    - dont_link_with_kutils.patch: drop, obsolete
    - upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch:
      drop, backported from upstream
    - upstream_webinterface-rename-major-minor-to-major_version-min.patch:
      drop, backported from upstream
---
 debian/changelog                                   |  6 ++
 debian/patches/dont_link_with_kutils.patch         | 18 ------
 debian/patches/series                              |  3 -
 ...pport-x-scheme-handler-magnet-mimetype-an.patch | 29 ---------
 ...e-rename-major-minor-to-major_version-min.patch | 69 ----------------------
 5 files changed, 6 insertions(+), 119 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e6411f..9cd3343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,12 @@ ktorrent (5.0.1-0r1) UNRELEASED; urgency=medium
       libkf5notifyconfig-dev, libkf5plotting-dev, kross-dev, libkf5solid-dev,
       libkf5sonnet-dev, libkf5xmlgui-dev, libkf5webkit-dev, libphonon4qt5-dev,
       and libphonon4qt5experimental-dev
+  * Update the patches:
+    - dont_link_with_kutils.patch: drop, obsolete
+    - upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch:
+      drop, backported from upstream
+    - upstream_webinterface-rename-major-minor-to-major_version-min.patch:
+      drop, backported from upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 02 Jul 2016 23:36:56 +0200
 
diff --git a/debian/patches/dont_link_with_kutils.patch b/debian/patches/dont_link_with_kutils.patch
deleted file mode 100644
index fe74c58..0000000
--- a/debian/patches/dont_link_with_kutils.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Do not link deprecated kutils
-Forwarded: no
-Origin: vendor
-
-kutils is a dummy transitional library which we don't need to link with since
-KDE 4.5.
---- a/libktcore/CMakeLists.txt
-+++ b/libktcore/CMakeLists.txt
-@@ -56,7 +56,7 @@ kde4_add_ui_files(libktorrent_SRC ${libk
- kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
- kde4_add_library(ktcore SHARED ${libktorrent_SRC})
- 
--target_link_libraries(ktcore ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${LIBKTORRENT_LIBRARIES} ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
-+target_link_libraries(ktcore ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KCMUTILS_LIBS} ${LIBKTORRENT_LIBRARIES} ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
- set_target_properties(ktcore PROPERTIES VERSION 15.0.0 SOVERSION 15 )
- install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2ed1bcf..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-dont_link_with_kutils.patch
-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
deleted file mode 100644
index 37a69e8..0000000
--- a/debian/patches/upstream_Properly-support-x-scheme-handler-magnet-mimetype-an.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-
diff --git a/debian/patches/upstream_webinterface-rename-major-minor-to-major_version-min.patch b/debian/patches/upstream_webinterface-rename-major-minor-to-major_version-min.patch
deleted file mode 100644
index e0c0d64..0000000
--- a/debian/patches/upstream_webinterface-rename-major-minor-to-major_version-min.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e22c887b55ec5e83db959c3b98d448947c886cc0 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sun, 14 Feb 2016 16:19:23 +0100
-Subject: [PATCH] webinterface: rename major/minor to
- major_version/minor_version
-
-Avoid conflicts with major/minor defines provided by GNU headers.
----
- plugins/webinterface/httpresponseheader.cpp | 10 +++++-----
- plugins/webinterface/httpresponseheader.h   |  6 +++---
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/webinterface/httpresponseheader.cpp b/plugins/webinterface/httpresponseheader.cpp
-index 91d91fc..f7df1de 100644
---- a/plugins/webinterface/httpresponseheader.cpp
-+++ b/plugins/webinterface/httpresponseheader.cpp
-@@ -33,8 +33,8 @@ namespace kt
- 		return QString::null;
- 	}
- 	
--	HttpResponseHeader::HttpResponseHeader(int response_code,int major,int minor) 
--		: response_code(response_code),major(major),minor(minor)
-+	HttpResponseHeader::HttpResponseHeader(int response_code,int major_version,int minor_version) 
-+		: response_code(response_code),major_version(major_version),minor_version(minor_version)
- 	{
- 	}
- 	
-@@ -42,8 +42,8 @@ namespace kt
- 	{
- 		response_code = hdr.response_code;
- 		fields = hdr.fields;
--		major = hdr.major;
--		minor = hdr.minor;
-+		major_version = hdr.major_version;
-+		minor_version = hdr.minor_version;
- 	}
- 	
- 	HttpResponseHeader::~HttpResponseHeader()
-@@ -63,7 +63,7 @@ namespace kt
- 	QString HttpResponseHeader::toString() const
- 	{
- 		QString str;
--		str += QString("HTTP/%1.%2 %3 %4
").arg(major).arg(minor).arg(response_code).arg(ResponseCodeToString(response_code));
-+		str += QString("HTTP/%1.%2 %3 %4
").arg(major_version).arg(minor_version).arg(response_code).arg(ResponseCodeToString(response_code));
- 		
- 		QMap<QString,QString>::const_iterator itr = fields.begin();
- 		while (itr != fields.end())
-diff --git a/plugins/webinterface/httpresponseheader.h b/plugins/webinterface/httpresponseheader.h
-index 7e0e1d0..a428d31 100644
---- a/plugins/webinterface/httpresponseheader.h
-+++ b/plugins/webinterface/httpresponseheader.h
-@@ -34,11 +34,11 @@ namespace kt
- 	{
- 		int response_code;
- 		QMap<QString,QString> fields;
--		int major;
--		int minor;
-+		int major_version;
-+		int minor_version;
- 		
- 	public:
--		HttpResponseHeader(int response_code,int major = 1,int minor = 1);
-+		HttpResponseHeader(int response_code,int major_version = 1,int minor_version = 1);
- 		HttpResponseHeader(const HttpResponseHeader & hdr);
- 		virtual ~HttpResponseHeader();
- 		
--- 
-2.7.0
-

-- 
KTorrent Debian packaging.

More information about the pkg-kde-commits mailing list