rev 6560 - in kde-extras/klibido: tags tags/0.2.5-5/debian tags/0.2.5-5/debian/patches trunk/debian trunk/debian/patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sat Jun 23 16:14:44 UTC 2007
Author: fboudra-guest
Date: 2007-06-23 16:14:44 +0000 (Sat, 23 Jun 2007)
New Revision: 6560
Added:
kde-extras/klibido/tags/0.2.5-5/
kde-extras/klibido/tags/0.2.5-5/debian/patches/11_ftbfs_with_gcc_4_3.diff
kde-extras/klibido/tags/0.2.5-5/debian/patches/17_increase_connection_limit.diff
kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_3.diff
kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff
Removed:
kde-extras/klibido/tags/0.2.5-5/debian/patches/Bug#417316-GCC4.3.diff
kde-extras/klibido/trunk/debian/patches/Bug#417316-GCC4.3.diff
Modified:
kde-extras/klibido/tags/0.2.5-5/debian/changelog
kde-extras/klibido/tags/0.2.5-5/debian/control
kde-extras/klibido/tags/0.2.5-5/debian/patches/16_nzb_arg.diff
kde-extras/klibido/tags/0.2.5-5/debian/rules
kde-extras/klibido/trunk/debian/changelog
kde-extras/klibido/trunk/debian/control
kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff
kde-extras/klibido/trunk/debian/rules
Log:
Tags klibido 0.2.5-5
* Add patch to enable support for up to 20 simultaneous server connections
instead of the default limit of 10. This will allow users with Giganews
accounts to take full advantage of their max connections allowed.
(Closes: #430196)
* Add patch to fix ftbfs with GCC 4.3. Thanks to Martin Michlmayr.
(Closes: #417316)
Copied: kde-extras/klibido/tags/0.2.5-5 (from rev 6559, kde-extras/klibido/trunk)
Modified: kde-extras/klibido/tags/0.2.5-5/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/tags/0.2.5-5/debian/changelog 2007-06-23 16:14:44 UTC (rev 6560)
@@ -1,13 +1,14 @@
-klibido (0.2.5-5) UNRELEASED; urgency=low
+klibido (0.2.5-5) unstable; urgency=low
- * NOT RELEASED YET
- * Include gcc4.3 patch from Martin (Closes: #417316)
+ * Add patch to enable support for up to 20 simultaneous server connections
+ instead of the default limit of 10. This will allow users with Giganews
+ accounts to take full advantage of their max connections allowed.
+ (Closes: #430196)
+ * Add patch to fix ftbfs with GCC 4.3. Thanks to Martin Michlmayr.
+ (Closes: #417316)
- * TODO: Trying patch debian/patches/Bug#417316-GCC4.3.diff at level 1
- ... 0 ... 2 ... failure.
+ -- Fathi Boudra <fboudra at free.fr> Sat, 23 Jun 2007 16:46:30 +0200
- -- Mark Purcell <msp at debian.org> Thu, 03 May 2007 21:03:58 +0100
-
klibido (0.2.5-4) experimental; urgency=low
[ Mark Purcell ]
Modified: kde-extras/klibido/tags/0.2.5-5/debian/control
===================================================================
--- kde-extras/klibido/trunk/debian/control 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/tags/0.2.5-5/debian/control 2007-06-23 16:14:44 UTC (rev 6560)
@@ -3,7 +3,7 @@
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>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, kdelibs4-dev,
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, kdelibs4-dev, chrpath,
libdb4.3++-dev, libuu-dev
Standards-Version: 3.7.2
Added: kde-extras/klibido/tags/0.2.5-5/debian/patches/11_ftbfs_with_gcc_4_3.diff
===================================================================
--- kde-extras/klibido/tags/0.2.5-5/debian/patches/11_ftbfs_with_gcc_4_3.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-5/debian/patches/11_ftbfs_with_gcc_4_3.diff 2007-06-23 16:14:44 UTC (rev 6560)
@@ -0,0 +1,79 @@
+diff -Nur klibido-0.2.5/src/grouplist.cpp klibido-0.2.5.new/src/grouplist.cpp
+--- klibido-0.2.5/src/grouplist.cpp 2006-02-27 00:47:02.000000000 +0100
++++ klibido-0.2.5.new/src/grouplist.cpp 2007-06-23 16:58:57.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include "grouplist.h"
+ #include "binheader.h"
+ #include <kmessagebox.h>
++#include <cstdlib>
+ #include <assert.h>
+ #include <kiconloader.h>
+ #include "progress.h"
+diff -Nur klibido-0.2.5/src/headerlist.cpp klibido-0.2.5.new/src/headerlist.cpp
+--- klibido-0.2.5/src/headerlist.cpp 2006-02-27 00:47:02.000000000 +0100
++++ klibido-0.2.5.new/src/headerlist.cpp 2007-06-23 16:59:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <kmessagebox.h>
+ #include <klocale.h>
+ #include "progress.h"
++#include <cstdlib>
+ #include <errno.h>
+ #include <kprogress.h>
+ #include <qregexp.h>
+diff -Nur klibido-0.2.5/src/hlistviewitem.cpp klibido-0.2.5.new/src/hlistviewitem.cpp
+--- klibido-0.2.5/src/hlistviewitem.cpp 2006-01-10 16:07:34.000000000 +0100
++++ klibido-0.2.5.new/src/hlistviewitem.cpp 2007-06-23 16:59:53.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "newsgroup.h"
+ #include <qpainter.h>
+ #include <klocale.h>
++#include <cstdlib>
+ /*
+ static const char *patterns[] = { "\\d+\\.(?:avi|mpg|mpeg|wmv)", //.nn.avi
+ "(?:avi|mpg|mpeg|wmv)\\.\\d+)", //.avi.nn
+diff -Nur klibido-0.2.5/src/nntpthreadsocket.cpp klibido-0.2.5.new/src/nntpthreadsocket.cpp
+--- klibido-0.2.5/src/nntpthreadsocket.cpp 2006-02-12 09:04:51.000000000 +0100
++++ klibido-0.2.5.new/src/nntpthreadsocket.cpp 2007-06-23 17:00:28.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include "nntpthreadsocket.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <cstdlib>
+ #include <assert.h>
+ #include <netdb.h>
+ #include <sys/poll.h>
+diff -Nur klibido-0.2.5/src/qmgr.cpp klibido-0.2.5.new/src/qmgr.cpp
+--- klibido-0.2.5/src/qmgr.cpp 2006-02-12 09:04:51.000000000 +0100
++++ klibido-0.2.5.new/src/qmgr.cpp 2007-06-23 17:01:25.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include <qdatetime.h>
+ #include "nzbform.h"
+ #include "mylistview.h"
+-
++#include <cstdlib>
+
+ extern bool g_qResume;
+ extern bool g_qDiscard;
+diff -Nur klibido-0.2.5/src/queueparts.cpp klibido-0.2.5.new/src/queueparts.cpp
+--- klibido-0.2.5/src/queueparts.cpp 2006-02-12 09:04:51.000000000 +0100
++++ klibido-0.2.5.new/src/queueparts.cpp 2007-06-23 17:01:02.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ #include "queueparts.h"
+ #include <qfileinfo.h>
+-
++#include <cstdlib>
+
+
+
+diff -Nur klibido-0.2.5/src/updatedb.cpp klibido-0.2.5.new/src/updatedb.cpp
+--- klibido-0.2.5/src/updatedb.cpp 2006-02-17 12:28:46.000000000 +0100
++++ klibido-0.2.5.new/src/updatedb.cpp 2007-06-23 17:01:54.000000000 +0200
+@@ -20,6 +20,7 @@
+
+ #include "updatedb.h"
+ #include "binheader.h"
++#include <cstdlib>
+
+ //CACHE PARAMETERS
+ #define CACHESIZE 503
Modified: kde-extras/klibido/tags/0.2.5-5/debian/patches/16_nzb_arg.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/tags/0.2.5-5/debian/patches/16_nzb_arg.diff 2007-06-23 16:14:44 UTC (rev 6560)
@@ -74,11 +74,11 @@
diff -Nur klibido-0.2.5/src/qmgr.cpp klibido-0.2.5.new/src/qmgr.cpp
--- klibido-0.2.5/src/qmgr.cpp 2006-02-12 09:04:51.000000000 +0100
+++ klibido-0.2.5.new/src/qmgr.cpp 2007-01-26 18:46:16.000000000 +0100
-@@ -29,12 +29,11 @@
+@@ -29,12 +29,12 @@
#include <qdatetime.h>
#include "nzbform.h"
#include "mylistview.h"
--
+ #include <cstdlib>
+#include <kcmdlineargs.h>
extern bool g_qResume;
@@ -88,7 +88,7 @@
QMgr::QMgr(Servers *_servers, Db *_gdb, QString caption, QWidget* parent) : KMdiChildView(caption,parent), servers(_servers), gdb(_gdb)
{
// kdDebug() << "KConstructor\n";
-@@ -2570,9 +2569,19 @@
+@@ -2570,9 +2569,21 @@
void QMgr::slotOpenNzb( )
{
@@ -108,6 +108,8 @@
+ kdDebug() << "Opened " << nzbFilename << endl;
+ }
+
++ args->clear();
++
if (nzbFilename.isNull())
return;
Added: kde-extras/klibido/tags/0.2.5-5/debian/patches/17_increase_connection_limit.diff
===================================================================
--- kde-extras/klibido/tags/0.2.5-5/debian/patches/17_increase_connection_limit.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-5/debian/patches/17_increase_connection_limit.diff 2007-06-23 16:14:44 UTC (rev 6560)
@@ -0,0 +1,21 @@
+diff -Nur klibido-0.2.5/src/addserver.cpp klibido-0.2.5.new/src/addserver.cpp
+--- klibido-0.2.5/src/addserver.cpp 2006-01-06 16:44:19.000000000 +0100
++++ klibido-0.2.5.new/src/addserver.cpp 2007-06-23 16:52:19.000000000 +0200
+@@ -27,7 +27,7 @@
+ buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
+ buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
+ m_priorityInput->setRange(1,10,1,false);
+- m_threadInput->setRange(1,10,1,false);
++ m_threadInput->setRange(1,20,1,false);
+ m_timeoutInput->setRange(60,600,5,false);
+ m_threadTimeoutInput->setRange(1,30,1,false);
+ validator=new QIntValidator(1,65535,this);
+@@ -90,7 +90,7 @@
+ buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
+ buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
+ m_priorityInput->setRange(1,10,1,false);
+- m_threadInput->setRange(1,10,1,false);
++ m_threadInput->setRange(1,20,1,false);
+ m_timeoutInput->setRange(60,600,5,false);
+ m_threadTimeoutInput->setRange(1,30,1,false);
+ validator=new QIntValidator(1,65535,this);
Deleted: kde-extras/klibido/tags/0.2.5-5/debian/patches/Bug#417316-GCC4.3.diff
Modified: kde-extras/klibido/tags/0.2.5-5/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/tags/0.2.5-5/debian/rules 2007-06-23 16:14:44 UTC (rev 6560)
@@ -16,6 +16,7 @@
binary-post-install/klibido::
rm -rf debian/klibido/usr/share/applnk/Utilities/
+ chrpath -d debian/klibido/usr/bin/klibido
get-orig-source:
@@dh_testdir
Modified: kde-extras/klibido/trunk/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/trunk/debian/changelog 2007-06-23 16:14:44 UTC (rev 6560)
@@ -1,13 +1,14 @@
-klibido (0.2.5-5) UNRELEASED; urgency=low
+klibido (0.2.5-5) unstable; urgency=low
- * NOT RELEASED YET
- * Include gcc4.3 patch from Martin (Closes: #417316)
+ * Add patch to enable support for up to 20 simultaneous server connections
+ instead of the default limit of 10. This will allow users with Giganews
+ accounts to take full advantage of their max connections allowed.
+ (Closes: #430196)
+ * Add patch to fix ftbfs with GCC 4.3. Thanks to Martin Michlmayr.
+ (Closes: #417316)
- * TODO: Trying patch debian/patches/Bug#417316-GCC4.3.diff at level 1
- ... 0 ... 2 ... failure.
+ -- Fathi Boudra <fboudra at free.fr> Sat, 23 Jun 2007 16:46:30 +0200
- -- Mark Purcell <msp at debian.org> Thu, 03 May 2007 21:03:58 +0100
-
klibido (0.2.5-4) experimental; urgency=low
[ Mark Purcell ]
Modified: kde-extras/klibido/trunk/debian/control
===================================================================
--- kde-extras/klibido/trunk/debian/control 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/trunk/debian/control 2007-06-23 16:14:44 UTC (rev 6560)
@@ -3,7 +3,7 @@
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>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, kdelibs4-dev,
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, kdelibs4-dev, chrpath,
libdb4.3++-dev, libuu-dev
Standards-Version: 3.7.2
Added: kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_3.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_3.diff (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_3.diff 2007-06-23 16:14:44 UTC (rev 6560)
@@ -0,0 +1,79 @@
+diff -Nur klibido-0.2.5/src/grouplist.cpp klibido-0.2.5.new/src/grouplist.cpp
+--- klibido-0.2.5/src/grouplist.cpp 2006-02-27 00:47:02.000000000 +0100
++++ klibido-0.2.5.new/src/grouplist.cpp 2007-06-23 16:58:57.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include "grouplist.h"
+ #include "binheader.h"
+ #include <kmessagebox.h>
++#include <cstdlib>
+ #include <assert.h>
+ #include <kiconloader.h>
+ #include "progress.h"
+diff -Nur klibido-0.2.5/src/headerlist.cpp klibido-0.2.5.new/src/headerlist.cpp
+--- klibido-0.2.5/src/headerlist.cpp 2006-02-27 00:47:02.000000000 +0100
++++ klibido-0.2.5.new/src/headerlist.cpp 2007-06-23 16:59:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <kmessagebox.h>
+ #include <klocale.h>
+ #include "progress.h"
++#include <cstdlib>
+ #include <errno.h>
+ #include <kprogress.h>
+ #include <qregexp.h>
+diff -Nur klibido-0.2.5/src/hlistviewitem.cpp klibido-0.2.5.new/src/hlistviewitem.cpp
+--- klibido-0.2.5/src/hlistviewitem.cpp 2006-01-10 16:07:34.000000000 +0100
++++ klibido-0.2.5.new/src/hlistviewitem.cpp 2007-06-23 16:59:53.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "newsgroup.h"
+ #include <qpainter.h>
+ #include <klocale.h>
++#include <cstdlib>
+ /*
+ static const char *patterns[] = { "\\d+\\.(?:avi|mpg|mpeg|wmv)", //.nn.avi
+ "(?:avi|mpg|mpeg|wmv)\\.\\d+)", //.avi.nn
+diff -Nur klibido-0.2.5/src/nntpthreadsocket.cpp klibido-0.2.5.new/src/nntpthreadsocket.cpp
+--- klibido-0.2.5/src/nntpthreadsocket.cpp 2006-02-12 09:04:51.000000000 +0100
++++ klibido-0.2.5.new/src/nntpthreadsocket.cpp 2007-06-23 17:00:28.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include "nntpthreadsocket.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <cstdlib>
+ #include <assert.h>
+ #include <netdb.h>
+ #include <sys/poll.h>
+diff -Nur klibido-0.2.5/src/qmgr.cpp klibido-0.2.5.new/src/qmgr.cpp
+--- klibido-0.2.5/src/qmgr.cpp 2006-02-12 09:04:51.000000000 +0100
++++ klibido-0.2.5.new/src/qmgr.cpp 2007-06-23 17:01:25.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include <qdatetime.h>
+ #include "nzbform.h"
+ #include "mylistview.h"
+-
++#include <cstdlib>
+
+ extern bool g_qResume;
+ extern bool g_qDiscard;
+diff -Nur klibido-0.2.5/src/queueparts.cpp klibido-0.2.5.new/src/queueparts.cpp
+--- klibido-0.2.5/src/queueparts.cpp 2006-02-12 09:04:51.000000000 +0100
++++ klibido-0.2.5.new/src/queueparts.cpp 2007-06-23 17:01:02.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ #include "queueparts.h"
+ #include <qfileinfo.h>
+-
++#include <cstdlib>
+
+
+
+diff -Nur klibido-0.2.5/src/updatedb.cpp klibido-0.2.5.new/src/updatedb.cpp
+--- klibido-0.2.5/src/updatedb.cpp 2006-02-17 12:28:46.000000000 +0100
++++ klibido-0.2.5.new/src/updatedb.cpp 2007-06-23 17:01:54.000000000 +0200
+@@ -20,6 +20,7 @@
+
+ #include "updatedb.h"
+ #include "binheader.h"
++#include <cstdlib>
+
+ //CACHE PARAMETERS
+ #define CACHESIZE 503
Modified: kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff 2007-06-23 16:14:44 UTC (rev 6560)
@@ -74,11 +74,11 @@
diff -Nur klibido-0.2.5/src/qmgr.cpp klibido-0.2.5.new/src/qmgr.cpp
--- klibido-0.2.5/src/qmgr.cpp 2006-02-12 09:04:51.000000000 +0100
+++ klibido-0.2.5.new/src/qmgr.cpp 2007-01-26 18:46:16.000000000 +0100
-@@ -29,12 +29,11 @@
+@@ -29,12 +29,12 @@
#include <qdatetime.h>
#include "nzbform.h"
#include "mylistview.h"
--
+ #include <cstdlib>
+#include <kcmdlineargs.h>
extern bool g_qResume;
@@ -88,7 +88,7 @@
QMgr::QMgr(Servers *_servers, Db *_gdb, QString caption, QWidget* parent) : KMdiChildView(caption,parent), servers(_servers), gdb(_gdb)
{
// kdDebug() << "KConstructor\n";
-@@ -2570,9 +2569,19 @@
+@@ -2570,9 +2569,21 @@
void QMgr::slotOpenNzb( )
{
@@ -108,6 +108,8 @@
+ kdDebug() << "Opened " << nzbFilename << endl;
+ }
+
++ args->clear();
++
if (nzbFilename.isNull())
return;
Added: kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff 2007-06-23 16:14:44 UTC (rev 6560)
@@ -0,0 +1,21 @@
+diff -Nur klibido-0.2.5/src/addserver.cpp klibido-0.2.5.new/src/addserver.cpp
+--- klibido-0.2.5/src/addserver.cpp 2006-01-06 16:44:19.000000000 +0100
++++ klibido-0.2.5.new/src/addserver.cpp 2007-06-23 16:52:19.000000000 +0200
+@@ -27,7 +27,7 @@
+ buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
+ buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
+ m_priorityInput->setRange(1,10,1,false);
+- m_threadInput->setRange(1,10,1,false);
++ m_threadInput->setRange(1,20,1,false);
+ m_timeoutInput->setRange(60,600,5,false);
+ m_threadTimeoutInput->setRange(1,30,1,false);
+ validator=new QIntValidator(1,65535,this);
+@@ -90,7 +90,7 @@
+ buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
+ buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
+ m_priorityInput->setRange(1,10,1,false);
+- m_threadInput->setRange(1,10,1,false);
++ m_threadInput->setRange(1,20,1,false);
+ m_timeoutInput->setRange(60,600,5,false);
+ m_threadTimeoutInput->setRange(1,30,1,false);
+ validator=new QIntValidator(1,65535,this);
Deleted: kde-extras/klibido/trunk/debian/patches/Bug#417316-GCC4.3.diff
Modified: kde-extras/klibido/trunk/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules 2007-06-23 13:11:32 UTC (rev 6559)
+++ kde-extras/klibido/trunk/debian/rules 2007-06-23 16:14:44 UTC (rev 6560)
@@ -16,6 +16,7 @@
binary-post-install/klibido::
rm -rf debian/klibido/usr/share/applnk/Utilities/
+ chrpath -d debian/klibido/usr/bin/klibido
get-orig-source:
@@dh_testdir
More information about the pkg-kde-commits
mailing list