[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.3.1-2-4-gfcd21be

Scott Kitterman kitterman at moszumanska.debian.org
Mon Aug 31 17:46:07 UTC 2015 

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

The following commit has been merged in the master branch:
commit fcd21bee9ec08ee101a921a02f5e35fd7f7ab602
Author: Scott Kitterman <scott at kitterman.com>
Date:   Mon Aug 31 13:44:30 2015 -0400

    * Team upload.
    * Remove build-dep on kde-workspace, soon to be removed from the archive
    * Remove shutdown plugin from .install file which required kde-workspace
    * Add kubuntu_magnet-mimetype.diff to open magnet links
    * Remove obsolete build-dep on nepomuk-core-dev
    * Remove plasma-widget-ktorrent package as it is not compatible with
      Plasma 5
    * Remove obsolete ktorrent suggests
    * Remove ancient build-conflicts
    * Backport Ubuntu changes to Debian
    * Add build-depends on libsoprano-dev
    * Bump standards version to 3.9.6 without further change
---
 debian/changelog                            | 21 +++++++++++++++++++++
 debian/control                              | 24 +++---------------------
 debian/ktorrent.install                     |  2 --
 debian/patches/kubuntu_magnet-mimetype.diff | 13 +++++++++++++
 debian/patches/series                       |  1 +
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25321e7..5556c90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ktorrent (4.3.1-3) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Jonathan Riddell ]
+  * Remove build-dep on kde-workspace, soon to be removed from the archive
+  * Remove shutdown plugin from .install file which required kde-workspace
+  * Add kubuntu_magnet-mimetype.diff to open magnet links
+  * Remove obsolete build-dep on nepomuk-core-dev
+
+  [ Scott Kitterman ]
+  * Remove plasma-widget-ktorrent package as it is not compatible with
+    Plasma 5
+  * Remove obsolete ktorrent suggests
+  * Remove ancient build-conflicts
+  * Backport Ubuntu changes to Debian
+  * Add build-depends on libsoprano-dev
+  * Bump standards version to 3.9.6 without further change
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 31 Aug 2015 12:48:22 -0400
+
 ktorrent (4.3.1-2) unstable; urgency=low
 
   * Do not build tests like before KDE 4.10. Fixes FTBFS (Closes: #722628)
diff --git a/debian/control b/debian/control
index c7948b1..c9e35a4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,9 @@ Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>
 Build-Depends: cmake (>= 2.6.2), debhelper (>= 9~), pkg-kde-tools (>= 0.5),
  libqt4-dev (>= 4:4.7), kdelibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.3),
- kdepimlibs5-dev (>= 4:4.7), nepomuk-core-dev | kdepimlibs5-dev (<< 4:4.9),
- libboost-dev, libqtwebkit-dev, kdebase-workspace-dev (>= 4:4.7),
+ kdepimlibs5-dev (>= 4:4.7), libboost-dev, libqtwebkit-dev, libsoprano-dev,
  libktorrent-dev (>= 1.3.1), libtag1-dev, libgeoip-dev, libx11-dev
-Build-Conflicts: kdebase-workspace-dev (<< 4:4.6)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://ktorrent.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/ktorrent.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/ktorrent.git;a=summary
@@ -18,7 +16,6 @@ Package: ktorrent
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ktorrent-data (= ${source:Version}),
  libktorrent-l10n
-Suggests: plasma-widget-ktorrent (= ${binary:Version}), krosspython
 Description: BitTorrent client based on the KDE platform
  This package contains KTorrent, a BitTorrent peer-to-peer network client, that
  is based on the KDE platform. Obviously, KTorrent supports such basic features
@@ -27,7 +24,7 @@ Description: BitTorrent client based on the KDE platform
  KTorrent a good choice for everyone. Some features are available as plugins
  hence you should make sure you have the ones you need enabled.
    - Support for HTTP and UDP trackers, trackerless DHT (mainline) and webseeds.
-   - Alternative UI support including Web interface and Plasma widget.
+   - Alternative UI support including Web interface.
    - Torrent grouping, speed capping, various download prioritization
      capabilities on both torrent and file level as well as bandwidth
      scheduling.
@@ -55,21 +52,6 @@ Description: KTorrent data and other architecture independent files
  a BitTorrent peer-to-peer network client. Unless you have ktorrent package
  installed, you probably won't find this package useful.
 
-Package: plasma-widget-ktorrent
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ktorrent (= ${binary:Version})
-Replaces: ktorrent (<< 3.2~beta1+svn898132), plasma-applet-ktorrent
-Breaks: ktorrent (<< 3.2~beta1+svn898132)
-Conflicts: plasma-applet-ktorrent
-Description: KTorrent Plasma widget
- This package provides the KTorrent Plasma widget which features display of
- the current upload and download speeds and status of any single torrent which
- KTorrent knows about. Please note that KTorrent must be running for this
- widget to be able to display any up-to-date information.
- .
- This package contains KTorrent Plasma data engine as well.
-
 Package: ktorrent-dbg
 Section: debug
 Architecture: any
diff --git a/debian/ktorrent.install b/debian/ktorrent.install
index a64f910..1c78ad7 100644
--- a/debian/ktorrent.install
+++ b/debian/ktorrent.install
@@ -11,7 +11,6 @@ usr/lib/kde4/ktmediaplayerplugin.so
 usr/lib/kde4/ktscanfolderplugin.so
 usr/lib/kde4/ktscriptingplugin.so
 usr/lib/kde4/ktsearchplugin.so
-usr/lib/kde4/ktshutdownplugin.so
 usr/lib/kde4/ktstatsplugin.so
 usr/lib/kde4/ktsyndicationplugin.so
 usr/lib/kde4/ktupnpplugin.so
@@ -29,7 +28,6 @@ usr/share/kde4/services/ktmediaplayerplugin.desktop
 usr/share/kde4/services/ktscanfolderplugin.desktop
 usr/share/kde4/services/ktscriptingplugin.desktop
 usr/share/kde4/services/ktsearchplugin.desktop
-usr/share/kde4/services/ktshutdownplugin.desktop
 usr/share/kde4/services/ktstatsplugin.desktop
 usr/share/kde4/services/ktsyndicationplugin.desktop
 usr/share/kde4/services/ktupnpplugin.desktop
diff --git a/debian/patches/kubuntu_magnet-mimetype.diff b/debian/patches/kubuntu_magnet-mimetype.diff
new file mode 100644
index 0000000..8209518
--- /dev/null
+++ b/debian/patches/kubuntu_magnet-mimetype.diff
@@ -0,0 +1,13 @@
+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 9ee7fb1..c26a73a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dont_link_with_kutils.patch
+kubuntu_magnet-mimetype.diff

-- 
KTorrent Debian packaging.

More information about the pkg-kde-commits mailing list