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

Modestas Vainius modax-guest at alioth.debian.org
Mon Jul 7 10:46:20 UTC 2008


Author: modax-guest
Date: 2008-07-07 10:46:19 +0000 (Mon, 07 Jul 2008)
New Revision: 11367

Modified:
   kde-extras/ktorrent/branches/experimental/debian/changelog
   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/libbtcore/99_libbtcore_scramble_soname.diff
Log:
* New upstream release.
* Update patches.
* Update install files (bumps of library minor versions).

Modified: kde-extras/ktorrent/branches/experimental/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/changelog	2008-07-07 10:44:20 UTC (rev 11366)
+++ kde-extras/ktorrent/branches/experimental/debian/changelog	2008-07-07 10:46:19 UTC (rev 11367)
@@ -1,3 +1,11 @@
+ktorrent (3.1+dfsg.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update patches.
+  * Update install files (bumps of library minor versions).
+
+ -- Modestas Vainius <modestas at vainius.eu>  Tue, 17 Jun 2008 12:48:39 +0300
+
 ktorrent (3.1~rc1+dfsg.1-1) experimental; urgency=low
 
   * New upstream development release.

Modified: kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-07-07 10:44:20 UTC (rev 11366)
+++ kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-07-07 10:46:19 UTC (rev 11367)
@@ -11,11 +11,11 @@
 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.0.0
+debian/tmp/usr/lib/libbtcore.so.6p.1.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/lib/libktupnp.so.3.1.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-07-07 10:44:20 UTC (rev 11366)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff	2008-07-07 10:46:19 UTC (rev 11367)
@@ -1,5 +1,5 @@
---- ktorrent-3.1~beta1+dfsg.1.orig/CMakeLists.txt
-+++ ktorrent-3.1~beta1+dfsg.1/CMakeLists.txt
+--- ktorrent-3.1+dfsg.1.orig/CMakeLists.txt
++++ ktorrent-3.1+dfsg.1/CMakeLists.txt
 @@ -1,8 +1,6 @@
  project(KTORRENT)
  find_package(KDE4 REQUIRED)
@@ -88,8 +88,8 @@
 +target_link_libraries(ktupnptest ${BTCORE_LIBRARIES} ktupnp ${KDE4_KDEUI_LIBS})
  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
+--- ktorrent-3.1+dfsg.1.orig/libktcore/CMakeLists.txt
++++ ktorrent-3.1+dfsg.1/libktcore/CMakeLists.txt
 @@ -44,7 +44,7 @@
  kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
  kde4_add_library(ktcore SHARED ${libktorrent_SRC})

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-07-07 10:44:20 UTC (rev 11366)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff	2008-07-07 10:46:19 UTC (rev 11367)
@@ -1,5 +1,5 @@
---- ktorrent-3.1~beta1+dfsg.1.o/ktorrent/gui.cpp	2008-04-29 20:06:39.000000000 +0300
-+++ ktorrent-3.1~beta1+dfsg.1/ktorrent/gui.cpp	2008-05-03 16:24:54.000000000 +0300
+--- ktorrent-3.1+dfsg.1.o/ktorrent/gui.cpp	2008-04-29 20:06:39.000000000 +0300
++++ ktorrent-3.1+dfsg.1/ktorrent/gui.cpp	2008-05-03 16:24:54.000000000 +0300
 @@ -45,7 +45,6 @@
  #include <torrent/queuemanager.h>
  #include <torrent/torrentcontrol.h>
@@ -28,8 +28,8 @@
  
  		tray_icon->updateStats(stats,Settings::showSpeedBarInTrayIcon(),Settings::downloadBandwidth(), Settings::uploadBandwidth());
  		core->updateGuiPlugins();
---- ktorrent-3.1~beta1+dfsg.1.o/ktorrent/statusbar.cpp	2008-04-29 20:06:39.000000000 +0300
-+++ ktorrent-3.1~beta1+dfsg.1/ktorrent/statusbar.cpp	2008-05-03 16:26:43.000000000 +0300
+--- ktorrent-3.1+dfsg.1.o/ktorrent/statusbar.cpp	2008-04-29 20:06:39.000000000 +0300
++++ ktorrent-3.1+dfsg.1/ktorrent/statusbar.cpp	2008-05-03 16:26:43.000000000 +0300
 @@ -22,9 +22,12 @@
  #include <QProgressBar>
  #include <klocale.h>
@@ -62,8 +62,8 @@
  			dht_status->setText(i18n("DHT: off"));
  	}
  
---- ktorrent-3.1~beta1+dfsg.1.o/ktorrent/torrentcreatordlg.cpp	2008-04-29 20:06:39.000000000 +0300
-+++ ktorrent-3.1~beta1+dfsg.1/ktorrent/torrentcreatordlg.cpp	2008-05-03 16:35:18.000000000 +0300
+--- ktorrent-3.1+dfsg.1.o/ktorrent/torrentcreatordlg.cpp	2008-04-29 20:06:39.000000000 +0300
++++ ktorrent-3.1+dfsg.1/ktorrent/torrentcreatordlg.cpp	2008-05-03 16:35:18.000000000 +0300
 @@ -21,7 +21,6 @@
  #include <kfiledialog.h>
  #include <kmessagebox.h>
@@ -99,8 +99,8 @@
  		
  		// webseed stuff
  		connect(m_add_webseed,SIGNAL(clicked()),this,SLOT(addWebSeedPressed()));
---- ktorrent-3.1~beta1+dfsg.1.o/libktcore/interfaces/functions.cpp	2008-04-29 20:06:40.000000000 +0300
-+++ ktorrent-3.1~beta1+dfsg.1/libktcore/interfaces/functions.cpp	2008-05-03 15:50:48.000000000 +0300
+--- ktorrent-3.1+dfsg.1.o/libktcore/interfaces/functions.cpp	2008-04-29 20:06:40.000000000 +0300
++++ ktorrent-3.1+dfsg.1/libktcore/interfaces/functions.cpp	2008-05-03 15:50:48.000000000 +0300
 @@ -32,7 +32,6 @@
  #include <peer/peermanager.h>
  #include <net/socketmonitor.h>
@@ -120,8 +120,8 @@
  using namespace bt;
  
  namespace kt
---- ktorrent-3.1~beta1+dfsg.1.o/plugins/stats/ConnsTabPage.cc	2008-04-29 20:06:33.000000000 +0300
-+++ ktorrent-3.1~beta1+dfsg.1/plugins/stats/ConnsTabPage.cc	2008-05-03 16:07:50.000000000 +0300
+--- ktorrent-3.1+dfsg.1.o/plugins/stats/ConnsTabPage.cc	2008-04-29 20:06:33.000000000 +0300
++++ ktorrent-3.1+dfsg.1/plugins/stats/ConnsTabPage.cc	2008-05-03 16:07:50.000000000 +0300
 @@ -78,6 +78,7 @@ void ConnsTabPage::SetupUi()
  	
  	//--------------------------
@@ -174,8 +174,8 @@
  }
  
  void ConnsTabPage::GatherConnStats(Plugin * pPlug)
---- ktorrent-3.1~beta1+dfsg.1.o/plugins/stats/ConnsTabPage.h	2008-04-29 20:06:33.000000000 +0300
-+++ ktorrent-3.1~beta1+dfsg.1/plugins/stats/ConnsTabPage.h	2008-05-03 16:01:20.000000000 +0300
+--- ktorrent-3.1+dfsg.1.o/plugins/stats/ConnsTabPage.h	2008-04-29 20:06:33.000000000 +0300
++++ ktorrent-3.1+dfsg.1/plugins/stats/ConnsTabPage.h	2008-05-03 16:01:20.000000000 +0300
 @@ -27,7 +27,6 @@
  
  #include <interfaces/plugin.h>
@@ -195,8 +195,8 @@
  namespace kt {
  
  /** \brief Connections tab
---- ktorrent-3.1~beta1+dfsg.1.o/plugins/webinterface/phpcommandhandler.cpp	2008-04-29 20:06:34.000000000 +0300
-+++ ktorrent-3.1~beta1+dfsg.1/plugins/webinterface/phpcommandhandler.cpp	2008-05-03 15:58:29.000000000 +0300
+--- ktorrent-3.1+dfsg.1.o/plugins/webinterface/phpcommandhandler.cpp	2008-04-29 20:06:34.000000000 +0300
++++ ktorrent-3.1+dfsg.1/plugins/webinterface/phpcommandhandler.cpp	2008-05-03 15:58:29.000000000 +0300
 @@ -18,7 +18,6 @@
   *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
   ***************************************************************************/

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-07-07 10:44:20 UTC (rev 11366)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	2008-07-07 10:46:19 UTC (rev 11367)
@@ -1,5 +1,5 @@
---- ktorrent-3.1~beta1+dfsg.1.orig/libktcore/CMakeLists.txt
-+++ ktorrent-3.1~beta1+dfsg.1/libktcore/CMakeLists.txt
+--- ktorrent-3.1+dfsg.1.orig/libktcore/CMakeLists.txt
++++ ktorrent-3.1+dfsg.1/libktcore/CMakeLists.txt
 @@ -44,7 +44,7 @@
  kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
  kde4_add_library(ktcore SHARED ${libktorrent_SRC})
@@ -9,14 +9,14 @@
  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
+--- ktorrent-3.1+dfsg.1.orig/libktupnp/CMakeLists.txt
++++ ktorrent-3.1+dfsg.1/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.0.0 SOVERSION 3 )
+ set_target_properties(ktupnp PROPERTIES VERSION 3.1.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-07-07 10:44:20 UTC (rev 11366)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff	2008-07-07 10:46:19 UTC (rev 11367)
@@ -4,8 +4,8 @@
  if(WIN32)
  target_link_libraries(btcore ws2_32)
  endif(WIN32)
--set_target_properties(btcore PROPERTIES VERSION 6.0.0 SOVERSION 6 )
-+set_target_properties(btcore PROPERTIES VERSION 6p.0.0 SOVERSION 6p )
+-set_target_properties(btcore PROPERTIES VERSION 6.1.0 SOVERSION 6 )
++set_target_properties(btcore PROPERTIES VERSION 6p.1.0 SOVERSION 6p )
  install(TARGETS btcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
  set(net_HDR  




More information about the pkg-kde-commits mailing list