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

[Modestas Vainius]

Author: modax-guest
Date: 2007-06-26 17:44:37 +0000 (Tue, 26 Jun 2007)
New Revision: 6589

Modified:
   kde-extras/ktorrent/trunk/debian/changelog
   kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff
Log:
Merge 2.2~rc1.dfsg.1-2 to 2.2~rc1.dfsg.1-1
Fix a bug in unused flagdb code.


Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog	2007-06-26 16:36:07 UTC (rev 6588)
+++ kde-extras/ktorrent/trunk/debian/changelog	2007-06-26 17:44:37 UTC (rev 6589)
@@ -1,20 +1,10 @@
-ktorrent (2.2~rc1.dfsg.1-3~pre1) UNRELEASED; urgency=low
+ktorrent (2.2~rc1.dfsg.1-2~pre1) UNRELEASED; urgency=low
 
   [Modestas Vainius]
   * Fix override disparity - change ktorrent-dbg priority to extra.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 26 Jun 2007 12:39:54 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 26 Jun 2007 20:04:34 +0300
 
-ktorrent (2.2~rc1.dfsg.1-2) experimental; urgency=low
-
-  [Modestas Vainius]
-  * Add patch 14_wz_tooltip_CVE-2007-3154.diff - fixes CVE-2007-3154.
-    The patch is based on wz_tooltip.js from eGroupWare 1.4.001
-    (Closes: #429209).
-  * Fix "debian-rules-ignores-make-clean-error" lintian warning.
-
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 26 Jun 2007 11:46:30 +0300
-
 ktorrent (2.2~rc1.dfsg.1-1) experimental; urgency=low
 
   [Modestas Vainius]
@@ -23,10 +13,14 @@
     - 10_use_system_geoip.diff - fix offsets.
     - 11_flagdb-alternative-source.diff - fix offsets.
     - 98_buildprep.diff - regenerate.
+  * Add patch 14_wz_tooltip_CVE-2007-3154.diff - fixes CVE-2007-3154.
+    The patch is based on wz_tooltip.js from eGroupWare 1.4.001
+    (Closes: #429209).
+  * Fix "debian-rules-ignores-make-clean-error" lintian warning.
   * Use ${binary:Version} instead of ${Source-Version} for ktorrent-dbg
     dependency on ktorrent.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 16 Jun 2007 11:54:04 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 26 Jun 2007 11:17:02 +0300
 
 ktorrent (2.2~beta1.dfsg.1-2) experimental; urgency=low
 

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-26 16:36:07 UTC (rev 6588)
+++ kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff	2007-06-26 17:44:37 UTC (rev 6589)
@@ -108,7 +108,7 @@
 +
 +bool kt::FlagDB::isFlagAvailable(const QString& country)
 +{
-+	return getFlag(country).isNull();
++	return !getFlag(country).isNull();
 +}
 +
 +const QPixmap& kt::FlagDB::getFlag(const QString& country)