rev 12332 - in kde-extras/ktorrent/trunk/debian: . patches patches/libbtcore

[Modestas Vainius]

Author: modax-guest
Date: 2008-10-01 16:45:56 +0000 (Wed, 01 Oct 2008)
New Revision: 12332

Modified:
   kde-extras/ktorrent/trunk/debian/changelog
   kde-extras/ktorrent/trunk/debian/control
   kde-extras/ktorrent/trunk/debian/not-installed
   kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff
   kde-extras/ktorrent/trunk/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
Log:
ktorrent 3.1.3

Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog	2008-10-01 12:18:31 UTC (rev 12331)
+++ kde-extras/ktorrent/trunk/debian/changelog	2008-10-01 16:45:56 UTC (rev 12332)
@@ -1,3 +1,21 @@
+ktorrent (3.1.3+dfsg.2-1) unstable; urgency=low
+
+  * No real code changes. Upstream tarball includes the patch below.
+  * Remove 01_webinterface_httpserver_time_h.diff - merged upstream.
+  * Build conflict with Qt 4.4.2-2 as it has broken shlibs.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 01 Oct 2008 19:38:25 +0300
+
+ktorrent (3.1.3+dfsg.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update patches (library minor version bumps).
+  * Update debian/not-installed.
+  * Add patch (01_webinterface_httpserver_time_h.diff) to fix upstream FTBFS
+    in plugins/webinterface/httpserver.cpp - missing <time.h> include.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Tue, 30 Sep 2008 00:31:08 +0300
+
 ktorrent (3.1.2+dfsg.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: kde-extras/ktorrent/trunk/debian/control
===================================================================
--- kde-extras/ktorrent/trunk/debian/control	2008-10-01 12:18:31 UTC (rev 12331)
+++ kde-extras/ktorrent/trunk/debian/control	2008-10-01 16:45:56 UTC (rev 12332)
@@ -7,6 +7,7 @@
 Build-Depends: cmake, debhelper (>= 6.0.0), cdbs (>= 0.4.51), quilt,
  kdelibs5-dev (>= 4:4.0.84+svn828328), libstreamanalyzer-dev, pkg-config, libgeoip-dev,
  libgmp3-dev, libqca2-dev
+Build-Conflicts: libqt4-dev (= 4.4.2-2)
 Standards-Version: 3.7.3.0
 Homepage: http://ktorrent.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/ktorrent/trunk/

Modified: kde-extras/ktorrent/trunk/debian/not-installed
===================================================================
--- kde-extras/ktorrent/trunk/debian/not-installed	2008-10-01 12:18:31 UTC (rev 12331)
+++ kde-extras/ktorrent/trunk/debian/not-installed	2008-10-01 16:45:56 UTC (rev 12332)
@@ -1,3 +1,8 @@
 # Development stuff
 usr/lib/libktcore.so
 usr/lib/libktupnp.so
+
+# BTCore library development files
+usr/include/libbtcore/*
+usr/lib/libbtcore.so
+usr/share/kde4/apps/cmake/modules/FindBTCore.cmake

Modified: kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff	2008-10-01 12:18:31 UTC (rev 12331)
+++ kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff	2008-10-01 16:45:56 UTC (rev 12332)
@@ -6,7 +6,7 @@
  
 -target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} btcore ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
 +target_link_libraries(ktcore btcore ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${QT_QTNETWORK_LIBRARY})
- set_target_properties(ktcore PROPERTIES VERSION 6.2.0 SOVERSION 6 )
+ set_target_properties(ktcore PROPERTIES VERSION 6.3.0 SOVERSION 6 )
  install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
 --- a/libktupnp/CMakeLists.txt

Modified: kde-extras/ktorrent/trunk/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	2008-10-01 12:18:31 UTC (rev 12331)
+++ kde-extras/ktorrent/trunk/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	2008-10-01 16:45:56 UTC (rev 12332)
@@ -4,8 +4,8 @@
  if(WIN32)
  target_link_libraries(btcore ws2_32)
  endif(WIN32)
--set_target_properties(btcore PROPERTIES VERSION 7.1.0 SOVERSION 7 )
-+set_target_properties(btcore PROPERTIES VERSION 7p.1.0 SOVERSION 7p )
+-set_target_properties(btcore PROPERTIES VERSION 7.2.0 SOVERSION 7 )
++set_target_properties(btcore PROPERTIES VERSION 7p.2.0 SOVERSION 7p )
  install(TARGETS btcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
  set(net_HDR