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

[Modestas Vainius]

Author: modax-guest
Date: 2008-06-04 21:38:09 +0000 (Wed, 04 Jun 2008)
New Revision: 10881

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/97_fix_target_link_libraries.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
Log:
ktorrent 3.1~rc1 -1 ready

Modified: kde-extras/ktorrent/branches/experimental/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/changelog	2008-06-04 21:34:12 UTC (rev 10880)
+++ kde-extras/ktorrent/branches/experimental/debian/changelog	2008-06-04 21:38:09 UTC (rev 10881)
@@ -1,3 +1,13 @@
+ktorrent (3.1~rc1+dfsg.1-1) experimental; urgency=low
+
+  * New upstream development release.
+  * Drop ktorrent-dbg from ktorrent Recommends as ktorrent development
+    releases proved to be pretty stable (Closes: #483970).
+  * Update install files (soname bumps).
+  * Adopt patches to upstream changes.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 04 Jun 2008 23:15:51 +0300
+
 ktorrent (3.1~beta2+dfsg.1-1) experimental; urgency=low
 
   * New upstream development release.

Modified: kde-extras/ktorrent/branches/experimental/debian/control
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/control	2008-06-04 21:34:12 UTC (rev 10880)
+++ kde-extras/ktorrent/branches/experimental/debian/control	2008-06-04 21:38:09 UTC (rev 10881)
@@ -15,7 +15,6 @@
 Package: ktorrent
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: ktorrent-dbg (= ${binary:Version})
 Suggests: php5-cli
 Description: BitTorrent client for KDE
  KTorrent is a BitTorrent program for KDE. You can use it to download and upload

Modified: kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-06-04 21:34:12 UTC (rev 10880)
+++ kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-06-04 21:38:09 UTC (rev 10881)
@@ -10,12 +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/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/lib/libbtcore.so.6p
+debian/tmp/usr/lib/libbtcore.so.6p.0.0
+debian/tmp/usr/lib/libktcore.so.6
+debian/tmp/usr/lib/libktcore.so.6.0.0
+debian/tmp/usr/lib/libktupnp.so.3
+debian/tmp/usr/lib/libktupnp.so.3.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-06-04 21:34:12 UTC (rev 10880)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff	2008-06-04 21:38:09 UTC (rev 10881)
@@ -86,7 +86,7 @@
  
 -target_link_libraries(ktupnptest btcore ktupnp ${KDE4_KDEUI_LIBS})
 +target_link_libraries(ktupnptest ${BTCORE_LIBRARIES} ktupnp ${KDE4_KDEUI_LIBS})
- install(TARGETS ktupnptest DESTINATION ${BIN_INSTALL_DIR})
+ install(TARGETS ktupnptest ${INSTALL_TARGETS_DEFAULT_ARGS})
  
 --- ktorrent-3.1~beta1+dfsg.1.orig/libktcore/CMakeLists.txt
 +++ ktorrent-3.1~beta1+dfsg.1/libktcore/CMakeLists.txt
@@ -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 5.0.0 SOVERSION 5 )
- install(TARGETS ktcore  DESTINATION ${LIB_INSTALL_DIR} )
+ set_target_properties(ktcore PROPERTIES VERSION 6.0.0 SOVERSION 6 )
+ install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  

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-06-04 21:34:12 UTC (rev 10880)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	2008-06-04 21:38:09 UTC (rev 10881)
@@ -6,8 +6,8 @@
  
 -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 5.0.0 SOVERSION 5 )
- install(TARGETS ktcore  DESTINATION ${LIB_INSTALL_DIR} )
+ set_target_properties(ktcore PROPERTIES VERSION 6.0.0 SOVERSION 6 )
+ install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
 --- ktorrent-3.1~beta1+dfsg.1.orig/libktupnp/CMakeLists.txt
 +++ ktorrent-3.1~beta1+dfsg.1/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 2.0.0 SOVERSION 2 )
- install(TARGETS ktupnp  DESTINATION ${LIB_INSTALL_DIR} )
+ set_target_properties(ktupnp PROPERTIES VERSION 3.0.0 SOVERSION 3 )
+ install(TARGETS ktupnp  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  

Modified: 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	2008-06-04 21:34:12 UTC (rev 10880)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	2008-06-04 21:38:09 UTC (rev 10881)
@@ -4,8 +4,8 @@
  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_target_properties(btcore PROPERTIES VERSION 6.0.0 SOVERSION 6 )
++set_target_properties(btcore PROPERTIES VERSION 6p.0.0 SOVERSION 6p )
+ install(TARGETS btcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
  set(net_HDR