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

[Modestas Vainius]

Author: modax-guest
Date: 2008-07-14 14:46:16 +0000 (Mon, 14 Jul 2008)
New Revision: 11508

Removed:
   kde-extras/ktorrent/trunk/debian/patches/00_r828279_branch_pull.diff
Modified:
   kde-extras/ktorrent/trunk/debian/changelog
   kde-extras/ktorrent/trunk/debian/ktorrent.install
   kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff
   kde-extras/ktorrent/trunk/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
   kde-extras/ktorrent/trunk/debian/patches/series
Log:
* New upstream bugfix release.
* Remove 00_r828279_branch_pull.diff - part of this release.
* Update other patches due to library version and soname changes.
* Add 01_arm_qreal_fixes.diff patch to fix FTBFS on arm(el) due to qreal
  being float on this arch.
* Update install files (library versions and soname changes).
* Urgency medium to shorten testing migration time to 5 days.

Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog	2008-07-14 14:19:35 UTC (rev 11507)
+++ kde-extras/ktorrent/trunk/debian/changelog	2008-07-14 14:46:16 UTC (rev 11508)
@@ -1,3 +1,15 @@
+ktorrent (3.1.1+dfsg.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Remove 00_r828279_branch_pull.diff - part of this release.
+  * Update other patches due to library version and soname changes.
+  * Add 01_arm_qreal_fixes.diff patch to fix FTBFS on arm(el) due to qreal
+    being float on this arch.
+  * Update install files (library versions and soname changes).
+  * Urgency medium to shorten testing migration time to 5 days.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 14 Jul 2008 17:22:25 +0300
+
 ktorrent (3.1+dfsg.2-1) unstable; urgency=low
 
   * Repack upstream tarball. Leave cmake/ dir alone, just prune non-free

Modified: kde-extras/ktorrent/trunk/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/trunk/debian/ktorrent.install	2008-07-14 14:19:35 UTC (rev 11507)
+++ kde-extras/ktorrent/trunk/debian/ktorrent.install	2008-07-14 14:46:16 UTC (rev 11508)
@@ -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.6p
-debian/tmp/usr/lib/libbtcore.so.6p.1.0
+debian/tmp/usr/lib/libbtcore.so.7p
+debian/tmp/usr/lib/libbtcore.so.7p.0.0
 debian/tmp/usr/lib/libktcore.so.6
-debian/tmp/usr/lib/libktcore.so.6.0.0
+debian/tmp/usr/lib/libktcore.so.6.1.0
 debian/tmp/usr/lib/libktupnp.so.3
-debian/tmp/usr/lib/libktupnp.so.3.1.0
+debian/tmp/usr/lib/libktupnp.so.3.2.0
 debian/tmp/usr/share/applications/kde4/ktorrent.desktop
 debian/tmp/usr/share/icons/hicolor/*
 debian/tmp/usr/share/kde4/apps/ktorrent/*

Deleted: kde-extras/ktorrent/trunk/debian/patches/00_r828279_branch_pull.diff

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-07-14 14:19:35 UTC (rev 11507)
+++ kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff	2008-07-14 14:46:16 UTC (rev 11508)
@@ -1,22 +1,22 @@
---- ktorrent-3.1+dfsg.1.orig/libktcore/CMakeLists.txt
-+++ ktorrent-3.1+dfsg.1/libktcore/CMakeLists.txt
+--- a/libktcore/CMakeLists.txt
++++ b/libktcore/CMakeLists.txt
 @@ -44,7 +44,7 @@
  kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
  kde4_add_library(ktcore SHARED ${libktorrent_SRC})
  
 -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.0.0 SOVERSION 6 )
+ set_target_properties(ktcore PROPERTIES VERSION 6.1.0 SOVERSION 6 )
  install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
---- ktorrent-3.1+dfsg.1.orig/libktupnp/CMakeLists.txt
-+++ ktorrent-3.1+dfsg.1/libktupnp/CMakeLists.txt
+--- a/libktupnp/CMakeLists.txt
++++ b/libktupnp/CMakeLists.txt
 @@ -5,7 +5,7 @@
  
  kde4_add_library(ktupnp SHARED ${libktupnp_SRC})
  
 -target_link_libraries(ktupnp ktcore)
 +target_link_libraries(ktupnp ktcore ${QT_QTXML_LIBRARY})
- set_target_properties(ktupnp PROPERTIES VERSION 3.1.0 SOVERSION 3 )
+ set_target_properties(ktupnp PROPERTIES VERSION 3.2.0 SOVERSION 3 )
  install(TARGETS ktupnp  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  

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-07-14 14:19:35 UTC (rev 11507)
+++ kde-extras/ktorrent/trunk/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	2008-07-14 14:46:16 UTC (rev 11508)
@@ -4,8 +4,8 @@
  if(WIN32)
  target_link_libraries(btcore ws2_32)
  endif(WIN32)
--set_target_properties(btcore PROPERTIES VERSION 6.1.0 SOVERSION 6 )
-+set_target_properties(btcore PROPERTIES VERSION 6p.1.0 SOVERSION 6p )
+-set_target_properties(btcore PROPERTIES VERSION 7.0.0 SOVERSION 7 )
++set_target_properties(btcore PROPERTIES VERSION 7p.0.0 SOVERSION 7p )
  install(TARGETS btcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
  set(net_HDR  

Modified: kde-extras/ktorrent/trunk/debian/patches/series
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/series	2008-07-14 14:19:35 UTC (rev 11507)
+++ kde-extras/ktorrent/trunk/debian/patches/series	2008-07-14 14:46:16 UTC (rev 11508)
@@ -1,4 +1,4 @@
-00_r828279_branch_pull.diff 
+01_arm_qreal_fixes.diff
 97_fix_target_link_libraries.diff
 libbtcore/97_fix_link_interface_libraries.diff -p0
 libbtcore/99_libbtcore_scramble_soname.diff -p0