rev 9255 - in kde-extras/ktorrent/branches/experimental/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sun Feb 3 12:08:29 UTC 2008
Author: modax-guest
Date: 2008-02-03 12:08:29 +0000 (Sun, 03 Feb 2008)
New Revision: 9255
Added:
kde-extras/ktorrent/branches/experimental/debian/libbtcore2.install
kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_cleanup.diff
Removed:
kde-extras/ktorrent/branches/experimental/debian/libbtcore1.install
kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_endless_loop.diff
Modified:
kde-extras/ktorrent/branches/experimental/debian/changelog
kde-extras/ktorrent/branches/experimental/debian/compat
kde-extras/ktorrent/branches/experimental/debian/control
kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
kde-extras/ktorrent/branches/experimental/debian/patches/series
kde-extras/ktorrent/branches/experimental/debian/rules
Log:
Preparing for 3.0-rc1
Modified: kde-extras/ktorrent/branches/experimental/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/changelog 2008-02-03 11:26:46 UTC (rev 9254)
+++ kde-extras/ktorrent/branches/experimental/debian/changelog 2008-02-03 12:08:29 UTC (rev 9255)
@@ -1,26 +1,19 @@
-ktorrent (3.0~beta1+svn764866.dfsg.1-1~pre1) UNRELEASED; urgency=low
+ktorrent (3.0~rc1.dfsg.1-1~pre1) UNRELEASED; urgency=low
[ Modestas Vainius ]
- * New upstream development snapshot for KDE4:
- - Original tarball has never been officially released upstream, it was
- directly generated from KDE subversion trunk repository.
- - It's a 3.0 post beta1 svn snapshot as of revision r764866.
- - Last commit (r764866) is dated Tue Jan 22 18:57:57 2008 UTC.
- - The latest (as of 2008-01-23 14:47:30 +0200) translations are included
- in the tarball.
- - ktorrent 3.0 from SVN still needs pruning to be DFSG free. The list of
- files to be pruned did not change from 2.2.4 release.
+ * New upstream development release for KDE4 (3.0 rc1):
* Major part of packaging was done from scratch in comparision with
2.2.4.dfsg.1-1 therefore some changes might have been left undocumented
in this changelog.
- * Switching to CDBS and debhelper v6.
+ * Switching to CDBS and debhelper v6. Build-Depend on cdbs (>= 0.4.51)
+ for to get non-empty -dbg package with compat=6.
* Update Standards-Version to 3.7.3.0
* Now ktorrent-dbg recommends kdelibs5-dbg due to obvious reasons. Also add
ktorrent-dbg to ktorrent Recommends because this is upstream development
release.
* Drop Homepage stanza from ktorrent description, add Homepage field to
debian/control source section instead.
- * New binary packages (libbtcore1 and libbtcore-dev) for btcore public
+ * New binary packages (libbtcore2 and libbtcore-dev) for btcore public
library.
* Add kdebase-runtime-data-common as an alternative for kdebase-data in
ktorrent Recommends. They both ship flags used by ktorrent infowidget
@@ -29,12 +22,11 @@
- 01_system_geoip_and_flags.diff - add support for "system GeoIP" and
ability to skip installation of builtin country flags to the build
system.
- - 02_kclosestnodessearch_endless_loop.dif - fix a serious endless loop
- in DHT code which made ktorrent eat all available memory making machine
- completely unusable until ktorrent eventually gets killed by the kernel
- (which, unfortunately, seems to take a long time on Linux).
+ - 02_kclosestnodessearch_cleanup.dif - cleanup unused variable. Endless
+ loop is fixed in 3.0rc1.
+ * Add "DM-Upload-Allowed: yes" to debian/control source section.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 23 Jan 2008 14:46:13 +0200
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 03 Feb 2008 02:20:29 +0200
ktorrent (2.2.4.dfsg.1-1) unstable; urgency=medium
Modified: kde-extras/ktorrent/branches/experimental/debian/compat
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/compat 2008-02-03 11:26:46 UTC (rev 9254)
+++ kde-extras/ktorrent/branches/experimental/debian/compat 2008-02-03 12:08:29 UTC (rev 9255)
@@ -1 +1 @@
-5
+6
Modified: kde-extras/ktorrent/branches/experimental/debian/control
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/control 2008-02-03 11:26:46 UTC (rev 9254)
+++ kde-extras/ktorrent/branches/experimental/debian/control 2008-02-03 12:08:29 UTC (rev 9255)
@@ -3,23 +3,38 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Joel Johnson <mrjoel at lixil.net>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cmake, debhelper (>= 6.0.0), cdbs, quilt, kdelibs5-dev, libgmp3-dev, libqca2-dev, libgeoip-dev, libphonon-dev
+DM-Upload-Allowed: yes
+Build-Depends: cmake, debhelper (>= 6.0.0), cdbs (>= 0.4.51), quilt, kdelibs5-dev, libgmp3-dev, libqca2-dev, libgeoip-dev, libphonon-dev
Standards-Version: 3.7.3.0
Homepage: http://ktorrent.org/
-Package: libbtcore1
+Package: libbtcore2
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Description: short here
- Long desc here
+Description: BitTorrent Client Core Library for C++
+ BitTorrent Client Core Library (libbtcore) is a C++/Qt4 based implementation
+ of the BitTorrent protocol. In addition, it provides many powerful BitTorrent
+ network client features including but not limited to torrent downloading and
+ seeding, torrent creation and downloaded data verification, advanced peer
+ management, IP blocking lists, HTTP, UDP tracker and mainline DHT support.
+ .
+ This library is part of KTorrent. It provides core functionality for this
+ BitTorrent client.
Package: libbtcore-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}
-Description: short here
- Long desc here
+Depends: ${shlibs:Depends}, libqt4-dev, libqca2-dev
+Description: BitTorrent Client Core Library for C++ - development files
+ BitTorrent Client Core Library (libbtcore) is a C++/Qt4 based implementation
+ of the BitTorrent protocol. In addition, it provides many powerful BitTorrent
+ network client features including but not limited to torrent downloading and
+ seeding, torrent creation and downloaded data verification, advanced peer
+ management, IP blocking lists, HTTP, UDP tracker and mainline DHT support.
+ .
+ This package contains header files and CMake modules needed for developing
+ and compiling/linking applications which use libbtcore.
Package: ktorrent
Architecture: any
Modified: kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/ktorrent.install 2008-02-03 11:26:46 UTC (rev 9254)
+++ kde-extras/ktorrent/branches/experimental/debian/ktorrent.install 2008-02-03 12:08:29 UTC (rev 9255)
@@ -9,8 +9,8 @@
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/libktcore.so.1
-debian/tmp/usr/lib/libktcore.so.1.0.0
+debian/tmp/usr/lib/libktcore.so.2
+debian/tmp/usr/lib/libktcore.so.2.0.0
debian/tmp/usr/lib/libktupnp.so.1
debian/tmp/usr/lib/libktupnp.so.1.0.0
debian/tmp/usr/share/applications/kde4/ktorrent.desktop
Deleted: kde-extras/ktorrent/branches/experimental/debian/libbtcore1.install
Added: kde-extras/ktorrent/branches/experimental/debian/libbtcore2.install
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/libbtcore2.install (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/libbtcore2.install 2008-02-03 12:08:29 UTC (rev 9255)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libbtcore.so.2
+debian/tmp/usr/lib/libbtcore.so.2.0.0
Added: kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_cleanup.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_cleanup.diff (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_cleanup.diff 2008-02-03 12:08:29 UTC (rev 9255)
@@ -0,0 +1,23 @@
+--- ktorrent/libbtcore/dht/kclosestnodessearch.cpp 2008-01-23 14:25:19.000000000 +0200
++++ ktorrent/libbtcore/dht/kclosestnodessearch.cpp 2008-01-23 14:28:17.000000000 +0200
+@@ -67,10 +67,7 @@
+
+ void KClosestNodesSearch::pack(PackedNodeContainer* cnt)
+ {
+- Uint32 j = 0;
+-
+- KNSitr i = emap.begin();
+- while (i != emap.end())
++ for (KNSitr i = emap.begin(); i != emap.end(); i++)
+ {
+ const KBucketEntry & e = i->second;
+ if (e.getAddress().ipVersion() == 4)
+@@ -85,8 +82,6 @@
+ PackBucketEntry(i->second,d,0);
+ cnt->addNode(d);
+ }
+- j++;
+- i++;
+ }
+ }
+
Deleted: kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_endless_loop.diff
Modified: kde-extras/ktorrent/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/series 2008-02-03 11:26:46 UTC (rev 9254)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/series 2008-02-03 12:08:29 UTC (rev 9255)
@@ -1,2 +1,2 @@
01_system_geoip_and_flags.diff
-02_kclosestnodessearch_endless_loop.diff
+02_kclosestnodessearch_cleanup.diff
Modified: kde-extras/ktorrent/branches/experimental/debian/rules
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/rules 2008-02-03 11:26:46 UTC (rev 9254)
+++ kde-extras/ktorrent/branches/experimental/debian/rules 2008-02-03 12:08:29 UTC (rev 9255)
@@ -7,8 +7,6 @@
DEB_DH_INSTALL_ARGS =
-DEB_DBG_PACKAGE_ALL = ktorrent-dbg
-
libbtcore1-binary-fixup::
dpkg-gensymbols -Pdebian/libbtcore1 -plibbtcore1
More information about the pkg-kde-commits
mailing list