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

Modestas Vainius modax-guest at alioth.debian.org
Sun Jun 3 22:43:32 UTC 2007 

Author: modax-guest
Date: 2007-06-03 22:41:52 +0000 (Sun, 03 Jun 2007)
New Revision: 6428

Modified:
   kde-extras/ktorrent/TODO
   kde-extras/ktorrent/trunk/debian/README.Debian
   kde-extras/ktorrent/trunk/debian/changelog
   kde-extras/ktorrent/trunk/debian/control
   kde-extras/ktorrent/trunk/debian/patches/01_libtool_update.diff
   kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff
   kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff
   kde-extras/ktorrent/trunk/debian/patches/98_buildprep.diff
   kde-extras/ktorrent/trunk/debian/rules
Log:
Get ready for 2.2~beta1 upload to experimental


Modified: kde-extras/ktorrent/TODO
===================================================================
--- kde-extras/ktorrent/TODO	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/TODO	2007-06-03 22:41:52 UTC (rev 6428)
@@ -1,7 +1,2 @@
 For 2.1.4-2:
-  * -dbg package (not for -1 to avoid NEW)
-
-For 2.2beta1:
-  * Update to new upstream release.
-  * -dbg package
-
+  * Backport some changes from 2.2~beta1

Modified: kde-extras/ktorrent/trunk/debian/README.Debian
===================================================================
--- kde-extras/ktorrent/trunk/debian/README.Debian	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/trunk/debian/README.Debian	2007-06-03 22:41:52 UTC (rev 6428)
@@ -26,3 +26,6 @@
 "prune-tarball" target. The relevant GeoIP and flags patches mentioned above can
 be found at debian/patches/10_use_system_geoip.diff and
 debian/patches/11_flagdb-alternative-source.diff respectively.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Sun, 03 Jun 2007 15:40:07 +0300
+

Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/trunk/debian/changelog	2007-06-03 22:41:52 UTC (rev 6428)
@@ -1,3 +1,24 @@
+ktorrent (2.2~beta1.dfsg.1-1) experimental; urgency=low
+
+  [Modestas Vainius]
+  * New upstream development release (2.2 beta1).
+  * Prune upstream tarball from non-free parts, remove useless autotools
+    cache directory and create a new dfsg-free orig tarball.
+  * Update debian/patches:
+    01_libtool_update.diff - regenerate.
+    10_use_system_geoip.diff - adapt to upstream changes.
+    11_flagdb-alternative-source.diff - adapt to upstream changes.
+    98_buildprep.diff - regenerate.
+  * Add a new binary package, ktorrent-dbg, to hold debugging symbols.
+    Make appropriate changes to debian/control and debian/rules.
+  * Since this release is a development beta release, crashes are expected.
+    Therefore add ktorrent-dbg to ktorrent Recommends till final release.
+  * Add php5-cli to ktorrent Suggests. It is needed for KTorrent WebInterface
+    plugin.
+  * Update description of the ktorrent binary package.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 03 Jun 2007 22:19:03 +0300
+
 ktorrent (2.1.4.dfsg.1-1) unstable; urgency=low
 
   * ktorrent is now maintained by Debian KDE Extras Team.

Modified: kde-extras/ktorrent/trunk/debian/control
===================================================================
--- kde-extras/ktorrent/trunk/debian/control	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/trunk/debian/control	2007-06-03 22:41:52 UTC (rev 6428)
@@ -8,12 +8,46 @@
 
 Package: ktorrent
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: kdebase-data
+Depends: ${shlibs:Depends}
+Recommends: kdebase-data, ktorrent-dbg
+Suggests: php5-cli
 Description: BitTorrent client for KDE
- KTorrent is a BitTorrent program for KDE. Its features include speed capping
- (both down and up), integrated searching, UDP tracker support, UPnP support,
- IP blocking plugin, protocol encryption, file prioritization and integration
- into the KDE Panel enabling background downloading.
+ KTorrent is a BitTorrent program for KDE. You can use it to download and upload
+ files on the BitTorrent network. Additional KTorrent features include:
+   - µTorrent compatible peer exchange
+   - Zeroconf extension to find peers on the local network
+   - WebGUI plugin
+   - RSS plugin
+   - Grouping feature to put torrents into groups
+   - Downloads torrent files
+   - Upload and download speed capping
+   - Speed limits for individual torrents
+   - Internet searching using various search engines, you can even add
+     your own
+   - UDP Trackers
+   - Port forwarding with UPnP
+   - IP blocking plugin
+   - Importing of partially or fully downloaded files
+   - Support for distributed hash tables (mainline version)
+   - Protocol encryption
+   - Bandwith scheduling
+   - Directory scanner to automatically load torrents in certain directories
+   - Trackers can now be added to torrents
+   - File prioritization for multi file torrents
+   - Option to fully preallocate diskspace to avoid fragmentation
+   - Diskspace monitoring, with option to stop torrents when diskspace is
+     running low
+   - Statistics plugin
  .
   Homepage: http://ktorrent.org
+
+Package: ktorrent-dbg
+Architecture: any
+Depends: ktorrent (= ${Source-Version})
+Recommends: kdelibs-dbg
+Description: KTorrent debugging symbols
+ This package contains debugging symbols for KTorrent. When KTorrent crashes,
+ in most cases this package is needed to get a backtrace that is useful for
+ developers. If you have experienced KTorrent crash without this package
+ installed, please install it, try to reproduce the problem and fill a bug
+ report with a new backtrace attached.

Modified: kde-extras/ktorrent/trunk/debian/patches/01_libtool_update.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/01_libtool_update.diff	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/trunk/debian/patches/01_libtool_update.diff	2007-06-03 22:41:52 UTC (rev 6428)
@@ -1,6 +1,6 @@
-diff -u ktorrent-2.1.4.dfsg.1/admin/libtool.m4.in ktorrent-2.1.4.dfsg.1_1/admin/libtool.m4.in
---- ktorrent-2.1.4.dfsg.1/admin/libtool.m4.in	2007-04-22 14:25:37.000000000 +0300
-+++ ktorrent-2.1.4.dfsg.1_1/admin/libtool.m4.in	2006-03-22 02:06:55.000000000 +0200
+diff -uNr -x debian ktorrent-2.2~beta1/admin/libtool.m4.in ktorrent-2.2~beta1.n/admin/libtool.m4.in
+--- ktorrent-2.2~beta1/admin/libtool.m4.in	2007-05-24 20:38:28.000000000 +0300
++++ ktorrent-2.2~beta1.n/admin/libtool.m4.in	2006-03-22 02:06:55.000000000 +0200
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -685,7 +685,7 @@
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
--    if test -d /lib64; then
+-    if test -d /lib64 -a ! -h /lib64; then
 -      libsuff=64
 -    fi
 -  fi
@@ -3794,9 +3794,9 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-diff -u ktorrent-2.1.4.dfsg.1/admin/ltmain.sh ktorrent-2.1.4.dfsg.1_1/admin/ltmain.sh
---- ktorrent-2.1.4.dfsg.1/admin/ltmain.sh	2007-04-22 14:25:37.000000000 +0300
-+++ ktorrent-2.1.4.dfsg.1_1/admin/ltmain.sh	2006-03-22 02:06:55.000000000 +0200
+diff -uNr -x debian ktorrent-2.2~beta1/admin/ltmain.sh ktorrent-2.2~beta1.n/admin/ltmain.sh
+--- ktorrent-2.2~beta1/admin/ltmain.sh	2007-05-24 20:38:28.000000000 +0300
++++ ktorrent-2.2~beta1.n/admin/ltmain.sh	2006-03-22 02:06:55.000000000 +0200
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Modified: kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff	2007-06-03 22:41:52 UTC (rev 6428)
@@ -1,7 +1,7 @@
-diff -uNr ktorrent-2.1.4/configure.in.in ktorrent-2.1.4/configure.in.in
---- ktorrent-2.1.4/configure.in.in	2007-04-22 14:25:48.000000000 +0300
-+++ ktorrent-2.1.4/configure.in.in	2007-06-02 17:31:29.000000000 +0300
-@@ -62,6 +62,8 @@
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/configure.in.in ktorrent-2.2~beta1.dfsg.1.n/configure.in.in
+--- ktorrent-2.2~beta1.dfsg.1/configure.in.in	2007-05-24 20:39:02.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/configure.in.in	2007-06-03 22:46:08.000000000 +0300
+@@ -81,6 +81,8 @@
  		DO_NOT_COMPILE="$DO_NOT_COMPILE ktorrent"
  	])
  
@@ -10,7 +10,7 @@
  KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION])
  
  AC_ARG_ENABLE(
-@@ -74,15 +76,35 @@
+@@ -93,15 +95,35 @@
  	[AS_HELP_STRING(--enable-profile,[Enable profiling])],
  	[CXXFLAGS="$CXXFLAGS -DKT_PROFILE"])
  
@@ -47,21 +47,16 @@
  
  AC_ARG_ENABLE(torrent-mimetype,
       [  --enable-torrent-mimetype Enables the installation of the torrent mimetype which uses a KTorrent based icon],
-diff -uNr ktorrent-2.1.4/plugins/infowidget/Makefile.am ktorrent-2.1.4/plugins/infowidget/Makefile.am
---- ktorrent-2.1.4/plugins/infowidget/Makefile.am	2007-04-22 14:25:44.000000000 +0300
-+++ ktorrent-2.1.4/plugins/infowidget/Makefile.am	2007-06-01 13:25:47.000000000 +0300
-@@ -2,22 +2,32 @@
- METASOURCES = AUTO
- kde_module_LTLIBRARIES = ktinfowidgetplugin.la
- noinst_HEADERS = infowidgetplugin.h infowidgetprefpage.h trackerview.h GeoIP.h
-+
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am
+--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am	2007-05-24 20:38:55.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am	2007-06-03 22:35:58.000000000 +0300
+@@ -6,18 +6,27 @@
  ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \
- 		chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp infowidget.cpp \
- 		infowidgetbase.ui peerview.cpp ktorrentmonitor.cpp iwfiletreediritem.cpp \
- 		iwfiletreeitem.cpp infowidgetprefpage.cpp infowidgetpluginsettings.kcfgc iwpref.ui \
--		trackerviewbase.ui trackerview.cpp GeoIP.c floatspinbox.cpp localefloatvalidator.cpp \
-+		trackerviewbase.ui trackerview.cpp floatspinbox.cpp localefloatvalidator.cpp \
- 	chunkdownloadviewbase.ui
+ 	chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp peerview.cpp \
+ 	ktorrentmonitor.cpp iwfiletreediritem.cpp iwfiletreeitem.cpp infowidgetprefpage.cpp \
+-	infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp GeoIP.c floatspinbox.cpp \
++	infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp floatspinbox.cpp \
+ 	localefloatvalidator.cpp chunkdownloadviewbase.ui statustabbase.ui statustab.cpp fileview.cpp
 +EXTRA_ktinfowidgetplugin_la_SOURCES = GeoIP.c
  
  # Libs needed by the plugin
@@ -84,9 +79,9 @@
  
  # rc file containing the GUI for the plugin
  # pluginsdir = $(kde_datadir)/ktsearchplugin
-diff -uNr ktorrent-2.1.4/plugins/infowidget/peerview.cpp ktorrent-2.1.4/plugins/infowidget/peerview.cpp
---- ktorrent-2.1.4/plugins/infowidget/peerview.cpp	2007-04-22 14:25:44.000000000 +0300
-+++ ktorrent-2.1.4/plugins/infowidget/peerview.cpp	2007-06-02 17:38:35.000000000 +0300
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp
+--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp	2007-05-24 20:38:55.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp	2007-06-03 22:46:12.000000000 +0300
 @@ -1,6 +1,6 @@
  /***************************************************************************
 - *   Copyright (C) 2005 by Joris Guisson                                   *

Modified: kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff	2007-06-03 22:41:52 UTC (rev 6428)
@@ -1,7 +1,6 @@
-diff -uNr ktorrent-2.1.4/configure.in.in ktorrent-2.1.4/configure.in.in
 --- ktorrent-2.1.4/configure.in.in	2007-06-02 17:31:29.000000000 +0300
 +++ ktorrent-2.1.4/configure.in.in	2007-06-02 17:26:28.000000000 +0300
-@@ -106,6 +106,16 @@
+@@ -125,6 +125,16 @@
  fi
  
  
@@ -18,9 +17,9 @@
  AC_ARG_ENABLE(torrent-mimetype,
       [  --enable-torrent-mimetype Enables the installation of the torrent mimetype which uses a KTorrent based icon],
       [case "${enableval}" in
-diff -uNr ktorrent-2.1.4/plugins/infowidget/flagdb.cpp ktorrent-2.1.4/plugins/infowidget/flagdb.cpp
---- ktorrent-2.1.4/plugins/infowidget/flagdb.cpp	1970-01-01 03:00:00.000000000 +0300
-+++ ktorrent-2.1.4/plugins/infowidget/flagdb.cpp	2007-06-02 16:56:44.000000000 +0300
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.cpp ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.cpp
+--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.cpp	1970-01-01 03:00:00.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.cpp	2007-06-03 23:02:45.000000000 +0300
 @@ -0,0 +1,119 @@
 +/***************************************************************************
 + *   Copyright (C) 2007 by Modestas Vainius <modestas at vainius.eu>          *
@@ -141,9 +140,9 @@
 +	}
 +	return db[c];
 +}
-diff -uNr ktorrent-2.1.4/plugins/infowidget/flagdb.h ktorrent-2.1.4/plugins/infowidget/flagdb.h
---- ktorrent-2.1.4/plugins/infowidget/flagdb.h	1970-01-01 03:00:00.000000000 +0300
-+++ ktorrent-2.1.4/plugins/infowidget/flagdb.h	2007-06-02 16:56:47.000000000 +0300
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.h ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.h
+--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.h	1970-01-01 03:00:00.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.h	2007-06-03 23:02:45.000000000 +0300
 @@ -0,0 +1,68 @@
 +/***************************************************************************
 + *   Copyright (C) 2007 by Modestas Vainius <modestas at vainius.eu>          *
@@ -213,9 +212,9 @@
 +};
 +
 + #endif
-diff -uNr ktorrent-2.1.4/plugins/infowidget/geoip/Makefile.am ktorrent-2.1.4/plugins/infowidget/geoip/Makefile.am
---- ktorrent-2.1.4/plugins/infowidget/geoip/Makefile.am	2007-04-22 14:25:44.000000000 +0300
-+++ ktorrent-2.1.4/plugins/infowidget/geoip/Makefile.am	2007-06-02 17:26:31.000000000 +0300
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/geoip/Makefile.am ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/geoip/Makefile.am
+--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/geoip/Makefile.am	2007-05-24 20:38:54.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/geoip/Makefile.am	2007-06-03 23:02:45.000000000 +0300
 @@ -9,8 +9,8 @@
  GEOIP_FILES = 
  endif
@@ -239,21 +238,21 @@
 +
 +ktdata_DATA = $(FLAG_FILES) $(GEOIP_FILES)
  
-diff -uNr ktorrent-2.1.4/plugins/infowidget/Makefile.am ktorrent-2.1.4/plugins/infowidget/Makefile.am
---- ktorrent-2.1.4/plugins/infowidget/Makefile.am	2007-06-01 13:25:47.000000000 +0300
-+++ ktorrent-2.1.4/plugins/infowidget/Makefile.am	2007-06-02 00:18:03.000000000 +0300
-@@ -7,7 +7,7 @@
- 		chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp infowidget.cpp \
- 		infowidgetbase.ui peerview.cpp ktorrentmonitor.cpp iwfiletreediritem.cpp \
- 		iwfiletreeitem.cpp infowidgetprefpage.cpp infowidgetpluginsettings.kcfgc iwpref.ui \
--		trackerviewbase.ui trackerview.cpp floatspinbox.cpp localefloatvalidator.cpp \
-+		flagdb.cpp trackerviewbase.ui trackerview.cpp floatspinbox.cpp localefloatvalidator.cpp \
- 	chunkdownloadviewbase.ui
- EXTRA_ktinfowidgetplugin_la_SOURCES = GeoIP.c
- 
-diff -uNr ktorrent-2.1.4/plugins/infowidget/peerview.cpp ktorrent-2.1.4/plugins/infowidget/peerview.cpp
---- ktorrent-2.1.4/plugins/infowidget/peerview.cpp	2007-06-02 17:38:35.000000000 +0300
-+++ ktorrent-2.1.4/plugins/infowidget/peerview.cpp	2007-06-02 17:38:45.000000000 +0300
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am
+--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am	2007-06-03 22:52:21.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am	2007-06-03 22:54:51.000000000 +0300
+@@ -4,7 +4,7 @@
+ noinst_HEADERS = infowidgetplugin.h infowidgetprefpage.h trackerview.h GeoIP.h \
+ 	statustab.h fileview.h
+ ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \
+-	chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp peerview.cpp \
++	chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp flagdb.cpp peerview.cpp \
+ 	ktorrentmonitor.cpp iwfiletreediritem.cpp iwfiletreeitem.cpp infowidgetprefpage.cpp \
+ 	infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp floatspinbox.cpp \
+ 	localefloatvalidator.cpp chunkdownloadviewbase.ui statustabbase.ui statustab.cpp fileview.cpp
+diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp
+--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp	2007-06-03 22:52:21.000000000 +0300
++++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp	2007-06-03 23:02:45.000000000 +0300
 @@ -37,6 +37,7 @@
  #include "GeoIP.h"
  #endif

Modified: kde-extras/ktorrent/trunk/debian/patches/98_buildprep.diff
===================================================================

Modified: kde-extras/ktorrent/trunk/debian/rules
===================================================================
--- kde-extras/ktorrent/trunk/debian/rules	2007-06-03 22:18:43 UTC (rev 6427)
+++ kde-extras/ktorrent/trunk/debian/rules	2007-06-03 22:41:52 UTC (rev 6428)
@@ -71,7 +71,7 @@
 	dh_installman
 	dh_install
 	dh_installmenu
-	dh_strip
+	dh_strip --dbg-package=ktorrent-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs

More information about the pkg-kde-commits mailing list