rev 6421 - in kde-extras/ktorrent/trunk: . debian

Sun Jun 3 13:37:59 UTC 2007

Author: modax-guest
Date: 2007-06-03 13:37:59 +0000 (Sun, 03 Jun 2007)
New Revision: 6421

Added:
   kde-extras/ktorrent/trunk/debian/NEWS
Removed:
   kde-extras/ktorrent/trunk/debian/overrides.linda
Modified:
   kde-extras/ktorrent/trunk/TODO
   kde-extras/ktorrent/trunk/debian/README.Debian
   kde-extras/ktorrent/trunk/debian/changelog
   kde-extras/ktorrent/trunk/debian/ktorrent.install
   kde-extras/ktorrent/trunk/debian/not-installed
Log:
README.Debian and NEWS.Debian updates. Other small fixes.
ktorrent 2.1.4.dfsg.1-1 is ready for upload to unstable


Modified: kde-extras/ktorrent/trunk/TODO
===================================================================

--- kde-extras/ktorrent/trunk/TODO	2007-06-03 11:31:22 UTC (rev 6420)
+++ kde-extras/ktorrent/trunk/TODO	2007-06-03 13:37:59 UTC (rev 6421)
@@ -1,6 +1,3 @@
-For 2.1.4-1:
-  * Update README.Debian and maybe add NEWS.Debian
-  
 For 2.1.4-2:
   * -dbg package (not for -1 to avoid NEW)
 

Added: kde-extras/ktorrent/trunk/debian/NEWS
===================================================================
--- kde-extras/ktorrent/trunk/debian/NEWS	                        (rev 0)
+++ kde-extras/ktorrent/trunk/debian/NEWS	2007-06-03 13:37:59 UTC (rev 6421)
@@ -0,0 +1,10 @@
+ktorrent (2.1.4.dfsg.1-1) unstable; urgency=low
+
+  * Now KTorrent uses system-wide GeoIP library (libgeoip1) and its default
+    GeoIP Country database to determine countries, which BitTorrent peers
+    originate from. The default free database provided by libgeoip is a bit
+    outdated and not very accurate. If you wish to upgrade the database,
+    please read /usr/share/doc/ktorrent/README.Debian and
+    /usr/share/doc/libgeoip1/README.Debian.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Sun, 03 Jun 2007 15:40:07 +0300

Modified: kde-extras/ktorrent/trunk/debian/README.Debian
===================================================================
--- kde-extras/ktorrent/trunk/debian/README.Debian	2007-06-03 11:31:22 UTC (rev 6420)
+++ kde-extras/ktorrent/trunk/debian/README.Debian	2007-06-03 13:37:59 UTC (rev 6421)
@@ -1,25 +1,28 @@
 Due to licensing restrictions, the source and binary packages of ktorrent do
-not include a GeoIP database. The binary package *is* built to support it
-however (the API is GPL, but data used from ARIN to generate the data files
-is *not* DFSG compliant). If you wish to use the GeoIP support, there are free
-databases made available at the following URL:
+not include a GeoIP database. The upstream source has been patched to use
+system-wide GeoIP library (available in the libgeoip1 package). That package
+provides a free GeoIP Country database that is a bit outdated and not very
+accurate but it may still be sufficient for most KTorrent users, because
+determination of the peer geographic location is only additional and 
+non-crucial KTorrent functionality, implemented for information purposes.
 
+However, if you wish to get more accurate information about peer geographic
+location, there is a free to download (but undistributable by Debian) "GeoLite
+Country" database and even more accurate paid "GeoIP Country" database
+available at the following URL:
+
 http://www.maxmind.com/app/geoip_country
 
-Place the uncompressed database file in /usr/share/apps/ktorrent/geoip/ and
-the country information will be displayed in the peers tab. The commercial
-version offered *should* also work, but I have no means to confirm or deny
-this.
+Please consult libgeop1 documentation how to upgrade GeoIP database on your
+system once you obtain a proper database file (geoip.dat).
 
-The flag images are also not distributed with this package. Although the
-original author seems to wish the grant free use, the verbage used in
-granting it restricts their use to websites. I've tried, and will continue
-to try to contact him and find a resolution.
+The KTorrent builtin country flag images are also not distributed with this
+package due to obscure license. However, KTorrent has been patched to use
+country flag images provided by the kdebase-data package. If you would like
+to see country flags next to the country names, please install kdebase-data
+package (that is recommended by the ktorrent binary package).
 
-----
-
-The upstream source was modified in the following ways:
-	removed ./plugins/infowidget/geoip/
-		includes (geoip.dat *.png FLAGS_LICENSE GeoIP-LICENSE.txt Makefile.*)
-	modified ./plugins/infowidget/Makefile.{am,in} to not depend on above
-	appended "+dfsg1" to base directory name
+The commands used to modify upstream source tarball can be found at debian/rules 
+"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.

Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog	2007-06-03 11:31:22 UTC (rev 6420)
+++ kde-extras/ktorrent/trunk/debian/changelog	2007-06-03 13:37:59 UTC (rev 6421)
@@ -1,7 +1,7 @@
-ktorrent (2.1.4.dfsg.1-1~pre2) UNRELEASED; urgency=low
+ktorrent (2.1.4.dfsg.1-1) unstable; urgency=low
 
   * ktorrent is now maintained by Debian KDE Extras Team.
-  
+
   [Modestas Vainius]
   * New major upstream release (2.1): (Closes: #400186)
     - µTorrent compatible peer exchange
@@ -13,7 +13,7 @@
     - Grouping feature to put torrents into groups
     - Improved search plugin, which now allows multiple searches
     - Allows setting priority for files in multifile torrents (Closes: #367120)
-    - Download speed of each chunk is shown individually in the chunk
+    - Download speed is shown individually for each chunk in the chunk
       window (Closes: #372162)
   * New bugfix upstream release (2.1.4): (Closes: #420913)
    - Fixed crash in parsing of DHT messages (Closes: #425043)
@@ -31,9 +31,7 @@
   * New patches:
     - 10_use-system-geoip.diff - adds support for the --enable-system-geoip
       configure parameter. It makes ktorrent build against system-wide GeoIP
-      library (libgeoip1) and use its default GeoIP Country database. libgeoip1 ships
-      with a free and a bit outdated version (but still more or less accurate)
-      of this database.
+      library (libgeoip1) and use libgeoip1 default GeoIP Country database.
     - 11_flagdb-alternative-source.diff - adds support for the
       --disable-builtin-country-flags configure parameter. It allows to skip
       installation of non-free ktorrent builtin country flags. In addition,
@@ -48,13 +46,16 @@
   * Add kdebase-data to Recommends. It is needed as a source of the country
     flag images for the Peer View. If not installed, country flags won't be
     shown.
-  * Add debian/ktorrent.install. Prepare for multiple binary packages. 
-  * Add Ktorrent to Debian menu (Closes: #392893). 
-  * Now 'clean' target fully cleans the source tree after build (Closes: #424476).
+  * Add debian/ktorrent.install. Prepare for multiple binary packages.
+  * Add Ktorrent to Debian menu (Closes: #392893).
+  * Now 'clean' target fully cleans the source tree after build
+    (Closes: #424476).
   * Fully support DEB_BUILD_OPTIONS.
   * Add manual pages for ktorrent and ktshell.
+  * Update README.Debian with new information about GeoIP and country flag
+    images and add NEWS about accuracy of the default GeoIP Country database.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 02 Jun 2007 18:18:44 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 03 Jun 2007 16:03:17 +0300
 
 ktorrent (2.0.3+dfsg1-2.2) unstable; urgency=low
 

Modified: kde-extras/ktorrent/trunk/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/trunk/debian/ktorrent.install	2007-06-03 11:31:22 UTC (rev 6420)
+++ kde-extras/ktorrent/trunk/debian/ktorrent.install	2007-06-03 13:37:59 UTC (rev 6421)
@@ -1,7 +1,7 @@
 debian/tmp/usr/bin/ktorrent
 debian/tmp/usr/bin/ktshell
+debian/tmp/usr/lib/libktorrent-*.so
 debian/tmp/usr/lib/kde3/*.so
-debian/tmp/usr/lib/*.so
 debian/tmp/usr/share/applications/kde/ktorrent.desktop
 debian/tmp/usr/share/apps/ktorrent/*
 debian/tmp/usr/share/config.kcfg/*

Modified: kde-extras/ktorrent/trunk/debian/not-installed
===================================================================
--- kde-extras/ktorrent/trunk/debian/not-installed	2007-06-03 11:31:22 UTC (rev 6420)
+++ kde-extras/ktorrent/trunk/debian/not-installed	2007-06-03 13:37:59 UTC (rev 6421)
@@ -4,5 +4,6 @@
 debian/tmp/usr/bin/ktupnptest
 
 # Development stuff
+debian/tmp/usr/lib/libktorrent.so
 debian/tmp/usr/lib/libktorrent.la
 debian/tmp/usr/lib/kde3/*.la

Deleted: kde-extras/ktorrent/trunk/debian/overrides.linda


