rev 17502 - in kde-extras/klibido/trunk/debian: . patches source
Fathi Boudra
fabo at alioth.debian.org
Tue Mar 23 10:27:59 UTC 2010
Author: fabo
Date: 2010-03-23 10:27:59 +0000 (Tue, 23 Mar 2010)
New Revision: 17502
Added:
kde-extras/klibido/trunk/debian/klibidoload
kde-extras/klibido/trunk/debian/newzleech.desktop
kde-extras/klibido/trunk/debian/patches/10_autoconf.diff
kde-extras/klibido/trunk/debian/patches/18_ipv6.diff
kde-extras/klibido/trunk/debian/patches/series
kde-extras/klibido/trunk/debian/source/
kde-extras/klibido/trunk/debian/source/format
Removed:
kde-extras/klibido/trunk/debian/README.Debian
kde-extras/klibido/trunk/debian/binsearch.desktop
Modified:
kde-extras/klibido/trunk/debian/changelog
kde-extras/klibido/trunk/debian/compat
kde-extras/klibido/trunk/debian/control
kde-extras/klibido/trunk/debian/copyright
kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff
kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_1.diff
kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_3.diff
kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff
kde-extras/klibido/trunk/debian/patches/13_kdepot.diff
kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff
kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff
kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff
kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff
kde-extras/klibido/trunk/debian/rules
Log:
* 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
Modified: kde-extras/klibido/trunk/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/changelog 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,3 +1,30 @@
+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 ]
Modified: kde-extras/klibido/trunk/debian/compat
===================================================================
--- kde-extras/klibido/trunk/debian/compat 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/compat 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1 +1 @@
-5
+7
Modified: kde-extras/klibido/trunk/debian/control
===================================================================
--- kde-extras/klibido/trunk/debian/control 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/control 2010-03-23 10:27:59 UTC (rev 17502)
@@ -3,14 +3,14 @@
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 (>= 5), autotools-dev, kdelibs4-dev, chrpath,
- libdb4.6++-dev, libuu-dev
-Standards-Version: 3.7.2
+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}
+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
@@ -35,4 +35,3 @@
- .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.
- .
Modified: kde-extras/klibido/trunk/debian/copyright
===================================================================
--- kde-extras/klibido/trunk/debian/copyright 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/copyright 2010-03-23 10:27:59 UTC (rev 17502)
@@ -29,5 +29,5 @@
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'.
-
+Public License can be found in `/usr/share/common-licenses/GPL-2' and.
+`/usr/share/common-licenses/GPL-3'
Added: kde-extras/klibido/trunk/debian/klibidoload
===================================================================
--- kde-extras/klibido/trunk/debian/klibidoload (rev 0)
+++ kde-extras/klibido/trunk/debian/klibidoload 2010-03-23 10:27:59 UTC (rev 17502)
@@ -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
Added: kde-extras/klibido/trunk/debian/newzleech.desktop
===================================================================
--- kde-extras/klibido/trunk/debian/newzleech.desktop (rev 0)
+++ kde-extras/klibido/trunk/debian/newzleech.desktop 2010-03-23 10:27:59 UTC (rev 17502)
@@ -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
Modified: kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/10_add_debianrules.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,6 +1,5 @@
-diff -Nur klibido-0.2.5/admin/debianrules klibido-0.2.5.new/admin/debianrules
---- klibido-0.2.5/admin/debianrules 1970-01-01 01:00:00.000000000 +0100
-+++ klibido-0.2.5.new/admin/debianrules 2006-03-28 11:58:26.000000000 +0200
+--- /dev/null
++++ b/admin/debianrules
@@ -0,0 +1,43 @@
+#!/usr/bin/perl -w
+
Added: kde-extras/klibido/trunk/debian/patches/10_autoconf.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/10_autoconf.diff (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/10_autoconf.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -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"
Modified: kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_1.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_1.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_1.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,7 +1,6 @@
-diff -Nur klibido-0.2.5/src/nntpthreadsocket.h klibido-0.2.5.new/src/nntpthreadsocket.h
---- klibido-0.2.5/src/nntpthreadsocket.h 2006-01-06 23:05:32.000000000 +0100
-+++ klibido-0.2.5.new/src/nntpthreadsocket.h 2006-03-28 11:53:22.000000000 +0200
-@@ -234,7 +234,7 @@
+--- 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;}
@@ -10,10 +9,9 @@
void setHost(NntpHost *nh);
bool m_sendCmd( QString& cmd, int response );
QTime prevTime, currentTime;
-diff -Nur klibido-0.2.5/src/yydecoder.h klibido-0.2.5.new/src/yydecoder.h
---- klibido-0.2.5/src/yydecoder.h 2005-03-09 12:18:55.000000000 +0100
-+++ klibido-0.2.5.new/src/yydecoder.h 2006-03-28 11:54:25.000000000 +0200
-@@ -87,7 +87,7 @@
+--- a/src/yydecoder.h
++++ b/src/yydecoder.h
+@@ -87,7 +87,7 @@ public:
private:
Modified: 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 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/11_ftbfs_with_gcc_4_3.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,6 +1,5 @@
-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
+--- a/src/grouplist.cpp
++++ b/src/grouplist.cpp
@@ -22,6 +22,7 @@
#include "grouplist.h"
#include "binheader.h"
@@ -9,9 +8,8 @@
#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
+--- a/src/headerlist.cpp
++++ b/src/headerlist.cpp
@@ -24,6 +24,7 @@
#include <kmessagebox.h>
#include <klocale.h>
@@ -20,9 +18,8 @@
#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
+--- a/src/hlistviewitem.cpp
++++ b/src/hlistviewitem.cpp
@@ -21,6 +21,7 @@
#include "newsgroup.h"
#include <qpainter.h>
@@ -31,9 +28,8 @@
/*
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
+--- a/src/nntpthreadsocket.cpp
++++ b/src/nntpthreadsocket.cpp
@@ -22,6 +22,7 @@
#include "nntpthreadsocket.h"
#include <sys/types.h>
@@ -42,9 +38,8 @@
#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
+--- a/src/qmgr.cpp
++++ b/src/qmgr.cpp
@@ -29,7 +29,7 @@
#include <qdatetime.h>
#include "nzbform.h"
@@ -54,9 +49,8 @@
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
+--- a/src/queueparts.cpp
++++ b/src/queueparts.cpp
@@ -20,7 +20,7 @@
#include "queueparts.h"
@@ -66,9 +60,8 @@
-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
+--- a/src/updatedb.cpp
++++ b/src/updatedb.cpp
@@ -20,6 +20,7 @@
#include "updatedb.h"
Modified: kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,16 +1,17 @@
-diff -Nur in/src/klibido.desktop in.new/src/klibido.desktop
---- in/src/klibido.desktop 2004-09-02 01:34:50.000000000 +0200
-+++ in.new/src/klibido.desktop 2006-07-12 00:44:54.000000000 +0200
-@@ -1,10 +1,10 @@
+--- a/src/klibido.desktop
++++ b/src/klibido.desktop
+@@ -1,10 +1,9 @@
[Desktop Entry]
- Encoding=UTF-8
+-Encoding=UTF-8
-Name=klibido
-Name[xx]=xxklibidoxx
+-Exec=klibido
+Name=Klibido
- Exec=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;
Modified: kde-extras/klibido/trunk/debian/patches/13_kdepot.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/13_kdepot.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/13_kdepot.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,7 +1,6 @@
-diff -Nur klibido-0.2.5/admin/cvs.sh klibido-0.2.5.new/admin/cvs.sh
---- klibido-0.2.5/admin/cvs.sh 2005-03-01 01:58:57.000000000 +0100
-+++ klibido-0.2.5.new/admin/cvs.sh 2006-07-17 11:46:34.000000000 +0200
-@@ -500,6 +500,8 @@
+--- 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
@@ -10,7 +9,7 @@
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
(cd $subdir
-@@ -518,7 +520,7 @@
+@@ -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" \
Modified: kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/14_error_parsing_xover.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,7 +1,6 @@
-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 @@
+--- a/src/header.cpp
++++ b/src/header.cpp
+@@ -168,7 +168,7 @@ Header::Header(uchar *p) {
Header::Header( QStringList field)
{
@@ -10,7 +9,7 @@
qDebug("Error parsing xover");
qDebug("Article number: %s", (const char *) field[0]);
qDebug("Filed 2: %s", (const char *) field[1]);
-@@ -191,7 +191,7 @@
+@@ -191,7 +191,7 @@ Header::Header( QStringList field)
Header::Header( QString s)
{
QStringList field=QStringList::split('\t', s, true);
@@ -19,7 +18,7 @@
qDebug("Error parsing xover: %s", (const char *) s);
ok=false;
} else ok=true;
-@@ -207,7 +207,7 @@
+@@ -207,7 +207,7 @@ Header::Header( QString s)
Header::Header(char *l) {
QString s=l;
QStringList field=QStringList::split('\t', s, true);
Modified: kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/15_crash_pausing_downloads.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,7 +1,6 @@
-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 @@
+--- a/src/klibido.cpp
++++ b/src/klibido.cpp
+@@ -662,7 +662,7 @@ void klibido::closeWindow( KMdiChildView
void klibido::slotPauseQ( )
{
Modified: kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,115 +1,133 @@
-diff -Nur klibido-0.2.5/src/klibido.cpp klibido-0.2.5.new/src/klibido.cpp
---- klibido-0.2.5/src/klibido.cpp 2007-01-26 18:43:31.000000000 +0100
-+++ klibido-0.2.5.new/src/klibido.cpp 2007-01-26 18:43:32.000000000 +0100
-@@ -38,7 +38,7 @@
- // // #include <kaction.h>
- #include <kprogress.h>
- #include <kdeversion.h>
--
-+#include <kcmdlineargs.h>
- #include <kglobal.h>
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -19,6 +19,7 @@
+ ***************************************************************************/
-
-@@ -240,9 +240,12 @@
- // setSettingsDirty();
- // restoreWindowSize(kapp->config());
- restoreSize();
-+
- qMgr->checkQueue();
-
--
-+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-+ if ( args->count() == 1 )
-+ qMgr->slotOpenNzb();
-
- }
-
-diff -Nur klibido-0.2.5/src/klibido.desktop klibido-0.2.5.new/src/klibido.desktop
---- klibido-0.2.5/src/klibido.desktop 2007-01-26 18:43:31.000000000 +0100
-+++ klibido-0.2.5.new/src/klibido.desktop 2007-01-26 18:43:32.000000000 +0100
-@@ -7,4 +7,5 @@
- Comment=KDE nntp (usenet) binaries grabber
- Categories=Qt;KDE;Network
- GenericName=Usenet Binaries Downloader
-+MimeType=application/x-nzb;
-
-diff -Nur klibido-0.2.5/src/main.cpp klibido-0.2.5.new/src/main.cpp
---- klibido-0.2.5/src/main.cpp 2006-02-12 09:04:51.000000000 +0100
-+++ klibido-0.2.5.new/src/main.cpp 2007-01-26 18:43:32.000000000 +0100
-@@ -23,6 +23,7 @@
+ #include "klibido.h"
++#include <kuniqueapplication.h>
+ #include <kapplication.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
- #include <klocale.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;
- static const char description[] =
- I18N_NOOP("KDE Linux Binaries Downloader");
-@@ -32,11 +33,9 @@
- bool g_qResume = 0;
- bool g_qDiscard = 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)
--
--
- static KCmdLineOptions options[] =
- {
--// { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
-+ { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
- {"r", 0, 0},
- {"resume-queue", I18N_NOOP("Resume the download queue without asking"), 0},
- {"d", 0, 0},
-@@ -78,10 +77,11 @@
- g_qResume = 1;
- else if (args->isSet("discard-queue"))
- g_qDiscard = 1;
--
-+
- mainWin = new klibido();
- app.setMainWidget( mainWin );
-- args->clear();
-+
-+// args->clear();
- }
-
- return app.exec();
-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,12 @@
- #include <qdatetime.h>
+--- a/src/qmgr.cpp
++++ b/src/qmgr.cpp
+@@ -30,12 +30,13 @@
#include "nzbform.h"
#include "mylistview.h"
#include <cstdlib>
-+#include <kcmdlineargs.h>
++#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) : 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";
-@@ -2570,9 +2569,21 @@
+ // 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
- void QMgr::slotOpenNzb( )
++#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
{
-- QString nzbFilename = KFileDialog::getOpenFileName(QString::null, "*.nzb|Newzbin Files\n", this, i18n("Open a .nzb file"));
-- kdDebug() << "Opened " << nzbFilename << endl;
--
-+ QString nzbFilename;
+ Q_OBJECT
+
+@@ -179,6 +180,11 @@ public:
+
+ /*$PUBLIC_FUNCTIONS$*/
+
++private:
++ void openNzb(QString nzbFilename);
+
-+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
-+ if ( args->count() == 1 ) {
-+ nzbFilename = args->arg(0);
-+ }
+
-+ if (nzbFilename.isNull()) {
-+ nzbFilename = KFileDialog::getOpenFileName(QString::null, "*.nzb|Newzbin Files\n", this, i18n("Open a .nzb file"));
-+ kdDebug() << "Opened " << nzbFilename << endl;
-+ }
+ 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
++ */
+
-+ args->clear();
++#ifndef QMGRIFACE_H
++#define QMGRIFACE_H
+
- if (nzbFilename.isNull())
- return;
-
++#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 */
Modified: kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/patches/17_increase_connection_limit.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -1,7 +1,6 @@
-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 @@
+--- 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);
@@ -10,7 +9,7 @@
m_timeoutInput->setRange(60,600,5,false);
m_threadTimeoutInput->setRange(1,30,1,false);
validator=new QIntValidator(1,65535,this);
-@@ -90,7 +90,7 @@
+@@ -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);
Added: kde-extras/klibido/trunk/debian/patches/18_ipv6.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/18_ipv6.diff (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/18_ipv6.diff 2010-03-23 10:27:59 UTC (rev 17502)
@@ -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();
+-
+-
+-
+-
+ };
+
+
Added: kde-extras/klibido/trunk/debian/patches/series
===================================================================
--- kde-extras/klibido/trunk/debian/patches/series (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/series 2010-03-23 10:27:59 UTC (rev 17502)
@@ -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
Modified: kde-extras/klibido/trunk/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules 2010-03-23 09:16:44 UTC (rev 17501)
+++ kde-extras/klibido/trunk/debian/rules 2010-03-23 10:27:59 UTC (rev 17502)
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_EXTRA_FLAGS := --disable-debug
@@ -11,15 +10,16 @@
install/klibido::
install -D -p -m0644 src/klibido.desktop \
$(DEB_DESTDIR)/usr/share/applications/kde/klibido.desktop
- install -D -p -m0644 debian/binsearch.desktop \
- $(DEB_DESTDIR)/usr/share/services/searchproviders/binsearch.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/Utilities/
+ 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
-
Added: kde-extras/klibido/trunk/debian/source/format
===================================================================
--- kde-extras/klibido/trunk/debian/source/format (rev 0)
+++ kde-extras/klibido/trunk/debian/source/format 2010-03-23 10:27:59 UTC (rev 17502)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-kde-commits
mailing list