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

[Modestas Vainius]

Author: modax-guest
Date: 2008-08-06 16:09:02 +0000 (Wed, 06 Aug 2008)
New Revision: 11858

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 01_arm_qreal_fixes.diff - merged upstream.
* Update other patches.
* Update ktorrent.install file.

Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog	2008-08-06 15:00:40 UTC (rev 11857)
+++ kde-extras/ktorrent/trunk/debian/changelog	2008-08-06 16:09:02 UTC (rev 11858)
@@ -1,3 +1,12 @@
+ktorrent (3.1.2+dfsg.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Remove 01_arm_qreal_fixes.diff - merged upstream.
+  * Update other patches.
+  * Update ktorrent.install file.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 06 Aug 2008 18:39:28 +0300
+
 ktorrent (3.1.1+dfsg.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.

Modified: kde-extras/ktorrent/trunk/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/trunk/debian/ktorrent.install	2008-08-06 15:00:40 UTC (rev 11857)
+++ kde-extras/ktorrent/trunk/debian/ktorrent.install	2008-08-06 16:09:02 UTC (rev 11858)
@@ -10,12 +10,9 @@
 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.7p
-debian/tmp/usr/lib/libbtcore.so.7p.0.0
-debian/tmp/usr/lib/libktcore.so.6
-debian/tmp/usr/lib/libktcore.so.6.1.0
-debian/tmp/usr/lib/libktupnp.so.3
-debian/tmp/usr/lib/libktupnp.so.3.2.0
+debian/tmp/usr/lib/libbtcore.so.*
+debian/tmp/usr/lib/libktcore.so.*
+debian/tmp/usr/lib/libktupnp.so.*
 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/trunk/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff	2008-08-06 15:00:40 UTC (rev 11857)
+++ kde-extras/ktorrent/trunk/debian/patches/97_fix_target_link_libraries.diff	2008-08-06 16:09:02 UTC (rev 11858)
@@ -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.1.0 SOVERSION 6 )
+ set_target_properties(ktcore PROPERTIES VERSION 6.2.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-08-06 15:00:40 UTC (rev 11857)
+++ kde-extras/ktorrent/trunk/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	2008-08-06 16:09:02 UTC (rev 11858)
@@ -4,8 +4,8 @@
  if(WIN32)
  target_link_libraries(btcore ws2_32)
  endif(WIN32)
--set_target_properties(btcore PROPERTIES VERSION 7.0.0 SOVERSION 7 )
-+set_target_properties(btcore PROPERTIES VERSION 7p.0.0 SOVERSION 7p )
+-set_target_properties(btcore PROPERTIES VERSION 7.1.0 SOVERSION 7 )
++set_target_properties(btcore PROPERTIES VERSION 7p.1.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-08-06 15:00:40 UTC (rev 11857)
+++ kde-extras/ktorrent/trunk/debian/patches/series	2008-08-06 16:09:02 UTC (rev 11858)
@@ -1,4 +1,3 @@
-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