rev 10453 - in kde-extras/ktorrent/libbtcore/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sat May 3 11:52:10 UTC 2008
Author: modax-guest
Date: 2008-05-03 11:52:10 +0000 (Sat, 03 May 2008)
New Revision: 10453
Modified:
kde-extras/ktorrent/libbtcore/debian/changelog
kde-extras/ktorrent/libbtcore/debian/control
kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff
Log:
libbtcore 3.1~beta1-1.
Modified: kde-extras/ktorrent/libbtcore/debian/changelog
===================================================================
--- kde-extras/ktorrent/libbtcore/debian/changelog 2008-05-03 11:00:53 UTC (rev 10452)
+++ kde-extras/ktorrent/libbtcore/debian/changelog 2008-05-03 11:52:10 UTC (rev 10453)
@@ -1,4 +1,4 @@
-libbtcore (3.1~beta1-1~pre6) experimental; urgency=low
+libbtcore (3.1~beta1-1) experimental; urgency=low
+++ Changes by Modestas Vainius:
@@ -8,6 +8,7 @@
when kget 4.1 from kdenetwork still needs libbtore4 whereas ktorrent
3.2 or later depends on libbtcore5 or later. Therefore, this split was
done to untie KTorrent from kdenetwork.
+ * Add Vcs fields.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Fri, 02 May 2008 16:02:55 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Fri, 02 May 2008 23:09:39 +0300
Modified: kde-extras/ktorrent/libbtcore/debian/control
===================================================================
--- kde-extras/ktorrent/libbtcore/debian/control 2008-05-03 11:00:53 UTC (rev 10452)
+++ kde-extras/ktorrent/libbtcore/debian/control 2008-05-03 11:52:10 UTC (rev 10453)
@@ -7,6 +7,8 @@
Build-Depends: cmake, debhelper (>= 6.0.0), cdbs (>= 0.4.51), quilt, kdelibs5-dev (>= 4:4.0.72), libgmp3-dev, libqca2-dev, pkg-config
Standards-Version: 3.7.3.0
Homepage: http://ktorrent.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/ktorrent/libbtcore/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/ktorrent/libbtcore/
Package: libbtcore4
Architecture: any
@@ -37,6 +39,7 @@
Package: libbtcore-dbg
Architecture: any
+Priority: extra
Depends: libbtcore4 (= ${binary:Version})
Description: debugging symbols for BTCore, BitTorrent Core Library
BitTorrent Core Library (BTCore) is a C++/Qt4/KDE4 based implementation of the
Modified: kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff
===================================================================
--- kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff 2008-05-03 11:00:53 UTC (rev 10452)
+++ kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff 2008-05-03 11:52:10 UTC (rev 10453)
@@ -22,9 +22,9 @@
+add_definitions( ${KDE4_ENABLE_EXCEPTIONS} ${KDE4_DEFINITIONS} )
+
+include_directories(
-+ ${KDE4_INCLUDES}
-+ ${QCA2_INCLUDE_DIR}
-+ ${GMP_INCLUDE_DIR}
++ ${KDE4_INCLUDES}
++ ${QCA2_INCLUDE_DIR}
++ ${GMP_INCLUDE_DIR}
+)
+
+option(ENABLE_DHT_SUPPORT "Whether to build BTCore library with DHT support or not" true)
@@ -37,6 +37,15 @@
#XFS prealloc
CHECK_INCLUDE_FILES(xfs/xfs.h HAVE_XFS_XFS_H)
IF(HAVE_XFS_XFS_H)
+@@ -22,7 +55,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})
@@ -122,23 +155,6 @@
torrent/torrentcontrol.cpp
torrent/torrentcreator.cpp
@@ -66,24 +75,24 @@
)
+if (ENABLE_DHT_SUPPORT)
-+ set(libbtcore_SRC ${libbtcore_SRC}
-+ dht/announcetask.cpp
-+ dht/dht.cpp
-+ dht/kclosestnodessearch.cpp
-+ dht/nodelookup.cpp
-+ dht/rpcmsg.cpp
-+ dht/taskmanager.cpp
-+ dht/database.cpp
-+ dht/dhttrackerbackend.cpp
-+ dht/key.cpp
-+ dht/pack.cpp
-+ dht/rpcserver.cpp
-+ dht/dhtbase.cpp
-+ dht/kbucket.cpp
-+ dht/node.cpp
-+ dht/rpccall.cpp
-+ dht/task.cpp
-+ )
++ set(libbtcore_SRC ${libbtcore_SRC}
++ dht/announcetask.cpp
++ dht/dht.cpp
++ dht/kclosestnodessearch.cpp
++ dht/nodelookup.cpp
++ dht/rpcmsg.cpp
++ dht/taskmanager.cpp
++ dht/database.cpp
++ dht/dhttrackerbackend.cpp
++ dht/key.cpp
++ dht/pack.cpp
++ dht/rpcserver.cpp
++ dht/dhtbase.cpp
++ dht/kbucket.cpp
++ dht/node.cpp
++ dht/rpccall.cpp
++ dht/task.cpp
++ )
+endif (ENABLE_DHT_SUPPORT)
# kde4_add_ui_files(libbtcore_SRC ${libbtcore_UI})
@@ -92,13 +101,13 @@
./download/piece.h
./download/packet.h
./download/chunkselector.h
-+ ./download/webseed.h
++ ./download/webseed.h
)
set (btcore_HDR
btcore_export.h
btversion.h
-+ ${CMAKE_BINARY_DIR}/config-btcore.h
++ ${libbtcore_BINARY_DIR}/config-btcore.h
)
set (bcodec_HDR
@@ -112,7 +121,7 @@
install(FILES ${btcore_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore )
+
+if (ENABLE_DHT_SUPPORT)
-+ install(FILES ${dht_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/dht )
++ install(FILES ${dht_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libbtcore/dht )
+endif (ENABLE_DHT_SUPPORT)
+
+# Install cmake module
@@ -133,11 +142,11 @@
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")
++ 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")
++ 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} ")
@@ -160,7 +169,7 @@
// add the DHT source
addPeerSource(m_dht);
+#else
-+ m_dht = 0;
++ m_dht = 0;
+#endif
}
@@ -174,7 +183,7 @@
+#ifdef ENABLE_DHT_SUPPORT
dh_table = new dht::DHT();
+#else
-+ dh_table = 0;
++ dh_table = 0;
+#endif
}
More information about the pkg-kde-commits
mailing list