rev 4684 - in kde-extras/klibido: tags tags/0.2.5-3/debian tags/0.2.5-3/debian/patches trunk/debian trunk/debian/patches

Fathi Boudra fboudra-guest at costa.debian.org
Sat Oct 14 16:39:27 UTC 2006


Author: fboudra-guest
Date: 2006-10-14 16:39:27 +0000 (Sat, 14 Oct 2006)
New Revision: 4684

Added:
   kde-extras/klibido/tags/0.2.5-3/
   kde-extras/klibido/tags/0.2.5-3/debian/patches/14_error_parsing_xover.diff
   kde-extras/klibido/tags/0.2.5-3/debian/patches/15_crash_pausing_downloads.diff
   kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff
   kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff
Modified:
   kde-extras/klibido/tags/0.2.5-3/debian/changelog
   kde-extras/klibido/tags/0.2.5-3/debian/control
   kde-extras/klibido/tags/0.2.5-3/debian/rules
   kde-extras/klibido/trunk/debian/changelog
   kde-extras/klibido/trunk/debian/control
   kde-extras/klibido/trunk/debian/rules
Log:
tags klibido 0.2.5-3

Copied: kde-extras/klibido/tags/0.2.5-3 (from rev 4680, kde-extras/klibido/trunk)

Modified: kde-extras/klibido/tags/0.2.5-3/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog	2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/klibido/tags/0.2.5-3/debian/changelog	2006-10-14 16:39:27 UTC (rev 4684)
@@ -1,14 +1,16 @@
-klibido (0.2.5-3) UNRELEASED; urgency=low
+klibido (0.2.5-3) unstable; urgency=low
 
   [ Fathi Boudra ]
   * merged patches from ubuntu:
     * fix desktop file
     * add kdepot
+  * Fix error parsing xover. Thanks to Christian Pernegger (Closes: #364117)
+  * Fix crash when pausing downloads. Thanks to Jerome Marant (Closes: #379232)
 
   [ Gonéri Le Bouder ]
   * remove myself from uploader
 
- -- Fathi Boudra <fboudra at free.fr>  Thu, 21 Sep 2006 15:02:08 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Sat, 14 Oct 2006 17:44:56 +0200
 
 klibido (0.2.5-2) unstable; urgency=low
 

Modified: kde-extras/klibido/tags/0.2.5-3/debian/control
===================================================================
--- kde-extras/klibido/trunk/debian/control	2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/klibido/tags/0.2.5-3/debian/control	2006-10-14 16:39:27 UTC (rev 4684)
@@ -2,9 +2,9 @@
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
+Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev, kdelibs4-dev, libdb4.3++-dev, libuu-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: klibido
 Architecture: any

Added: kde-extras/klibido/tags/0.2.5-3/debian/patches/14_error_parsing_xover.diff
===================================================================
--- kde-extras/klibido/tags/0.2.5-3/debian/patches/14_error_parsing_xover.diff	                        (rev 0)
+++ kde-extras/klibido/tags/0.2.5-3/debian/patches/14_error_parsing_xover.diff	2006-10-14 16:39:27 UTC (rev 4684)
@@ -0,0 +1,30 @@
+diff -Nur klibido-0.2.5/src/header.cpp klibido-0.2.5.new/src/header.cpp
+--- klibido-0.2.5/src/header.cpp	2005-05-05 03:00:20.000000000 +0200
++++ klibido-0.2.5.new/src/header.cpp	2006-04-24 17:18:34.000000000 +0200
+@@ -168,7 +168,7 @@
+ 
+ Header::Header( QStringList field)
+ {
+-	if (field.count() != 9) {
++	if (field.count() < 9) {
+ 		qDebug("Error parsing xover");
+ 		qDebug("Article number: %s", (const char *) field[0]);
+ 		qDebug("Filed 2: %s", (const char *) field[1]);
+@@ -191,7 +191,7 @@
+ Header::Header( QString s)
+ {
+ 	QStringList field=QStringList::split('\t', s, true);
+-	if (field.count() != 9) {
++	if (field.count() < 9) {
+ 		qDebug("Error parsing xover: %s", (const char *) s);
+ 		ok=false;
+ 	} else ok=true;
+@@ -207,7 +207,7 @@
+ Header::Header(char *l) {
+ 	QString s=l;
+ 	QStringList field=QStringList::split('\t', s, true);
+-	if (field.count() != 9) {
++	if (field.count() < 9) {
+ 		kdDebug() << "Error parsing xover:" << s << endl;
+ 		kdDebug() << "String was: " << l <<endl;
+ 		

Added: kde-extras/klibido/tags/0.2.5-3/debian/patches/15_crash_pausing_downloads.diff
===================================================================
--- kde-extras/klibido/tags/0.2.5-3/debian/patches/15_crash_pausing_downloads.diff	                        (rev 0)
+++ kde-extras/klibido/tags/0.2.5-3/debian/patches/15_crash_pausing_downloads.diff	2006-10-14 16:39:27 UTC (rev 4684)
@@ -0,0 +1,12 @@
+diff -Nur klibido-0.2.5/src/klibido.cpp klibido-0.2.5.new/src/klibido.cpp
+--- klibido-0.2.5/src/klibido.cpp	2006-03-04 11:29:01.000000000 +0100
++++ klibido-0.2.5.new/src/klibido.cpp	2006-10-14 18:08:06.000000000 +0200
+@@ -662,7 +662,7 @@
+ 
+ void klibido::slotPauseQ( )
+ {
+-	KToggleAction *actionQ=(KToggleAction*)actionCollection()->action(i18n("pause_queue"));
++	KToggleAction *actionQ=(KToggleAction*)actionCollection()->action("pause_queue");
+ 	if (actionQ->isChecked()) { //Pause the queue
+ 		actionQ->setText(("Resume Queue"));
+ 		actionQ->setIconSet(KGlobal::iconLoader()->loadIcon("connect_no",KIcon::Toolbar, 0, false));

Modified: kde-extras/klibido/tags/0.2.5-3/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules	2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/klibido/tags/0.2.5-3/debian/rules	2006-10-14 16:39:27 UTC (rev 4684)
@@ -13,9 +13,3 @@
 binary-post-install/klibido::
 	rm -rf debian/klibido/usr/share/applnk/Utilities/
 
-
-get-orig-source:
-	 @@dh_testdir
-	 @@[ -d ../tarballs/. ]
-	 @@dpatch-get-origtargz ../tarballs
-

Modified: kde-extras/klibido/trunk/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog	2006-10-14 15:29:03 UTC (rev 4683)
+++ kde-extras/klibido/trunk/debian/changelog	2006-10-14 16:39:27 UTC (rev 4684)
@@ -1,14 +1,16 @@
-klibido (0.2.5-3) UNRELEASED; urgency=low
+klibido (0.2.5-3) unstable; urgency=low
 
   [ Fathi Boudra ]
   * merged patches from ubuntu:
     * fix desktop file
     * add kdepot
+  * Fix error parsing xover. Thanks to Christian Pernegger (Closes: #364117)
+  * Fix crash when pausing downloads. Thanks to Jerome Marant (Closes: #379232)
 
   [ Gonéri Le Bouder ]
   * remove myself from uploader
 
- -- Fathi Boudra <fboudra at free.fr>  Thu, 21 Sep 2006 15:02:08 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Sat, 14 Oct 2006 17:44:56 +0200
 
 klibido (0.2.5-2) unstable; urgency=low
 

Modified: kde-extras/klibido/trunk/debian/control
===================================================================
--- kde-extras/klibido/trunk/debian/control	2006-10-14 15:29:03 UTC (rev 4683)
+++ kde-extras/klibido/trunk/debian/control	2006-10-14 16:39:27 UTC (rev 4684)
@@ -2,9 +2,9 @@
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
+Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev, kdelibs4-dev, libdb4.3++-dev, libuu-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: klibido
 Architecture: any

Added: kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff	                        (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff	2006-10-14 16:39:27 UTC (rev 4684)
@@ -0,0 +1,30 @@
+diff -Nur klibido-0.2.5/src/header.cpp klibido-0.2.5.new/src/header.cpp
+--- klibido-0.2.5/src/header.cpp	2005-05-05 03:00:20.000000000 +0200
++++ klibido-0.2.5.new/src/header.cpp	2006-04-24 17:18:34.000000000 +0200
+@@ -168,7 +168,7 @@
+ 
+ Header::Header( QStringList field)
+ {
+-	if (field.count() != 9) {
++	if (field.count() < 9) {
+ 		qDebug("Error parsing xover");
+ 		qDebug("Article number: %s", (const char *) field[0]);
+ 		qDebug("Filed 2: %s", (const char *) field[1]);
+@@ -191,7 +191,7 @@
+ Header::Header( QString s)
+ {
+ 	QStringList field=QStringList::split('\t', s, true);
+-	if (field.count() != 9) {
++	if (field.count() < 9) {
+ 		qDebug("Error parsing xover: %s", (const char *) s);
+ 		ok=false;
+ 	} else ok=true;
+@@ -207,7 +207,7 @@
+ Header::Header(char *l) {
+ 	QString s=l;
+ 	QStringList field=QStringList::split('\t', s, true);
+-	if (field.count() != 9) {
++	if (field.count() < 9) {
+ 		kdDebug() << "Error parsing xover:" << s << endl;
+ 		kdDebug() << "String was: " << l <<endl;
+ 		

Added: kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff	                        (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff	2006-10-14 16:39:27 UTC (rev 4684)
@@ -0,0 +1,12 @@
+diff -Nur klibido-0.2.5/src/klibido.cpp klibido-0.2.5.new/src/klibido.cpp
+--- klibido-0.2.5/src/klibido.cpp	2006-03-04 11:29:01.000000000 +0100
++++ klibido-0.2.5.new/src/klibido.cpp	2006-10-14 18:08:06.000000000 +0200
+@@ -662,7 +662,7 @@
+ 
+ void klibido::slotPauseQ( )
+ {
+-	KToggleAction *actionQ=(KToggleAction*)actionCollection()->action(i18n("pause_queue"));
++	KToggleAction *actionQ=(KToggleAction*)actionCollection()->action("pause_queue");
+ 	if (actionQ->isChecked()) { //Pause the queue
+ 		actionQ->setText(("Resume Queue"));
+ 		actionQ->setIconSet(KGlobal::iconLoader()->loadIcon("connect_no",KIcon::Toolbar, 0, false));

Modified: kde-extras/klibido/trunk/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules	2006-10-14 15:29:03 UTC (rev 4683)
+++ kde-extras/klibido/trunk/debian/rules	2006-10-14 16:39:27 UTC (rev 4684)
@@ -13,9 +13,3 @@
 binary-post-install/klibido::
 	rm -rf debian/klibido/usr/share/applnk/Utilities/
 
-
-get-orig-source:
-	 @@dh_testdir
-	 @@[ -d ../tarballs/. ]
-	 @@dpatch-get-origtargz ../tarballs
-




More information about the pkg-kde-commits mailing list