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

Modestas Vainius modax at alioth.debian.org
Tue Nov 5 20:18:54 UTC 2013


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

The following commit has been merged in the master branch:
commit 3c55a275bd39cfef9b8d20e943df80ec7d66cde3
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Nov 5 20:49:29 2013 +0200

    Do not link with deprecated kutils library.
    
    (Closes: #717010)
    Patch: dont_link_with_kutils.patch
---
 debian/changelog                           |    2 ++
 debian/patches/dont_link_with_kutils.patch |   18 ++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 80c557c..aaf1482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ktorrent (4.3.1-2) UNRELEASED; 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
 
  -- Modestas Vainius <modax at debian.org>  Tue, 05 Nov 2013 20:35:44 +0200
 
diff --git a/debian/patches/dont_link_with_kutils.patch b/debian/patches/dont_link_with_kutils.patch
new file mode 100644
index 0000000..fe74c58
--- /dev/null
+++ b/debian/patches/dont_link_with_kutils.patch
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000..9ee7fb1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont_link_with_kutils.patch

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list