--- klibido-0.2.5.orig/debian/patches/12_fix_desktop_file.diff +++ klibido-0.2.5/debian/patches/12_fix_desktop_file.diff @@ -0,0 +1,16 @@ +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 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=klibido +-Name[xx]=xxklibidoxx ++Name=Klibido + Exec=klibido + Icon=klibido + Type=Application + Comment=KDE nntp (usenet) binaries grabber + Categories=Qt;KDE;Network ++GenericName=Usenet Binaries Downloader + --- klibido-0.2.5.orig/debian/patches/kubuntu_01_nzb_arg.diff +++ klibido-0.2.5/debian/patches/kubuntu_01_nzb_arg.diff @@ -0,0 +1,108 @@ +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-25 19:36:36.000000000 +0100 ++++ klibido-0.2.5.new/src/klibido.cpp 2007-01-25 19:37:30.000000000 +0100 +@@ -38,7 +38,7 @@ + // // #include + #include + #include +- ++#include + #include + + +@@ -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-25 19:36:36.000000000 +0100 ++++ klibido-0.2.5.new/src/klibido.desktop 2007-01-25 19:36:37.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-25 19:36:37.000000000 +0100 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + static const char description[] = + I18N_NOOP("KDE Linux Binaries Downloader"); +@@ -32,11 +33,9 @@ + bool g_qResume = 0; + bool g_qDiscard = 0; + +- +- + 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-25 19:36:37.000000000 +0100 +@@ -29,12 +29,11 @@ + #include + #include "nzbform.h" + #include "mylistview.h" +- ++#include + + 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) + { + // kdDebug() << "KConstructor\n"; +@@ -2570,9 +2569,14 @@ + + void QMgr::slotOpenNzb( ) + { +- QString nzbFilename = KFileDialog::getOpenFileName(QString::null, "*.nzb|Newzbin Files\n", this, i18n("Open a .nzb file")); +- kdDebug() << "Opened " << nzbFilename << endl; +- ++ KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); ++ QString 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; ++ } ++ + if (nzbFilename.isNull()) + return; + --- klibido-0.2.5.orig/debian/patches/11_ftbfs_with_gcc_4_1.diff +++ klibido-0.2.5/debian/patches/11_ftbfs_with_gcc_4_1.diff @@ -0,0 +1,24 @@ +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 @@ + 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; +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 @@ + + private: + +- inline void yyDecoder::charCRC(const unsigned char *c); ++ inline void charCRC(const unsigned char *c); + + QStringList m_fileParts; + QStringList::Iterator fileIterator; --- klibido-0.2.5.orig/debian/patches/13_kdepot.diff +++ klibido-0.2.5/debian/patches/13_kdepot.diff @@ -0,0 +1,21 @@ +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 @@ + 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 @@ + perl -e '$mes=0; while () { 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 --- klibido-0.2.5.orig/debian/patches/10_add_debianrules.diff +++ klibido-0.2.5/debian/patches/10_add_debianrules.diff @@ -0,0 +1,47 @@ +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 +@@ -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 ++} --- klibido-0.2.5.orig/debian/patches/14_error_parsing_xover.diff +++ klibido-0.2.5/debian/patches/14_error_parsing_xover.diff @@ -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 <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)); --- klibido-0.2.5.orig/debian/control +++ klibido-0.2.5/debian/control @@ -0,0 +1,38 @@ +Source: klibido +Section: kde +Priority: optional +Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, kdelibs4-dev, + libdb4.3++-dev, libuu-dev +Standards-Version: 3.7.2 + +Package: klibido +Architecture: any +Depends: ${shlibs: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. + . + Homepage: http://klibido.sourceforge.net --- klibido-0.2.5.orig/debian/compat +++ klibido-0.2.5/debian/compat @@ -0,0 +1 @@ +5 --- klibido-0.2.5.orig/debian/changelog +++ klibido-0.2.5/debian/changelog @@ -0,0 +1,68 @@ +klibido (0.2.5-3ubuntu3) feisty; urgency=low + + * Rebuild for new kde packages, previous build failed due + to kde upgrade + + -- Anthony Mercatante Thu, 25 Jan 2007 22:47:23 +0100 + +klibido (0.2.5-3ubuntu2) feisty; urgency=low + + * Fixed debian/patches/kubuntu_01_nzb_arg.diff + - Avoids crash when loading an nzb file + + -- Anthony Mercatante Thu, 25 Jan 2007 19:38:45 +0100 + +klibido (0.2.5-3ubuntu1) feisty; urgency=low + + * Added debian/patches/kubuntu_01_nzb_arg.diff + - Makes it possible to start klibido opening a nzb file as + arg and adds nzb mimetype in klibido.desktop + * Added debian/binsearch.desktop + Binsearch search engine is available in konqueror + + -- Anthony Mercatante Thu, 25 Jan 2007 12:12:32 +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 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 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 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 Wed, 14 Sep 2005 21:09:59 +0000 --- klibido-0.2.5.orig/debian/binsearch.desktop +++ klibido-0.2.5/debian/binsearch.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Charset= +Hidden=false +Keys=bs +Name=Binsearch +Query[fr]=http://www.binsearch.info/index.php?q=\\{@} &max=100&adv_g=&adv_age=21&adv_sort=date&adv_col=on&minsize=&maxsize=&font= +ServiceTypes=SearchProvider +Type=Service --- klibido-0.2.5.orig/debian/menu +++ klibido-0.2.5/debian/menu @@ -0,0 +1,7 @@ +?package(klibido):\ + needs="X11"\ + section="Apps/Net"\ + hints="KDE,News"\ + title="Klibido"\ + command="/usr/bin/klibido"\ + longtitle="Klibido - a usenet binary grabber" --- klibido-0.2.5.orig/debian/watch +++ klibido-0.2.5/debian/watch @@ -0,0 +1,5 @@ +version=3 +# http://sf.net/klibido/klibido-(.*)\.tar\.gz +# Find new files on sourceforge, for debscripts >= 2.9 +# TODO remove 0.11 and 0.12 +opts="uversionmangle=s/0\.11|0\.12//" http://qa.debian.org/watch/sf.php?project=klibido klibido-([\d\.]*)\.tar\.gz --- klibido-0.2.5.orig/debian/copyright +++ klibido-0.2.5/debian/copyright @@ -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 + +Copyright for decoder/uudecoder: + Copyright (C) 2004 by David Pye + +Copyright for yydecoder: + Copyright (C) 2004 by David Pye + Copyright (C) 1995-1998 by Jean-Loup Gaily + Copyright (C) 1995-1998 by Mark Adler + +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'. + --- klibido-0.2.5.orig/debian/docs +++ klibido-0.2.5/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- klibido-0.2.5.orig/debian/rules +++ klibido-0.2.5/debian/rules @@ -0,0 +1,15 @@ +#!/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/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-debug +DEB_INSTALL_MANPAGES_klibido := debian/klibido.1 + +install/klibido:: + dh_install $(DEB_SRCDIR)/src/klibido.desktop usr/share/applications/kde/ + dh_install $(DEB_SRCDIR)/debian/binsearch.desktop usr/share/services/searchproviders/ + +binary-post-install/klibido:: + rm -rf debian/klibido/usr/share/applnk/Utilities/ --- klibido-0.2.5.orig/debian/klibido.1 +++ klibido-0.2.5/debian/klibido.1 @@ -0,0 +1,153 @@ +.\" This file was generated by kdemangen.pl +.TH KLIBIDO 1 "Jun 2005" "K Desktop Environment" "KDE Linux Binaries Downloader" +.SH NAME +klibido +- KDE Linux Binaries Downloader +.SH SYNOPSIS +klibido [Qt-options] [KDE-options] +.SH DESCRIPTION +Libido 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. + +.SH OPTIONS +.SS Generic options: +.TP +.B --help +Show help about options +.TP +.B --help-qt +Show Qt specific options +.TP +.B --help-kde +Show KDE specific options +.TP +.B --help-all +Show all options +.TP +.B --author +Show author information +.TP +.B -v, --version +Show version information +.TP +.B --license +Show license information +.TP +.B -- +End of options +.SS +.SS KDE options: +.TP +.B --caption +Use 'caption' as name in the titlebar +.TP +.B --icon +Use 'icon' as the application icon +.TP +.B --miniicon +Use 'icon' as the icon in the titlebar +.TP +.B --config +Use alternative configuration file +.TP +.B --dcopserver +Use the DCOP Server specified by 'server' +.TP +.B --nocrashhandler +Disable crash handler, to get core dumps +.TP +.B --waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B --style