rev 10673 - in kde-extras/ktorrent/branches/experimental/debian: . patches patches/libbtcore

Modestas Vainius modax-guest at alioth.debian.org
Thu May 22 09:27:55 UTC 2008


Author: modax-guest
Date: 2008-05-22 09:27:54 +0000 (Thu, 22 May 2008)
New Revision: 10673

Added:
   kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/
   kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/01_libbtcore_export.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/97_fix_link_interface_libraries.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
Modified:
   kde-extras/ktorrent/branches/experimental/debian/changelog
   kde-extras/ktorrent/branches/experimental/debian/control
   kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
   kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/series
Log:
3.1~beta1+dfsg.1-1: libbtcore is back to ktorrent package for now

Modified: kde-extras/ktorrent/branches/experimental/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/changelog	2008-05-22 09:03:50 UTC (rev 10672)
+++ kde-extras/ktorrent/branches/experimental/debian/changelog	2008-05-22 09:27:54 UTC (rev 10673)
@@ -1,3 +1,20 @@
+ktorrent (3.1~beta2+dfsg.1-1) experimental; urgency=low
+
+  * New upstream development release.
+  * Embed libbtcore back to ktorrent package. I'm tired of continuous soname
+    bumping which results in ktorrent and/or libbtcore sitting in NEW on
+    almost each new upstream release. libbtcore will be split of again for
+    final 3.1 release.
+    - Add 99_libbtcore_scramble_soname.diff patch to scamble libbtcore soname.
+      libbtcore shipped in this package should be considered private.
+    - Do not install libbtcore development files.
+    - Remove build-dependency on libbtcore4-dev and libbtcore-dbg from
+      ktorrent-dbg recommends.
+    - Add libbtcore build-dependences: libgmp3-dev and libqca2-dev.
+  * Update install files (due to soname bumps mainly)
+
+ -- Modestas Vainius <modestas at vainius.eu>  Thu, 22 May 2008 03:31:32 +0300
+
 ktorrent (3.1~beta1+dfsg.1-1) experimental; urgency=low
 
   [ Modestas Vainius ]

Modified: kde-extras/ktorrent/branches/experimental/debian/control
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/control	2008-05-22 09:03:50 UTC (rev 10672)
+++ kde-extras/ktorrent/branches/experimental/debian/control	2008-05-22 09:27:54 UTC (rev 10673)
@@ -5,8 +5,8 @@
 Uploaders: Modestas Vainius <modestas at vainius.eu>
 DM-Upload-Allowed: yes
 Build-Depends: cmake, debhelper (>= 6.0.0), cdbs (>= 0.4.51), quilt,
- kdelibs5-dev (>= 4:4.0.72), libphonon-dev (>= 4:4.0.72), libstreamanalyzer-dev, pkg-config,
- libbtcore4-dev (>= 3.1~beta1), libgeoip-dev
+ kdelibs5-dev (>= 4:4.0.72), libphonon-dev (>= 4:4.0.72), libstreamanalyzer-dev, pkg-config, libgeoip-dev,
+ libgmp3-dev, libqca2-dev
 Standards-Version: 3.7.3.0
 Homepage: http://ktorrent.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/ktorrent/branches/experimental/
@@ -55,7 +55,7 @@
 Package: ktorrent-dbg
 Architecture: any
 Priority: extra
-Depends: ktorrent (= ${binary:Version}), libbtcore-dbg
+Depends: ktorrent (= ${binary:Version})
 Recommends: kdelibs5-dbg
 Description: KTorrent debugging symbols
  This package contains debugging symbols for KTorrent. When KTorrent crashes,

Modified: kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-05-22 09:03:50 UTC (rev 10672)
+++ kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-05-22 09:27:54 UTC (rev 10673)
@@ -10,10 +10,12 @@
 debian/tmp/usr/lib/kde4/ktstatsplugin.so
 debian/tmp/usr/lib/kde4/ktupnpplugin.so
 debian/tmp/usr/lib/kde4/ktwebinterfaceplugin.so
-debian/tmp/usr/lib/libktcore.so.4
-debian/tmp/usr/lib/libktcore.so.4.0.0
-debian/tmp/usr/lib/libktupnp.so.1
-debian/tmp/usr/lib/libktupnp.so.1.0.0
+debian/tmp/usr/lib/libbtcore.so.5p
+debian/tmp/usr/lib/libbtcore.so.5p.0.0
+debian/tmp/usr/lib/libktcore.so.5
+debian/tmp/usr/lib/libktcore.so.5.0.0
+debian/tmp/usr/lib/libktupnp.so.2
+debian/tmp/usr/lib/libktupnp.so.2.0.0
 debian/tmp/usr/share/applications/kde4/ktorrent.desktop
 debian/tmp/usr/share/icons/hicolor/*
 debian/tmp/usr/share/kde4/apps/ktorrent/*

Modified: kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff	2008-05-22 09:03:50 UTC (rev 10672)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff	2008-05-22 09:27:54 UTC (rev 10673)
@@ -9,7 +9,7 @@
  find_package(Strigi REQUIRED)
  
  # set some default settings
-@@ -10,42 +8,49 @@
+@@ -10,42 +8,50 @@
  
  # make some more macros available
  include (MacroLibrary)
@@ -22,11 +22,11 @@
 -
  
 +# Checks for external BTCore
-+if (EXISTS libbtcore)
++if (EXISTS ${KTORRENT_SOURCE_DIR}/libbtcore)
 +  option(USE_EXTERNAL_BTCORE "Whether to link KTorrent against BTCore library installed on the system" false)
-+else (EXISTS libbtcore)
++else (EXISTS ${KTORRENT_SOURCE_DIR}/libbtcore)
 +  set(USE_EXTERNAL_BTCORE true)
-+endif (EXISTS libbtcore)
++endif (EXISTS ${KTORRENT_SOURCE_DIR}/libbtcore)
 +
 +if (USE_EXTERNAL_BTCORE)
 +  find_package(BTCore REQUIRED)
@@ -63,7 +63,7 @@
 +endif (NOT USE_EXTERNAL_BTCORE)
  
  include_directories( ${KDE4_INCLUDES} 
--   ${KTORRENT_BINARY_DIR}
+    ${KTORRENT_BINARY_DIR}
 +   ${BTCORE_INCLUDE_DIR}
     ${KTORRENT_BINARY_DIR}/libktcore
     ${KTORRENT_SOURCE_DIR}/libktcore
@@ -96,6 +96,6 @@
  
 -target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} btcore ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
 +target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${BTCORE_LIBRARIES} ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
- set_target_properties(ktcore PROPERTIES VERSION 4.0.0 SOVERSION 4 )
+ set_target_properties(ktcore PROPERTIES VERSION 5.0.0 SOVERSION 5 )
  install(TARGETS ktcore  DESTINATION ${LIB_INSTALL_DIR} )
  

Modified: kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff	2008-05-22 09:03:50 UTC (rev 10672)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff	2008-05-22 09:27:54 UTC (rev 10673)
@@ -18,7 +18,7 @@
  
  namespace kt
  {
-@@ -533,7 +535,9 @@ namespace kt
+@@ -542,7 +544,9 @@ namespace kt
  		CurrentStats stats = core->getStats();
  		status_bar->updateSpeed(stats.upload_speed,stats.download_speed);
  		status_bar->updateTransfer(stats.bytes_uploaded,stats.bytes_downloaded);

Modified: kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	2008-05-22 09:03:50 UTC (rev 10672)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	2008-05-22 09:27:54 UTC (rev 10673)
@@ -6,7 +6,7 @@
  
 -target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${BTCORE_LIBRARIES} ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
 +target_link_libraries(ktcore ${BTCORE_LIBRARIES} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${QT_QTNETWORK_LIBRARY})
- set_target_properties(ktcore PROPERTIES VERSION 4.0.0 SOVERSION 4 )
+ set_target_properties(ktcore PROPERTIES VERSION 5.0.0 SOVERSION 5 )
  install(TARGETS ktcore  DESTINATION ${LIB_INSTALL_DIR} )
  
 --- ktorrent-3.1~beta1+dfsg.1.orig/libktupnp/CMakeLists.txt
@@ -17,6 +17,6 @@
  
 -target_link_libraries(ktupnp ktcore)
 +target_link_libraries(ktupnp ktcore ${QT_QTXML_LIBRARY})
- set_target_properties(ktupnp PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+ set_target_properties(ktupnp PROPERTIES VERSION 2.0.0 SOVERSION 2 )
  install(TARGETS ktupnp  DESTINATION ${LIB_INSTALL_DIR} )
  

Added: kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/01_libbtcore_export.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/01_libbtcore_export.diff	                        (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/01_libbtcore_export.diff	2008-05-22 09:27:54 UTC (rev 10673)
@@ -0,0 +1,115 @@
+--- libbtcore/CMakeLists.txt
++++ libbtcore/CMakeLists.txt
+@@ -1,3 +1,36 @@
++project(libbtcore)
++
++find_package(KDE4 REQUIRED)
++find_package(GMP REQUIRED)
++find_package(QCA2 REQUIRED)
++
++# set some default settings
++include(KDE4Defaults)
++
++# make some more macros available
++include (MacroLibrary)
++#
++# checks for functions and stuff
++#
++include(CheckIncludeFiles)
++include(CheckFunctionExists)
++include(CheckTypeSize) #XFS
++
++add_definitions( ${KDE4_ENABLE_EXCEPTIONS} ${KDE4_DEFINITIONS} )
++
++include_directories(
++  ${KDE4_INCLUDES}
++  ${QCA2_INCLUDE_DIR}
++  ${GMP_INCLUDE_DIR}
++)
++
++option(ENABLE_DHT_SUPPORT "Whether to build BTCore library with DHT support or not" true)
++if (ENABLE_DHT_SUPPORT)
++  message(STATUS "Building BTCore library with DHT support (-DENABLE_DHT_SUPPORT=false to disable)")
++  add_definitions(-DENABLE_DHT_SUPPORT)
++endif (ENABLE_DHT_SUPPORT)
++
++
+ #XFS prealloc
+ CHECK_INCLUDE_FILES(xfs/xfs.h HAVE_XFS_XFS_H)
+ IF(HAVE_XFS_XFS_H)
+@@ -24,7 +57,7 @@
+ check_function_exists(statvfs HAVE_STATVFS)
+ check_function_exists(statvfs64 HAVE_STATVFS64)
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-btcore.h.cmake ${CMAKE_BINARY_DIR}/config-btcore.h)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-btcore.h.cmake ${libbtcore_BINARY_DIR}/config-btcore.h)
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+@@ -272,11 +308,13 @@
+ 	./download/piece.h
+ 	./download/packet.h
+ 	./download/chunkselector.h
++	./download/webseed.h
+ )
+ 
+ set (btcore_HDR 
+ 	btcore_export.h
+ 	btversion.h
++	${libbtcore_BINARY_DIR}/config-btcore.h
+ )
+ 	
+ set (bcodec_HDR
+@@ -364,7 +401,13 @@
+ install(FILES ${util_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/util )
+ install(FILES ${peer_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/peer )
+ install(FILES ${datachecker_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/datachecker )
+-install(FILES ${dht_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/dht )
+ install(FILES ${migrate_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/migrate )
+ install(FILES ${download_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/download )
+ install(FILES ${btcore_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore )
++
++if (ENABLE_DHT_SUPPORT)
++  install(FILES ${dht_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/dht )
++endif (ENABLE_DHT_SUPPORT)
++
++# Install cmake module
++add_subdirectory(cmake)
+--- libbtcore/cmake/modules/FindBTCore.cmake
++++ libbtcore/cmake/modules/FindBTCore.cmake
+@@ -4,6 +4,7 @@
+ #  BTCORE_FOUND - system has BTCore
+ #  BTCORE_INCLUDE_DIR - the BTCore include directory
+ #  BTCORE_LIBRARIES - Link these to use BTCore
++#  BTCORE_DHT_SUPPORTED - whether BTCore was compiled with DHT support
+ 
+ # Copyright (c) 2007 Joris Guisson <joris.guisson at gmail.com>
+ # Copyright (c) 2007 Charles Connell <charles at connells.org> (This was based upon FindKopete.cmake)
+@@ -64,8 +65,16 @@
+   endif(MSVC)
+ 
+   if(BTCORE_FOUND)
++    # Check if DHT support is enabled
++    if (EXISTS "${BTCORE_INCLUDE_DIR}/dht/dht.h")
++      set(BTCORE_DHT_SUPPORTED TRUE CACHE BOOL "BTCore without DHT support")
++      set(_btcore_with_dht "with")
++    else (EXISTS "${BTCORE_INCLUDE_DIR}/dht/dht.h")
++      set(BTCORE_DHT_SUPPORTED FALSE CACHE BOOL "BTCore with DHT support")
++      set(_btcore_with_dht "without")
++    endif (EXISTS "${BTCORE_INCLUDE_DIR}/dht/dht.h")
+     if(NOT BTCORE_FIND_QUIETLY)
+-      message(STATUS "Found BTCore: ${BTCORE_LIBRARIES} ")
++      message(STATUS "Found BTCore: ${BTCORE_LIBRARIES} ${_btcore_with_dht} DHT support")
+     endif(NOT BTCORE_FIND_QUIETLY)
+   else(BTCORE_FOUND)
+     if(BTCORE_FIND_REQUIRED)
+--- libbtcore/config-btcore.h.cmake
++++ libbtcore/config-btcore.h.cmake
+@@ -1,5 +1,5 @@
+-#ifndef CONFIG_KTORRENT_H
+-#define CONFIG_KTORRENT_H
++#ifndef CONFIG_CONFIG_BTCORE_H
++#define CONFIG_CONFIG_BTCORE_H
+ 
+ #cmakedefine HAVE_FOPEN64 1
+ #cmakedefine HAVE_FSEEKO64 1

Added: kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/97_fix_link_interface_libraries.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/97_fix_link_interface_libraries.diff	                        (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/97_fix_link_interface_libraries.diff	2008-05-22 09:27:54 UTC (rev 10673)
@@ -0,0 +1,11 @@
+--- libbtcore/CMakeLists.txt
++++ libbtcore/CMakeLists.txt
+@@ -214,7 +214,7 @@
+ kde4_add_library(btcore SHARED ${libbtcore_SRC})
+ 
+ 
+-target_link_libraries(btcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${GMP_LIBRARIES} ${QCA2_LIBRARIES})
++target_link_libraries(btcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${GMP_LIBRARIES} ${QCA2_LIBRARIES})
+ if(WIN32)
+ target_link_libraries(btcore ws2_32)
+ endif(WIN32)

Added: kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	                        (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	2008-05-22 09:27:54 UTC (rev 10673)
@@ -0,0 +1,11 @@
+--- libbtcore/CMakeLists.txt
++++ libbtcore/CMakeLists.txt
+@@ -218,7 +218,7 @@
+ if(WIN32)
+ target_link_libraries(btcore ws2_32)
+ endif(WIN32)
+-set_target_properties(btcore PROPERTIES VERSION 5.0.0 SOVERSION 5 )
++set_target_properties(btcore PROPERTIES VERSION 5p.0.0 SOVERSION 5p )
+ install(TARGETS btcore  DESTINATION ${LIB_INSTALL_DIR} )
+ 
+ set(net_HDR  

Modified: kde-extras/ktorrent/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/series	2008-05-22 09:03:50 UTC (rev 10672)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/series	2008-05-22 09:27:54 UTC (rev 10673)
@@ -1,3 +1,6 @@
 01_support_external_libbtcore.diff
 02_no_dht_without_dht_headers.diff
 97_fix_target_link_libraries.diff
+libbtcore/01_libbtcore_export.diff -p0
+libbtcore/97_fix_link_interface_libraries.diff -p0
+libbtcore/99_libbtcore_scramble_soname.diff -p0




More information about the pkg-kde-commits mailing list