[SCM] KTorrent Debian packaging. branch, experimental, updated. debian/4.0-beta2-1

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit b6ee53bbf28449f3325b1bf3678a1dbe674b205b
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Apr 5 17:34:12 2010 +0300

    Do not use asterisks in debian/NEWS.
---
 debian/NEWS      |   48 ++++++++++++++++++++++++------------------------
 debian/changelog |    1 +
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index fad5bda..4aa45e1 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,33 +1,33 @@
 ktorrent (3.1+dfsg.2-1) unstable; urgency=low
 
-  * Since there have been two stable KTorrent 3.x (for KDE4) releases by the
-    time of writing and KTorrent 2.2.x (for KDE3) has not been updated much in
-    the meantime, I decided to ship both versions in Debian Lenny choosing
-    KTorrent 3.x as default. Therefore:
-    - you can get the old KTorrent 2.2.x release by installing ktorrent2.2
-      package if you don't want to install KDE4 runtime dependencies or new
-      features are not important for you;
-    - since ktorrent binary package provides KDE4 based release from now on,
-      it will pull in KDE4 runtime dependencies. However, it is a newer
-      KTorrent upstream release and has more features. It should work fine
-      with KDE3 desktop environment;
-    - you cannot co-install both ktorrent2.2 and ktorrent. They conflict with
-      each other and you can have only one of them on the system at the same
-      time.
-    - KTorrent 3.1 supports migration of torrents from KTorrent 2.2 but not
-      vice-versa. Therefore, if you start downloading/uploading torrents with
-      KTorrent 3.1, you will probably not be able to resume them with
-      KTorrent 2.2 if you downgrade.
+  Since there have been two stable KTorrent 3.x (for KDE4) releases by the time
+  of writing and KTorrent 2.2.x (for KDE3) has not been updated much in the
+  meantime, I decided to ship both versions in Debian Lenny choosing KTorrent
+  3.x as default. Therefore:
+  - you can get the old KTorrent 2.2.x release by installing ktorrent2.2
+    package if you don't want to install KDE4 runtime dependencies or new
+    features are not important for you;
+  - since ktorrent binary package provides KDE4 based release from now on, it
+    will pull in KDE4 runtime dependencies. However, it is a newer KTorrent
+    upstream release and has more features. It should work fine with KDE3
+    desktop environment;
+  - you cannot co-install both ktorrent2.2 and ktorrent. They conflict with
+    each other and you can have only one of them on the system at the same
+    time.
+  - KTorrent 3.1 supports migration of torrents from KTorrent 2.2 but not
+    vice-versa. Therefore, if you start downloading/uploading torrents with
+    KTorrent 3.1, you will probably not be able to resume them with KTorrent
+    2.2 if you downgrade.
 
  -- Modestas Vainius <modestas at vainius.eu>  Mon, 30 Jun 2008 22:46:56 +0300
 
 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.
+  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
diff --git a/debian/changelog b/debian/changelog
index 30f82fd..3aeeb06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ktorrent (4.0~beta2-0r1) UNRELEASED; urgency=low
   * Bump libqt4-dev build dependency to 4:4.6 - needed by plasmoid. As a
     result, drop Build-Conflicts with libqt4-dev 4:4.5.2.
   * Update install files.
+  * Do not use asterisks in debian/NEWS.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 28 Dec 2009 15:00:04 +0200
 

-- 
KTorrent Debian packaging.