rev 5523 - in kde-extras/klibido: tags tags/0.2.5-4/debian tags/0.2.5-4/debian/patches trunk/debian trunk/debian/patches

Fathi Boudra fboudra-guest at alioth.debian.org
Sat Feb 3 14:59:58 CET 2007


Author: fboudra-guest
Date: 2007-02-03 14:59:58 +0100 (Sat, 03 Feb 2007)
New Revision: 5523

Added:
   kde-extras/klibido/tags/0.2.5-4/
   kde-extras/klibido/tags/0.2.5-4/debian/binsearch.desktop
   kde-extras/klibido/tags/0.2.5-4/debian/patches/16_nzb_arg.diff
   kde-extras/klibido/trunk/debian/binsearch.desktop
   kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff
Modified:
   kde-extras/klibido/tags/0.2.5-4/debian/changelog
   kde-extras/klibido/tags/0.2.5-4/debian/rules
   kde-extras/klibido/trunk/debian/changelog
   kde-extras/klibido/trunk/debian/rules
Log:
Improve nzb support and tags klibido 0.2.5-4

Copied: kde-extras/klibido/tags/0.2.5-4 (from rev 5508, kde-extras/klibido/trunk)

Added: kde-extras/klibido/tags/0.2.5-4/debian/binsearch.desktop
===================================================================
--- kde-extras/klibido/trunk/debian/binsearch.desktop	2007-02-01 09:19:59 UTC (rev 5508)
+++ kde-extras/klibido/tags/0.2.5-4/debian/binsearch.desktop	2007-02-03 13:59:58 UTC (rev 5523)
@@ -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

Modified: kde-extras/klibido/tags/0.2.5-4/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog	2007-02-01 09:19:59 UTC (rev 5508)
+++ kde-extras/klibido/tags/0.2.5-4/debian/changelog	2007-02-03 13:59:58 UTC (rev 5523)
@@ -1,10 +1,16 @@
-klibido (0.2.5-4) UNRELEASED; urgency=low
+klibido (0.2.5-4) experimental; urgency=low
 
-  * NOT RELEASED YET
+  [ Mark Purcell ]
   * Add ./debian/rules get-orig-source for http://buildserver.net
 
- -- Mark Purcell <msp at debian.org>  Fri, 10 Nov 2006 20:48:17 +0000
+  [ 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 ]

Added: kde-extras/klibido/tags/0.2.5-4/debian/patches/16_nzb_arg.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff	2007-02-01 09:19:59 UTC (rev 5508)
+++ kde-extras/klibido/tags/0.2.5-4/debian/patches/16_nzb_arg.diff	2007-02-03 13:59:58 UTC (rev 5523)
@@ -0,0 +1,113 @@
+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>
+ 
+ 
+@@ -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 <kaboutdata.h>
+ #include <kcmdlineargs.h>
+ #include <klocale.h>
++#include <kcmdlineargs.h>
+ 
+ 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-26 18:46:16.000000000 +0100
+@@ -29,12 +29,11 @@
+ #include <qdatetime.h>
+ #include "nzbform.h"
+ #include "mylistview.h"
+-
++#include <kcmdlineargs.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)
+ {
+ // 	kdDebug() << "KConstructor\n";
+@@ -2570,9 +2569,19 @@
+ 
+ void QMgr::slotOpenNzb( )
+ {
+-	QString nzbFilename = KFileDialog::getOpenFileName(QString::null, "*.nzb|Newzbin Files\n", this, i18n("Open a .nzb file"));
+-	kdDebug() << "Opened " << nzbFilename << endl;
+-	
++	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;
++	}
++
+ 	if (nzbFilename.isNull())
+ 		return;
+ 	

Modified: kde-extras/klibido/tags/0.2.5-4/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules	2007-02-01 09:19:59 UTC (rev 5508)
+++ kde-extras/klibido/tags/0.2.5-4/debian/rules	2007-02-03 13:59:58 UTC (rev 5523)
@@ -3,12 +3,16 @@
 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
 DEB_INSTALL_MANPAGES_klibido := debian/klibido.1
 
 install/klibido::
-	install -D -p -m0644 src/klibido.desktop debian/klibido/usr/share/applications/kde/klibido.desktop
+	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
 
 binary-post-install/klibido::
 	rm -rf debian/klibido/usr/share/applnk/Utilities/

Added: kde-extras/klibido/trunk/debian/binsearch.desktop
===================================================================
--- kde-extras/klibido/trunk/debian/binsearch.desktop	2007-02-03 10:42:50 UTC (rev 5522)
+++ kde-extras/klibido/trunk/debian/binsearch.desktop	2007-02-03 13:59:58 UTC (rev 5523)
@@ -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

Modified: kde-extras/klibido/trunk/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog	2007-02-03 10:42:50 UTC (rev 5522)
+++ kde-extras/klibido/trunk/debian/changelog	2007-02-03 13:59:58 UTC (rev 5523)
@@ -1,10 +1,16 @@
-klibido (0.2.5-4) UNRELEASED; urgency=low
+klibido (0.2.5-4) experimental; urgency=low
 
-  * NOT RELEASED YET
+  [ Mark Purcell ]
   * Add ./debian/rules get-orig-source for http://buildserver.net
 
- -- Mark Purcell <msp at debian.org>  Fri, 10 Nov 2006 20:48:17 +0000
+  [ 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 ]

Added: kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff	2007-02-03 10:42:50 UTC (rev 5522)
+++ kde-extras/klibido/trunk/debian/patches/16_nzb_arg.diff	2007-02-03 13:59:58 UTC (rev 5523)
@@ -0,0 +1,113 @@
+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>
+ 
+ 
+@@ -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 <kaboutdata.h>
+ #include <kcmdlineargs.h>
+ #include <klocale.h>
++#include <kcmdlineargs.h>
+ 
+ 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-26 18:46:16.000000000 +0100
+@@ -29,12 +29,11 @@
+ #include <qdatetime.h>
+ #include "nzbform.h"
+ #include "mylistview.h"
+-
++#include <kcmdlineargs.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)
+ {
+ // 	kdDebug() << "KConstructor\n";
+@@ -2570,9 +2569,19 @@
+ 
+ void QMgr::slotOpenNzb( )
+ {
+-	QString nzbFilename = KFileDialog::getOpenFileName(QString::null, "*.nzb|Newzbin Files\n", this, i18n("Open a .nzb file"));
+-	kdDebug() << "Opened " << nzbFilename << endl;
+-	
++	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;
++	}
++
+ 	if (nzbFilename.isNull())
+ 		return;
+ 	

Modified: kde-extras/klibido/trunk/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules	2007-02-03 10:42:50 UTC (rev 5522)
+++ kde-extras/klibido/trunk/debian/rules	2007-02-03 13:59:58 UTC (rev 5523)
@@ -3,12 +3,16 @@
 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
 DEB_INSTALL_MANPAGES_klibido := debian/klibido.1
 
 install/klibido::
-	install -D -p -m0644 src/klibido.desktop debian/klibido/usr/share/applications/kde/klibido.desktop
+	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
 
 binary-post-install/klibido::
 	rm -rf debian/klibido/usr/share/applnk/Utilities/




More information about the pkg-kde-commits mailing list