rev 17503 - in kde-extras/klibido/tags: . 0.2.5-7/debian 0.2.5-7/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Tue Mar 23 10:28:57 UTC 2010
Author: fabo
Date: 2010-03-23 10:28:56 +0000 (Tue, 23 Mar 2010)
New Revision: 17503
Added:
kde-extras/klibido/tags/0.2.5-7/
kde-extras/klibido/tags/0.2.5-7/debian/changelog
kde-extras/klibido/tags/0.2.5-7/debian/compat
kde-extras/klibido/tags/0.2.5-7/debian/control
kde-extras/klibido/tags/0.2.5-7/debian/copyright
kde-extras/klibido/tags/0.2.5-7/debian/klibidoload
kde-extras/klibido/tags/0.2.5-7/debian/newzleech.desktop
kde-extras/klibido/tags/0.2.5-7/debian/patches/10_add_debianrules.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/10_autoconf.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_1.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_3.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/12_fix_desktop_file.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/13_kdepot.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/14_error_parsing_xover.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/15_crash_pausing_downloads.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/16_nzb_arg.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/17_increase_connection_limit.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/18_ipv6.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/series
kde-extras/klibido/tags/0.2.5-7/debian/rules
kde-extras/klibido/tags/0.2.5-7/debian/source/
Removed:
kde-extras/klibido/tags/0.2.5-7/debian/README.Debian
kde-extras/klibido/tags/0.2.5-7/debian/binsearch.desktop
kde-extras/klibido/tags/0.2.5-7/debian/changelog
kde-extras/klibido/tags/0.2.5-7/debian/compat
kde-extras/klibido/tags/0.2.5-7/debian/control
kde-extras/klibido/tags/0.2.5-7/debian/copyright
kde-extras/klibido/tags/0.2.5-7/debian/patches/10_add_debianrules.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_1.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_3.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/12_fix_desktop_file.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/13_kdepot.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/14_error_parsing_xover.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/15_crash_pausing_downloads.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/16_nzb_arg.diff
kde-extras/klibido/tags/0.2.5-7/debian/patches/17_increase_connection_limit.diff
kde-extras/klibido/tags/0.2.5-7/debian/rules
Log:
Tagging klibido 0.2.5-7
Copied: kde-extras/klibido/tags/0.2.5-7/debian/changelog (from rev 17502, kde-extras/klibido/trunk/debian/changelog)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/changelog (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/changelog 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,110 @@
+klibido (0.2.5-7) unstable; urgency=low
+
+ * Add 18_ipv6.diff patch: it adds a name lookup for an IPv6 address
+ if no IPv4 address is found. Thanks to Martin Kotzan. (Closes: #517299)
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Update debian/control:
+ - Update build dependencies (debhelper, automake1.9 and libtool).
+ (Closes: 513919)
+ - Bump Standards-Version to 3.8.4 (no changes needed).
+ * Merge changes from ubuntu:
+ - Escape $1 in klibidoload to handle files with Spaces correctly
+ (LP: #246350)
+ - In debian rules remove applnk/ instead of just applnk/Utilities/
+ - Add final new line to debian/newzleech.desktop
+ - Added patch 10_autoconf.patch:
+ - make it possible to run buildprep with modern autotools
+ - Rewrote 16_nzb_arg.patch:
+ - make nzb file download "dcopable", and klibido a kuniqueapplication
+ - Removed binsearch.desktop, Added newzleech.desktop:
+ - newzleech works much better
+ - Added klibidoload script to start klibido and use dcop call for nzb
+ if needed
+ - Fixed 12_fix_desktop_file.patch:
+ - uses klibidoload startup script and associate with x-nzb mimetype
+
+ -- Fathi Boudra <fabo at debian.org> Tue, 23 Mar 2010 10:25:32 +0100
+
+klibido (0.2.5-6) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * Switch to db4.6. Get rid of db4.3. (Closes: 442659)
+ * Update email address.
+
+ [ Ana Beatriz Guerrero López ]
+
+ * Move homepage to source field.
+ * Capitalize KDE in the description.
+ * Remove broken watch file. (Closes: #453540)
+ * Update menu file to new policy.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sat, 27 Sep 2008 19:14:38 +0200
+
+klibido (0.2.5-5) unstable; urgency=low
+
+ * 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)
+
+ -- Fathi Boudra <fboudra at free.fr> Sat, 23 Jun 2007 16:46:30 +0200
+
+klibido (0.2.5-4) experimental; urgency=low
+
+ [ Mark Purcell ]
+ * Add ./debian/rules get-orig-source for http://buildserver.net
+
+ [ Fathi Boudra ]
+ * Merged changes from ubuntu, Thanks to Anthony Mercatante:
+ * nzb_arg patch: makes it possible to start klibido opening a nzb file as
+ arg and adds nzb mimetype in klibido.desktop.
+ * binsearch.desktop: binsearch search engine is available in konqueror.
+
+ -- Fathi Boudra <fboudra at free.fr> Wed, 31 Jan 2007 22:30:34 +0100
+
+klibido (0.2.5-3) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * Bumped standards version to 3.7.2
+ * 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> Sat, 14 Oct 2006 17:44:56 +0200
+
+klibido (0.2.5-2) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * add --disable-debug to configure script (Closes: #361243)
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 7 Apr 2006 14:52:59 +0200
+
+klibido (0.2.5-1) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * New upstream release (closes: #360580)
+ * Added dirs, docs, watch files
+ * Converted to cdbs
+ * Updated compat, control, copyright files
+ * Removed klibido.manpages, installed by rules
+ * Renamed klibido.menu to menu
+ * Clean up rules
+ * Fixed common kde doc link
+ * Updated config.guess and config.sub (closes: #329439)
+ * Fixed FTBFS with gcc4.1 thanks to Martin Michlmayr (closes: #355986)
+ * Maintainer changed to Debian KDE Extras Team
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Wed, 8 Mar 2006 12:33:30 +0100
+
+klibido (0.2.4.1-1) unstable; urgency=low
+
+ * Initial Release (closes: Bug#298602)
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Wed, 14 Sep 2005 21:09:59 +0000
Copied: kde-extras/klibido/tags/0.2.5-7/debian/compat (from rev 17502, kde-extras/klibido/trunk/debian/compat)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/compat (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/compat 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1 @@
+7
Copied: kde-extras/klibido/tags/0.2.5-7/debian/control (from rev 17502, kde-extras/klibido/trunk/debian/control)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/control (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/control 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,37 @@
+Source: klibido
+Section: kde
+Priority: optional
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
+Build-Depends: cdbs, debhelper (>= 7.4.15), automake1.9, libtool (>= 1.5.26),
+ kdelibs4-dev, chrpath, libdb4.6++-dev, libuu-dev
+Standards-Version: 3.8.4
+Homepage: http://klibido.sourceforge.net
+
+Package: klibido
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: usenet binary grabber for KDE
+ KLibido is a KDE program to download encoded articles from the usenet news
+ service, using the nntp protocol. It supports multiple servers, multiple
+ download threads per server, automatic joining and decoding of articles.
+ .
+ KLibido is not a newsreader. It doesn't let you easily display the articles,
+ only their subject, and it discards all non-binary posts. If you want a nice
+ newsreader for KDE, try KNode.
+ .
+ Features include:
+ - Getting the group list and subscribe to newsgroups
+ - Getting headers, sorting, filtering by subject, state and "completeness"
+ - downloading and decoding of binary posts (including yEnc).
+ - Queue management: it's possible to drag and drop items around in the
+ download queue to change the order of download, pause the queue, pause
+ and cancel the items in the queue.
+ - Server priorities and balancing
+ - Requeueing: if an article fails on a server, it is automatically tried on
+ the other servers.
+ - Viewing nfo's, covers, et al inside the program using kparts.
+ - Group categories and aliases
+ - .nzb support
+ - KLibido uses KDE and the KDE libraries for the interface, Berkeley DB for
+ storing the newsgroups' headers, and UUDeview for decoding the posts.
Copied: kde-extras/klibido/tags/0.2.5-7/debian/copyright (from rev 17502, kde-extras/klibido/trunk/debian/copyright)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/copyright (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/copyright 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,33 @@
+This package was debianized by Gonéri Le Bouder on
+Tue, 15 Mar 2005 15:00:56 +0100.
+
+It was downloaded from http://klibido.sourceforge.net
+
+Copyright Holder: Alessandro Bonometti <bauno at inwind.it>
+
+Copyright for decoder/uudecoder:
+ Copyright (C) 2004 by David Pye <dmp at davidmpye.dyndns.org>
+
+Copyright for yydecoder:
+ Copyright (C) 2004 by David Pye <dmp at davidmpye.dyndns.org>
+ Copyright (C) 1995-1998 by Jean-Loup Gaily <jloup at gzip.org>
+ Copyright (C) 1995-1998 by Mark Adler <madler at alumni.caltech.edu>
+
+License:
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2' and.
+`/usr/share/common-licenses/GPL-3'
Copied: kde-extras/klibido/tags/0.2.5-7/debian/klibidoload (from rev 17502, kde-extras/klibido/trunk/debian/klibidoload)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/klibidoload (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/klibidoload 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x /usr/bin/klibido ] ; then
+ /usr/bin/klibido
+fi
+
+if [ $1 != "" ] ; then
+ /usr/bin/dcop klibido QmgrIface openNzb "$1"
+fi
Copied: kde-extras/klibido/tags/0.2.5-7/debian/newzleech.desktop (from rev 17502, kde-extras/klibido/trunk/debian/newzleech.desktop)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/newzleech.desktop (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/newzleech.desktop 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Charset=
+Hidden=false
+Keys=nl,nzb
+Name=Newzleech
+Query=http://www.newzleech.com/usenet/?q=\\{@}&mode=usenet
+ServiceTypes=SearchProvider
+Type=Service
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/10_add_debianrules.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/10_add_debianrules.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/10_add_debianrules.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,46 @@
+--- /dev/null
++++ b/admin/debianrules
+@@ -0,0 +1,43 @@
++#!/usr/bin/perl -w
++
++use Shell qw(mv cp mkdir rm) ;
++use File::Find;
++use Cwd;
++
++$origPwd = `pwd`;
++chomp $origPwd;
++
++$kde_prefix = "/usr";
++$sysconfdir = "/etc";
++$kde_includedir = "$kde_prefix/include/kde";
++$infodir = "$kde_prefix/share/info";
++$mandir = "$kde_prefix/share/man";
++$qtdir = "/usr/share/qt3";
++
++$kde_cgidir = "$kde_prefix/lib/cgi-bin";
++$kde_confdir = "$sysconfdir/kde3";
++$kde_htmldir = "$kde_prefix/share/doc/kde/HTML";
++
++if (defined $ENV{DEB_BUILD_OPTIONS} &&
++ $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
++ $enable_debug="--enable-debug=full";
++} else {
++ $enable_debug="--disable-debug";
++}
++
++if (@ARGV && $ARGV[0] eq 'echodirs') {
++ print STDOUT "export kde_prefix=$kde_prefix\n";
++ print STDOUT "export sysconfdir=$sysconfdir\n";
++ print STDOUT "export kde_includedir=$kde_includedir\n";
++ print STDOUT "export infodir=$infodir\n";
++ print STDOUT "export mandir=$mandir\n";
++ print STDOUT "export qtdir=$qtdir\n";
++
++ print STDOUT "export kde_cgidir=$kde_cgidir\n";
++ print STDOUT "export kde_confdir=$kde_confdir\n";
++ print STDOUT "export kde_htmldir=$kde_htmldir\n";
++
++ print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
++
++ exit
++}
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/10_autoconf.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/10_autoconf.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/10_autoconf.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/10_autoconf.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,29 @@
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -29,7 +29,7 @@ check_autotool_versions()
+ {
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+- Autoconf*2.5* | autoconf*2.5* ) : ;;
++ Autoconf*2.5* | autoconf*2.5* | Autoconf*2.6* | autoconf*2.6* ) : ;;
+ "" )
+ echo "*** AUTOCONF NOT FOUND!."
+ echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
+@@ -44,7 +44,7 @@ esac
+
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+- Autoconf*2.5* | autoheader*2.5* ) : ;;
++ Autoheader*2.5* | autoheader*2.5* | Autoheader*2.6* | autoheader*2.6*) : ;;
+ "" )
+ echo "*** AUTOHEADER NOT FOUND!."
+ echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
+@@ -64,7 +64,7 @@ case $AUTOMAKE_STRING in
+ echo "*** KDE requires automake 1.6.1 or newer"
+ exit 1
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* ) : ;;
++ automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* | automake*1.10* ) : ;;
+ "" )
+ echo "*** AUTOMAKE NOT FOUND!."
+ echo "*** KDE requires automake 1.6.1 or newer"
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_1.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_1.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_1.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_1.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,22 @@
+--- a/src/nntpthreadsocket.h
++++ b/src/nntpthreadsocket.h
+@@ -234,7 +234,7 @@ class NntpThreadSocket : public QThread
+ bool getHead(QString group, int artnum); //Unimplemented
+ int m_getError() {return error;}
+ const char *m_getErrorDesc() {return (const char *) errorString;}
+- char * NntpThreadSocket::m_findEndLine( char * start, char * end );
++ char * m_findEndLine( char * start, char * end );
+ void setHost(NntpHost *nh);
+ bool m_sendCmd( QString& cmd, int response );
+ QTime prevTime, currentTime;
+--- a/src/yydecoder.h
++++ b/src/yydecoder.h
+@@ -87,7 +87,7 @@ public:
+
+ private:
+
+- inline void yyDecoder::charCRC(const unsigned char *c);
++ inline void charCRC(const unsigned char *c);
+
+ QStringList m_fileParts;
+ QStringList::Iterator fileIterator;
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_3.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_3.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_3.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/11_ftbfs_with_gcc_4_3.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,72 @@
+--- a/src/grouplist.cpp
++++ b/src/grouplist.cpp
+@@ -22,6 +22,7 @@
+ #include "grouplist.h"
+ #include "binheader.h"
+ #include <kmessagebox.h>
++#include <cstdlib>
+ #include <assert.h>
+ #include <kiconloader.h>
+ #include "progress.h"
+--- a/src/headerlist.cpp
++++ b/src/headerlist.cpp
+@@ -24,6 +24,7 @@
+ #include <kmessagebox.h>
+ #include <klocale.h>
+ #include "progress.h"
++#include <cstdlib>
+ #include <errno.h>
+ #include <kprogress.h>
+ #include <qregexp.h>
+--- a/src/hlistviewitem.cpp
++++ b/src/hlistviewitem.cpp
+@@ -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
+--- a/src/nntpthreadsocket.cpp
++++ b/src/nntpthreadsocket.cpp
+@@ -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>
+--- a/src/qmgr.cpp
++++ b/src/qmgr.cpp
+@@ -29,7 +29,7 @@
+ #include <qdatetime.h>
+ #include "nzbform.h"
+ #include "mylistview.h"
+-
++#include <cstdlib>
+
+ extern bool g_qResume;
+ extern bool g_qDiscard;
+--- a/src/queueparts.cpp
++++ b/src/queueparts.cpp
+@@ -20,7 +20,7 @@
+
+ #include "queueparts.h"
+ #include <qfileinfo.h>
+-
++#include <cstdlib>
+
+
+
+--- a/src/updatedb.cpp
++++ b/src/updatedb.cpp
+@@ -20,6 +20,7 @@
+
+ #include "updatedb.h"
+ #include "binheader.h"
++#include <cstdlib>
+
+ //CACHE PARAMETERS
+ #define CACHESIZE 503
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/12_fix_desktop_file.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/12_fix_desktop_file.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/12_fix_desktop_file.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,17 @@
+--- a/src/klibido.desktop
++++ b/src/klibido.desktop
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-Name=klibido
+-Name[xx]=xxklibidoxx
+-Exec=klibido
++Name=Klibido
++Exec=klibidoload %U
+ Icon=klibido
+ Type=Application
+ Comment=KDE nntp (usenet) binaries grabber
+ Categories=Qt;KDE;Network
+-
++GenericName=Usenet Binaries Downloader
++MimeType=application/x-nzb;
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/13_kdepot.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/13_kdepot.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/13_kdepot.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/13_kdepot.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,20 @@
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -500,6 +500,8 @@ if test -z "$EXTRACTRC"; then EXTRACTRC=
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+ test -z "$VERBOSE" || echo "Making messages in $subdir"
+ (cd $subdir
+@@ -518,7 +520,7 @@ for subdir in $dirs; do
+ perl -e '$mes=0; while (<STDIN>) { next if (/^(if|else|endif)\s/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
+- XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
++ XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $kdepotpath" \
+ messages
+ exit_code=$?
+ if test "$exit_code" != 0; then
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/14_error_parsing_xover.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/14_error_parsing_xover.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/14_error_parsing_xover.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,29 @@
+--- a/src/header.cpp
++++ b/src/header.cpp
+@@ -168,7 +168,7 @@ Header::Header(uchar *p) {
+
+ 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( QStringList field)
+ 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( QString s)
+ 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;
+
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/15_crash_pausing_downloads.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/15_crash_pausing_downloads.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/15_crash_pausing_downloads.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,11 @@
+--- a/src/klibido.cpp
++++ b/src/klibido.cpp
+@@ -662,7 +662,7 @@ void klibido::closeWindow( KMdiChildView
+
+ 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));
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/16_nzb_arg.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/16_nzb_arg.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/16_nzb_arg.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,133 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -19,6 +19,7 @@
+ ***************************************************************************/
+
+ #include "klibido.h"
++#include <kuniqueapplication.h>
+ #include <kapplication.h>
+ #include <kaboutdata.h>
+ #include <kcmdlineargs.h>
+@@ -60,7 +61,7 @@ int main(int argc, char **argv)
+ // KCmdLineArgs::init(argc, argv, appName, programName, description, version);
+ KCmdLineArgs::init(argc, argv, &about);
+ KCmdLineArgs::addCmdLineOptions( options );
+- KApplication app;
++ KUniqueApplication app;
+ klibido *mainWin = 0;
+
+ if (app.isRestored())
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -34,7 +34,7 @@ klibido_SOURCES = main.cpp klibido.cpp g
+ downloadselectdlg.ui downloadselect.cpp catmandlg.ui catman.cpp prefviewlayout.ui \
+ prefview.cpp prefheaderlayout.ui prefheader.cpp decoder.cpp decoder.h uudecoder.cpp \
+ uudecoder.h yydecoder.cpp yydecoder.h updoptdlg.ui updopt.cpp addformdlg.ui \
+- nzbformdlg.ui nzbform.cpp mylistview.cpp
++ nzbformdlg.ui nzbform.cpp mylistview.cpp qmgriface.skel
+ klibido_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ klibido_LDADD = -lkmdi -ldb_cxx $(LIB_KDEUI)
+
+--- a/src/qmgr.cpp
++++ b/src/qmgr.cpp
+@@ -30,12 +30,13 @@
+ #include "nzbform.h"
+ #include "mylistview.h"
+ #include <cstdlib>
++#include <dcopref.h>
+
+ extern bool g_qResume;
+ extern bool g_qDiscard;
+
+
+-QMgr::QMgr(Servers *_servers, Db *_gdb, QString caption, QWidget* parent) : KMdiChildView(caption,parent), servers(_servers), gdb(_gdb)
++QMgr::QMgr(Servers *_servers, Db *_gdb, QString caption, QWidget* parent) : DCOPObject("QmgrIface"), KMdiChildView(caption,parent), servers(_servers), gdb(_gdb)
+ {
+ // kdDebug() << "KConstructor\n";
+ // qDebug("QConstructor");
+@@ -2575,7 +2576,12 @@ void QMgr::slotOpenNzb( )
+
+ if (nzbFilename.isNull())
+ return;
+-
++
++ openNzb(nzbFilename);
++}
++
++void QMgr::openNzb( QString nzbFilename )
++{
+ //Parse nzb and add posts to the queue
+ //Ok, I should create a separate class...but for now, let's try a quick & dirty solution...
+ //Code taken (and adapted with permission) from knzb, (C) 2004 David Pye.
+--- a/src/qmgr.h
++++ b/src/qmgr.h
+@@ -21,6 +21,7 @@
+ #ifndef QMGR_H
+ #define QMGR_H
+
++#include "qmgriface.h"
+ #include "qmgrform.h"
+ #include "queueparts.h"
+ #include <qevent.h>
+@@ -43,7 +44,7 @@ typedef QPtrList<Job> Queue;
+ class GroupList;
+ class MyListView;
+
+-class QMgr : public KMdiChildView
++class QMgr : public KMdiChildView, private QmgrIface
+ {
+ Q_OBJECT
+
+@@ -179,6 +180,11 @@ public:
+
+ /*$PUBLIC_FUNCTIONS$*/
+
++private:
++ void openNzb(QString nzbFilename);
++
++
++
+ public slots:
+ /*$PUBLIC_SLOTS$*/
+
+--- /dev/null
++++ b/src/qmgriface.h
+@@ -0,0 +1,38 @@
++/*
++ * qmgriface.h
++ *
++ * Copyright (C) 2004-2005 Jürgen Kofler <qmgr at gmx.net>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#ifndef QMGRIFACE_H
++#define QMGRIFACE_H
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <dcopobject.h>
++
++class QmgrIface : virtual public DCOPObject
++{
++ K_DCOP
++k_dcop:
++ /* Add Nzb to download queue */
++ virtual void openNzb(QString nzbFilename) = 0;
++};
++
++#endif /* QMGRIFACE_H */
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/17_increase_connection_limit.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/17_increase_connection_limit.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/17_increase_connection_limit.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,20 @@
+--- a/src/addserver.cpp
++++ b/src/addserver.cpp
+@@ -27,7 +27,7 @@ addServer::addServer(QWidget* parent, co
+ 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 @@ addServer::addServer( NntpHost *host, QW
+ 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);
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/18_ipv6.diff (from rev 17502, kde-extras/klibido/trunk/debian/patches/18_ipv6.diff)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/18_ipv6.diff (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/18_ipv6.diff 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,134 @@
+--- a/src/nntpthreadsocket.cpp
++++ b/src/nntpthreadsocket.cpp
+@@ -26,6 +26,7 @@
+ #include <assert.h>
+ #include <netdb.h>
+ #include <sys/poll.h>
++#include <arpa/inet.h>
+ #include "queueparts.h"
+
+
+@@ -241,24 +242,39 @@ bool NntpThreadSocket::m_connect( )
+ }
+ ha.setAddress(addrList[0]);
+ */
++ QString s;
++ char tempstr[64];
+ hostent *he=gethostbyname(nHost->hostName );
+ if (!he) {
+- qDebug("Cannot resolve hostname");
+- errorString="Cannot resolve " + nHost->hostName;
+- error=NntpThreadSocket::Comm_Err;
+- reset();
+- return false;
+- }
+- QString address=QString::number( (unsigned char) he->h_addr[0]);
+- QString s;
+-
+- for (int i = 1; i < he->h_length; i++) {
+- address+='.' + QString::number( (unsigned char) he->h_addr[i]);
++ // possibly IPV6
++ he = gethostbyname2(nHost->hostName, AF_INET6);
++ if (he) {
++ // IPV6 lookup successful
++
++ // extra v6 socket (assigning v6 address to a standard socket leads to errors)
++ // not needed for reconnects
++ if ( false == useIPv6 ) {
++ kes->close();
++ delete kes;
++ kes = new QSocketDevice(QSocketDevice::Stream, QSocketDevice::IPv6, 0);
++ useIPv6 = true;
++ }
++
++ inet_ntop(AF_INET6, he->h_addr, tempstr, 64);
++ ha.setAddress(tempstr);
++ } else {
++ qDebug("Cannot resolve hostname");
++ errorString="Cannot resolve " + nHost->hostName;
++ error=NntpThreadSocket::Comm_Err;
++ reset();
++ return false;
+ }
+-
+-// qDebug("Address: %s", (const char *) address);
+- ha.setAddress(address);
+-
++ } else {
++ // IPv4
++ inet_ntop(AF_INET, he->h_addr, tempstr, 64);
++ ha.setAddress(tempstr);
++ }
++// qDebug("Address: %s", ha.toString().latin1());
+ /*
+ //Debug!--------------------
+ qDebug("Connecting");
+@@ -363,7 +379,11 @@ bool NntpThreadSocket::m_connect( )
+ error=NntpThreadSocket::Comm_Err;
+ kes->close();
+ delete kes;
+- kes = new QSocketDevice(QSocketDevice::Stream);
++ if ( useIPv6 ) {
++ kes = new QSocketDevice(QSocketDevice::Stream, QSocketDevice::IPv6, 0);
++ } else {
++ kes = new QSocketDevice(QSocketDevice::Stream);
++ }
+ kes->setBlocking(true);
+ isLoggedIn=false;
+ watermark=buffer;
+@@ -382,7 +402,11 @@ bool NntpThreadSocket::m_connect( )
+ qDebug("Bad response to the \"user\" cmd");
+ kes->close();
+ delete kes;
+- kes = new QSocketDevice(QSocketDevice::Stream);
++ if ( useIPv6 ) {
++ kes = new QSocketDevice(QSocketDevice::Stream, QSocketDevice::IPv6, 0);
++ } else {
++ kes = new QSocketDevice(QSocketDevice::Stream);
++ }
+ kes->setBlocking(true);
+ isLoggedIn=false;
+ watermark=buffer;
+@@ -1778,7 +1802,7 @@ NntpThreadSocket::NntpThreadSocket(QWidg
+ cancel=false;
+ pause=false;
+ status=Ready;
+-
++ useIPv6 = false;
+
+ lineBufSize=1000;
+ line=new char[lineBufSize];
+@@ -2234,7 +2258,11 @@ void NntpThreadSocket::reset( )
+ {
+ kes->close();
+ delete kes;
+- kes = new QSocketDevice(QSocketDevice::Stream);
++ if ( useIPv6 ) {
++ kes = new QSocketDevice(QSocketDevice::Stream, QSocketDevice::IPv6, 0);
++ } else {
++ kes = new QSocketDevice(QSocketDevice::Stream);
++ }
+ isLoggedIn=false;
+ // *status=NntpThreadSocket::Ready;
+ watermark=buffer; //buffer emptyied :)
+--- a/src/nntpthreadsocket.h
++++ b/src/nntpthreadsocket.h
+@@ -238,6 +238,7 @@ class NntpThreadSocket : public QThread
+ void setHost(NntpHost *nh);
+ bool m_sendCmd( QString& cmd, int response );
+ QTime prevTime, currentTime;
++ bool useIPv6;
+
+
+ public:
+@@ -257,10 +258,6 @@ class NntpThreadSocket : public QThread
+ void tPause();
+ void tResume();
+ void tStart();
+-
+-
+-
+-
+ };
+
+
Copied: kde-extras/klibido/tags/0.2.5-7/debian/patches/series (from rev 17502, kde-extras/klibido/trunk/debian/patches/series)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/patches/series (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/patches/series 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,11 @@
+10_add_debianrules.diff
+10_autoconf.diff
+11_ftbfs_with_gcc_4_1.diff
+11_ftbfs_with_gcc_4_3.diff
+12_fix_desktop_file.diff
+13_kdepot.diff
+14_error_parsing_xover.diff
+15_crash_pausing_downloads.diff
+16_nzb_arg.diff
+17_increase_connection_limit.diff
+18_ipv6.diff
Copied: kde-extras/klibido/tags/0.2.5-7/debian/rules (from rev 17502, kde-extras/klibido/trunk/debian/rules)
===================================================================
--- kde-extras/klibido/tags/0.2.5-7/debian/rules (rev 0)
+++ kde-extras/klibido/tags/0.2.5-7/debian/rules 2010-03-23 10:28:56 UTC (rev 17503)
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-debug
+DEB_INSTALL_MANPAGES_klibido := debian/klibido.1
+
+install/klibido::
+ install -D -p -m0644 src/klibido.desktop \
+ $(DEB_DESTDIR)/usr/share/applications/kde/klibido.desktop
+ install -D -p -m0644 debian/newzleech.desktop \
+ $(DEB_DESTDIR)/usr/share/services/searchproviders/newzleech.desktop
+ install -D -p -m755 debian/klibidoload \
+ $(DEB_DESTDIR)/usr/bin/klibidoload
+
+binary-post-install/klibido::
+ rm -rf debian/klibido/usr/share/applnk/
+ chrpath -d debian/klibido/usr/bin/klibido
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]
+ @@dpatch-get-origtargz ../tarballs
More information about the pkg-kde-commits
mailing list