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

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 525e866bfca579fd2f52071a34988f9555f72cca
Merge: 5a5123a700c6c46ef1d8c7c5cef7b3b9b031394f 0dc303e803aee2068df8dc491a5e1be5e4075128
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Nov 5 22:18:47 2013 +0200

    Merge branch 'master' of git://git.debian.org/git/pkg-kde/kde-extras/ktorrent
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog |    7 +++++++
 debian/control   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 25321e7,7cf052c..69dfaf9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,10 +1,25 @@@
 -ktorrent (4.3.1-2) UNRELEASED; urgency=low
++ktorrent (4.3.1-3) UNRELEASED; urgency=low
+ 
+   * Build-depend on kde-workspace-dev instead of the transitional package
+     kdebase-workspace-dev.
+ 
+  -- Felix Geyer <fgeyer at debian.org>  Thu, 16 May 2013 22:19:56 +0200
+ 
 +ktorrent (4.3.1-2) unstable; urgency=low
 +
 +  * Do not build tests like before KDE 4.10. Fixes FTBFS (Closes: #722628)
 +  * Do not link with deprecated kutils library. (Closes: #717010)
 +    Patch: dont_link_with_kutils.patch
 +  * Build with hardening flags. (Closes: #663524)
 +  * Bump Standards-Version to 3.9.5: no further changes needed.
 +  * Update Vcs URLs to canonical ones.
 +  * Upload to unstable. (Closes: #721049)
 +  * Disable KIO Magnet. It is considered obsolete (and might be buggy).
 +  * Require nepomuk-core-dev for KDE 4.9 or above (requirement of
 +    kdepimlibs).
 +
 + -- Modestas Vainius <modax at debian.org>  Tue, 05 Nov 2013 21:27:06 +0200
 +
  ktorrent (4.3.1-1) experimental; urgency=low
  
    * New upstream release.
diff --cc debian/control
index c7948b1,f6a50f9..2ddd592
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,14 +5,14 @@@ Maintainer: Debian KDE Extras Team <pkg
  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), libboost-dev, libqtwebkit-dev,
 - kde-workspace-dev (>= 4:4.7), libktorrent-dev (>= 1.3.1),
 - libtag1-dev, libgeoip-dev, libx11-dev
 + kdepimlibs5-dev (>= 4:4.7), nepomuk-core-dev | kdepimlibs5-dev (<< 4:4.9),
-  libboost-dev, libqtwebkit-dev, kdebase-workspace-dev (>= 4:4.7),
++ libboost-dev, libqtwebkit-dev, kde-workspace-dev (>= 4:4.7),
 + libktorrent-dev (>= 1.3.1), libtag1-dev, libgeoip-dev, libx11-dev
  Build-Conflicts: kdebase-workspace-dev (<< 4:4.6)
 -Standards-Version: 3.9.4
 +Standards-Version: 3.9.5
  Homepage: http://ktorrent.org/
 -Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/ktorrent.git
 -Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/ktorrent.git;a=summary
 +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
  
  Package: ktorrent
  Architecture: any

-- 
KTorrent Debian packaging.