Sat Jul 28 15:21:29 UTC 2007

Author: fboudra-guest
Date: 2007-07-28 15:21:29 +0000 (Sat, 28 Jul 2007)
New Revision: 6884

Added:
   kde-extras/strigi/tags/0.5.4-1/
   kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/
   kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/
   kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/lib/
   kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/
   kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/
   kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py
   kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/
   kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/
   kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/lib/
   kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/
   kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/
   kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py
Removed:
   kde-extras/strigi/tags/0.5.4-1/debian/patches/
   kde-extras/strigi/trunk/debian/patches/
Modified:
   kde-extras/strigi/tags/0.5.4-1/debian/changelog
   kde-extras/strigi/tags/0.5.4-1/debian/control
   kde-extras/strigi/tags/0.5.4-1/debian/libstreams-dev.install
   kde-extras/strigi/tags/0.5.4-1/debian/rules
   kde-extras/strigi/tags/0.5.4-1/debian/strigi-daemon.install
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/control
   kde-extras/strigi/trunk/debian/libstreams-dev.install
   kde-extras/strigi/trunk/debian/rules
   kde-extras/strigi/trunk/debian/strigi-daemon.install
Log:
Tags strigi-0.5.4-1

  * New upstream release. (Closes: #430955)
    * Add iconv.h missing include. It fixes FTBFS with g++-4.2.
  * Add dbus-x11 dependency to strigi-daemon package. Strigi needs session dbus
    to start on request.
  * Remove wv dependency to strigi-daemon. Strigi has native OLE parsing now.
  * Add deskbar-plugins-strigi package.
  * Add strigi-daemon dependency to strigi-client.
  * Add python and python-support build dependencies.
  * Update strigi-daemon package. Add dbus services.
  * Update libstreams-dev package. Add textutils.h file.
  * Replace deprecated ${Source-Version} by ${binary:Version}.



Copied: kde-extras/strigi/tags/0.5.4-1 (from rev 6871, kde-extras/strigi/trunk)

Modified: kde-extras/strigi/tags/0.5.4-1/debian/changelog
===================================================================

--- kde-extras/strigi/trunk/debian/changelog	2007-07-28 00:22:32 UTC (rev 6871)
+++ kde-extras/strigi/tags/0.5.4-1/debian/changelog	2007-07-28 15:21:29 UTC (rev 6884)
@@ -1,15 +1,19 @@
-strigi (0.5.3-1) UNRELEASED; urgency=low
+strigi (0.5.4-1) unstable; urgency=low
 
-    NOT RELEASED YET
+  * New upstream release. (Closes: #430955)
+    * Add iconv.h missing include. It fixes FTBFS with g++-4.2.
+  * Add dbus-x11 dependency to strigi-daemon package. Strigi needs session dbus
+    to start on request.
+  * Remove wv dependency to strigi-daemon. Strigi has native OLE parsing now.
+  * Add deskbar-plugins-strigi package.
+  * Add strigi-daemon dependency to strigi-client.
+  * Add python and python-support build dependencies.
+  * Update strigi-daemon package. Add dbus services.
+  * Update libstreams-dev package. Add textutils.h file.
+  * Replace deprecated ${Source-Version} by ${binary:Version}.
 
-  * New upstream release.
-  * Add iconv.h missing include. It fixes FTBFS with g++-4.2 (Closes: #430955)
-  * Add dbus-x11 to strigi-daemon package. strigi needs session dbus to start
-    on request.
-  * Remove wv dependency. Strigi has native OLE parsing now.
+ -- Fathi Boudra <fboudra at free.fr>  Sat, 28 Jul 2007 15:26:39 +0200
 
- -- Fathi Boudra <fboudra at free.fr>  Fri, 13 Jul 2007 16:08:34 +0200
-
 strigi (0.5.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/strigi/tags/0.5.4-1/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2007-07-28 00:22:32 UTC (rev 6871)
+++ kde-extras/strigi/tags/0.5.4-1/debian/control	2007-07-28 15:21:29 UTC (rev 6884)
@@ -4,13 +4,14 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), cmake, libbz2-dev, libclucene-dev,
- zlib1g-dev, libattr1-dev, libxml2-dev, libqt4-dev, libdbus-1-dev
+ zlib1g-dev, libattr1-dev, libxml2-dev, libqt4-dev, libdbus-1-dev, python,
+ python-support
 Standards-Version: 3.7.2
 
 Package: strigi-daemon
 Architecture: any
 Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, poppler-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, poppler-utils, dbus-x11
 Suggests: strigi-plugins
 Description: fast indexing and searching tool for your personal data (daemon)
  Strigi is a program for fast indexing and searching your personal data. It can
@@ -41,7 +42,7 @@
 Package: strigi-client
 Architecture: any
 Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, strigi-daemon
 Description: Qt4 client for Strigi Desktop Search
  Strigi client is a Qt4 client (GUI) for the Strigi Desktop Search software.
  .
@@ -92,7 +93,7 @@
 Package: libstreams-dev
 Architecture: any
 Section: libdevel
-Depends: libstreams0 (= ${Source-Version}), libstdc++-dev
+Depends: libstreams0 (= ${binary:Version}), libstdc++-dev
 Description: development files for libstreams
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libstreams.
@@ -118,7 +119,7 @@
 Package: libstreamanalyzer-dev
 Architecture: any
 Section: libdevel
-Depends: libstreamanalyzer0 (= ${Source-Version}), libstreams-dev
+Depends: libstreamanalyzer0 (= ${binary:Version}), libstreams-dev
 Conflicts: libstreamindexer-dev (<< 0.5.1-1)
 Replaces: libstreamindexer-dev (<< 0.5.1-1)
 Description: development files for libstreamanalyzer
@@ -145,7 +146,7 @@
 Package: libsearchclient-dev
 Architecture: any
 Section: libdevel
-Depends: libsearchclient0 (= ${Source-Version}), libstreamanalyzer-dev
+Depends: libsearchclient0 (= ${binary:Version}), libstreamanalyzer-dev
 Description: development files for libsearchclient
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libsearchclient.
@@ -169,7 +170,7 @@
 Package: libstrigihtmlgui-dev
 Architecture: any
 Section: libdevel
-Depends: libstrigihtmlgui0 (= ${Source-Version}), libsearchclient-dev
+Depends: libstrigihtmlgui0 (= ${binary:Version}), libsearchclient-dev
 Description: development files for libstrigihtmlgui
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libstrigihtmlgui.
@@ -193,7 +194,7 @@
 Package: libstrigiqtdbusclient-dev
 Architecture: any
 Section: libdevel
-Depends: libstrigiqtdbusclient0 (= ${Source-Version}), libqt4-dev
+Depends: libstrigiqtdbusclient0 (= ${binary:Version}), libqt4-dev
 Description: development files for libstrigiqtdbusclient
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libstrigiqtdbusclient.
@@ -217,7 +218,7 @@
 Package: libcluceneindex-dev
 Architecture: any
 Section: libdevel
-Depends: libcluceneindex0 (= ${Source-Version})
+Depends: libcluceneindex0 (= ${binary:Version})
 Description: development files for libsearchclient
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libcluceneindex.
@@ -225,3 +226,15 @@
  See the 'strigi-daemon' package for more informations.
  .
   Homepage: http://www.vandenoever.info/software/strigi
+
+Package: deskbar-plugins-strigi
+Architecture: any
+Section: gnome
+Depends: ${python:Depends}, strigi-daemon, deskbar-applet
+Description: Deskbar plugin to search files with strigi
+ This package is part of Strigi Desktop Search, it contains a plugin
+ for the Gnome Deskbar applet to search for files using Strigi.
+ .
+ See the 'strigi-daemon' package for more informations.
+ .
+  Homepage: http://www.vandenoever.info/software/strigi

Modified: kde-extras/strigi/tags/0.5.4-1/debian/libstreams-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreams-dev.install	2007-07-28 00:22:32 UTC (rev 6871)
+++ kde-extras/strigi/tags/0.5.4-1/debian/libstreams-dev.install	2007-07-28 15:21:29 UTC (rev 6884)
@@ -11,5 +11,6 @@
 usr/include/strigi/substreamproviderprovider.h
 usr/include/strigi/jstreamsconfig.h
 usr/include/strigi/strigiconfig.h
+usr/include/strigi/textutils.h
 usr/lib/libstreams.so
 usr/lib/pkgconfig/libstreams.pc

Modified: kde-extras/strigi/tags/0.5.4-1/debian/rules
===================================================================
--- kde-extras/strigi/trunk/debian/rules	2007-07-28 00:22:32 UTC (rev 6871)
+++ kde-extras/strigi/tags/0.5.4-1/debian/rules	2007-07-28 15:21:29 UTC (rev 6884)
@@ -9,9 +9,16 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-#DEB_CMAKE_EXTRA_FLAGS = -DENABLE_DBUS:BOOL=ON -DENABLE_INOTIFY:BOOL=OFF -DENABLE_LOG4CXX:BOOL=OFF
+#DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=debugfull -DENABLE_DBUS:BOOL=ON -DENABLE_INOTIFY:BOOL=OFF -DENABLE_LOG4CXX:BOOL=OFF
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+#DEB_STRIP_EXCLUDE = so
+#DEB_STRIP_EXCLUDE += strigi
 
+binary-install/deskbar-plugins-strigi::
+	install -D -p -m644 src/searchclient/strigi.py \
+		debian/deskbar-plugins-strigi/usr/lib/deskbar-applet/handlers/strigi.py
+	dh_pysupport /usr/lib/deskbar-applet/handlers
+
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@ -19,3 +26,4 @@
 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
 	@@echo Converting $(UPFILENAME) to $(FILENAME)
 	@@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME)
+

Modified: kde-extras/strigi/tags/0.5.4-1/debian/strigi-daemon.install
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-daemon.install	2007-07-28 00:22:32 UTC (rev 6871)
+++ kde-extras/strigi/tags/0.5.4-1/debian/strigi-daemon.install	2007-07-28 15:21:29 UTC (rev 6884)
@@ -1,2 +1,3 @@
 usr/bin/luceneindexer
 usr/bin/strigidaemon
+usr/share/dbus-1/services

Added: kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py
===================================================================
--- kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py	                        (rev 0)
+++ kde-extras/strigi/tags/0.5.4-1/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py	2007-07-28 15:21:29 UTC (rev 6884)
@@ -0,0 +1,121 @@
+# This file is part of Strigi Desktop Search
+#
+# Copyright (C) 2006 Jos van den Oever <jos at vandenoever.info>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; see the file COPYING.LIB.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# A plugin for Gnome's Deskbar panel applet to talk to strigi.
+# Can be tested on the command line by installing deskbar and run `python strigi.py <searchquery>`.
+# Or for full use install to /usr/lib/deskbar-applet/handlers/ (or appropriate for your install) 
+# and turning on the plugin in deskbar's preferences.
+
+# Bugs: returns a bad result when strigidaemon is not running
+
+from gettext import gettext as _
+
+import gnomevfs
+import os
+import re
+import sys
+import dbus
+import dbus.glib
+from deskbar.Handler import Handler
+from deskbar.Match import Match
+import gtk, gtk.gdk
+
+HANDLERS = {
+        "StrigiHandler" : {
+                "name": _("Find Files with Strigi"),
+                "description": _("Use Strigi to find files"),
+        }
+}
+
+class StrigiMatch(Match):
+        def __init__(self, backend, dir=None, **args):
+                Match.__init__(self, backend, **args)
+                self.dir = dir
+                self.url = dir+"/"+self.name
+
+        def action(self, text=None):
+                gnomevfs.url_show("file://"+self.url)
+
+        def get_verb(self):
+                if self.name == "Error":
+                    return self.dir
+                return _("<b>%(name)s</b> "+self.url)
+
+        def get_hash(self, text=None):
+                return self.url
+
+        def get_category(self):
+                return "files"
+
+class StrigiHandler(Handler):
+    def __init__(self):
+        Handler.__init__(self, "gnome-fs-regular")
+        self.strigi = None
+
+    def connect(self):
+        # connect to DBus
+        try:
+            bus = dbus.SessionBus()
+        except:
+            self.error = "DBus is not running."
+            return
+        # make a connection to the strigi daemon
+        try:
+            obj = bus.get_object('vandenoever.strigi', '/search')
+            self.strigi = dbus.Interface(obj, 'vandenoever.strigi')
+            self.strigi.getStatus()
+        except:
+            self.strigi = None
+            self.error = "Strigi is not running."
+
+    def query(self, query):
+        results = []
+        # connect to Strigi
+        if self.strigi == None:
+            self.connect()
+        if self.strigi == None:
+            results.append(StrigiMatch(self, name="Error",
+                dir="Strigi not available"))
+            return results
+
+        # perform the search
+        try:
+            hits = self.strigi.getHits(query, 10, 0)
+        except:
+            # ignore the error, just return no results
+            results.append(StrigiMatch(self, name="Error",
+                dir="Strigi timeout"))
+            self.strigi = None
+            return results
+
+        # parse the results
+        for hit in hits:
+            test = re.compile("(.*)/([^/]*)$")
+            m = test.match(hit[0])
+            results.append(StrigiMatch(self, name=m.group(2), dir=m.group(1)))
+        return results
+
+def main(args):
+    h = StrigiHandler()
+    rs = h.query(args[0])
+    for r in rs:
+        print r.url
+
+if __name__=="__main__":
+    main(sys.argv)

Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2007-07-28 13:21:00 UTC (rev 6883)
+++ kde-extras/strigi/trunk/debian/changelog	2007-07-28 15:21:29 UTC (rev 6884)
@@ -1,15 +1,19 @@
-strigi (0.5.3-1) UNRELEASED; urgency=low
+strigi (0.5.4-1) unstable; urgency=low
 
-    NOT RELEASED YET
+  * New upstream release. (Closes: #430955)
+    * Add iconv.h missing include. It fixes FTBFS with g++-4.2.
+  * Add dbus-x11 dependency to strigi-daemon package. Strigi needs session dbus
+    to start on request.
+  * Remove wv dependency to strigi-daemon. Strigi has native OLE parsing now.
+  * Add deskbar-plugins-strigi package.
+  * Add strigi-daemon dependency to strigi-client.
+  * Add python and python-support build dependencies.
+  * Update strigi-daemon package. Add dbus services.
+  * Update libstreams-dev package. Add textutils.h file.
+  * Replace deprecated ${Source-Version} by ${binary:Version}.
 
-  * New upstream release.
-  * Add iconv.h missing include. It fixes FTBFS with g++-4.2 (Closes: #430955)
-  * Add dbus-x11 to strigi-daemon package. strigi needs session dbus to start
-    on request.
-  * Remove wv dependency. Strigi has native OLE parsing now.
+ -- Fathi Boudra <fboudra at free.fr>  Sat, 28 Jul 2007 15:26:39 +0200
 
- -- Fathi Boudra <fboudra at free.fr>  Fri, 13 Jul 2007 16:08:34 +0200
-
 strigi (0.5.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2007-07-28 13:21:00 UTC (rev 6883)
+++ kde-extras/strigi/trunk/debian/control	2007-07-28 15:21:29 UTC (rev 6884)
@@ -4,13 +4,14 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), cmake, libbz2-dev, libclucene-dev,
- zlib1g-dev, libattr1-dev, libxml2-dev, libqt4-dev, libdbus-1-dev
+ zlib1g-dev, libattr1-dev, libxml2-dev, libqt4-dev, libdbus-1-dev, python,
+ python-support
 Standards-Version: 3.7.2
 
 Package: strigi-daemon
 Architecture: any
 Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, poppler-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, poppler-utils, dbus-x11
 Suggests: strigi-plugins
 Description: fast indexing and searching tool for your personal data (daemon)
  Strigi is a program for fast indexing and searching your personal data. It can
@@ -41,7 +42,7 @@
 Package: strigi-client
 Architecture: any
 Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, strigi-daemon
 Description: Qt4 client for Strigi Desktop Search
  Strigi client is a Qt4 client (GUI) for the Strigi Desktop Search software.
  .
@@ -92,7 +93,7 @@
 Package: libstreams-dev
 Architecture: any
 Section: libdevel
-Depends: libstreams0 (= ${Source-Version}), libstdc++-dev
+Depends: libstreams0 (= ${binary:Version}), libstdc++-dev
 Description: development files for libstreams
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libstreams.
@@ -118,7 +119,7 @@
 Package: libstreamanalyzer-dev
 Architecture: any
 Section: libdevel
-Depends: libstreamanalyzer0 (= ${Source-Version}), libstreams-dev
+Depends: libstreamanalyzer0 (= ${binary:Version}), libstreams-dev
 Conflicts: libstreamindexer-dev (<< 0.5.1-1)
 Replaces: libstreamindexer-dev (<< 0.5.1-1)
 Description: development files for libstreamanalyzer
@@ -145,7 +146,7 @@
 Package: libsearchclient-dev
 Architecture: any
 Section: libdevel
-Depends: libsearchclient0 (= ${Source-Version}), libstreamanalyzer-dev
+Depends: libsearchclient0 (= ${binary:Version}), libstreamanalyzer-dev
 Description: development files for libsearchclient
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libsearchclient.
@@ -169,7 +170,7 @@
 Package: libstrigihtmlgui-dev
 Architecture: any
 Section: libdevel
-Depends: libstrigihtmlgui0 (= ${Source-Version}), libsearchclient-dev
+Depends: libstrigihtmlgui0 (= ${binary:Version}), libsearchclient-dev
 Description: development files for libstrigihtmlgui
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libstrigihtmlgui.
@@ -193,7 +194,7 @@
 Package: libstrigiqtdbusclient-dev
 Architecture: any
 Section: libdevel
-Depends: libstrigiqtdbusclient0 (= ${Source-Version}), libqt4-dev
+Depends: libstrigiqtdbusclient0 (= ${binary:Version}), libqt4-dev
 Description: development files for libstrigiqtdbusclient
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libstrigiqtdbusclient.
@@ -217,7 +218,7 @@
 Package: libcluceneindex-dev
 Architecture: any
 Section: libdevel
-Depends: libcluceneindex0 (= ${Source-Version})
+Depends: libcluceneindex0 (= ${binary:Version})
 Description: development files for libsearchclient
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libcluceneindex.
@@ -225,3 +226,15 @@
  See the 'strigi-daemon' package for more informations.
  .
   Homepage: http://www.vandenoever.info/software/strigi
+
+Package: deskbar-plugins-strigi
+Architecture: any
+Section: gnome
+Depends: ${python:Depends}, strigi-daemon, deskbar-applet
+Description: Deskbar plugin to search files with strigi
+ This package is part of Strigi Desktop Search, it contains a plugin
+ for the Gnome Deskbar applet to search for files using Strigi.
+ .
+ See the 'strigi-daemon' package for more informations.
+ .
+  Homepage: http://www.vandenoever.info/software/strigi

Modified: kde-extras/strigi/trunk/debian/libstreams-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreams-dev.install	2007-07-28 13:21:00 UTC (rev 6883)
+++ kde-extras/strigi/trunk/debian/libstreams-dev.install	2007-07-28 15:21:29 UTC (rev 6884)
@@ -11,5 +11,6 @@
 usr/include/strigi/substreamproviderprovider.h
 usr/include/strigi/jstreamsconfig.h
 usr/include/strigi/strigiconfig.h
+usr/include/strigi/textutils.h
 usr/lib/libstreams.so
 usr/lib/pkgconfig/libstreams.pc

Modified: kde-extras/strigi/trunk/debian/rules
===================================================================
--- kde-extras/strigi/trunk/debian/rules	2007-07-28 13:21:00 UTC (rev 6883)
+++ kde-extras/strigi/trunk/debian/rules	2007-07-28 15:21:29 UTC (rev 6884)
@@ -9,9 +9,16 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-#DEB_CMAKE_EXTRA_FLAGS = -DENABLE_DBUS:BOOL=ON -DENABLE_INOTIFY:BOOL=OFF -DENABLE_LOG4CXX:BOOL=OFF
+#DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=debugfull -DENABLE_DBUS:BOOL=ON -DENABLE_INOTIFY:BOOL=OFF -DENABLE_LOG4CXX:BOOL=OFF
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+#DEB_STRIP_EXCLUDE = so
+#DEB_STRIP_EXCLUDE += strigi
 
+binary-install/deskbar-plugins-strigi::
+	install -D -p -m644 src/searchclient/strigi.py \
+		debian/deskbar-plugins-strigi/usr/lib/deskbar-applet/handlers/strigi.py
+	dh_pysupport /usr/lib/deskbar-applet/handlers
+
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@ -19,3 +26,4 @@
 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
 	@@echo Converting $(UPFILENAME) to $(FILENAME)
 	@@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME)
+

Modified: kde-extras/strigi/trunk/debian/strigi-daemon.install
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-daemon.install	2007-07-28 13:21:00 UTC (rev 6883)
+++ kde-extras/strigi/trunk/debian/strigi-daemon.install	2007-07-28 15:21:29 UTC (rev 6884)
@@ -1,2 +1,3 @@
 usr/bin/luceneindexer
 usr/bin/strigidaemon
+usr/share/dbus-1/services

Added: kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/strigi-plugins-deskbar/usr/lib/deskbar-applet/handlers/strigi.py	2007-07-28 15:21:29 UTC (rev 6884)
@@ -0,0 +1,121 @@
+# This file is part of Strigi Desktop Search
+#
+# Copyright (C) 2006 Jos van den Oever <jos at vandenoever.info>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; see the file COPYING.LIB.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# A plugin for Gnome's Deskbar panel applet to talk to strigi.
+# Can be tested on the command line by installing deskbar and run `python strigi.py <searchquery>`.
+# Or for full use install to /usr/lib/deskbar-applet/handlers/ (or appropriate for your install) 
+# and turning on the plugin in deskbar's preferences.
+
+# Bugs: returns a bad result when strigidaemon is not running
+
+from gettext import gettext as _
+
+import gnomevfs
+import os
+import re
+import sys
+import dbus
+import dbus.glib
+from deskbar.Handler import Handler
+from deskbar.Match import Match
+import gtk, gtk.gdk
+
+HANDLERS = {
+        "StrigiHandler" : {
+                "name": _("Find Files with Strigi"),
+                "description": _("Use Strigi to find files"),
+        }
+}
+
+class StrigiMatch(Match):
+        def __init__(self, backend, dir=None, **args):
+                Match.__init__(self, backend, **args)
+                self.dir = dir
+                self.url = dir+"/"+self.name
+
+        def action(self, text=None):
+                gnomevfs.url_show("file://"+self.url)
+
+        def get_verb(self):
+                if self.name == "Error":
+                    return self.dir
+                return _("<b>%(name)s</b> "+self.url)
+
+        def get_hash(self, text=None):
+                return self.url
+
+        def get_category(self):
+                return "files"
+
+class StrigiHandler(Handler):
+    def __init__(self):
+        Handler.__init__(self, "gnome-fs-regular")
+        self.strigi = None
+
+    def connect(self):
+        # connect to DBus
+        try:
+            bus = dbus.SessionBus()
+        except:
+            self.error = "DBus is not running."
+            return
+        # make a connection to the strigi daemon
+        try:
+            obj = bus.get_object('vandenoever.strigi', '/search')
+            self.strigi = dbus.Interface(obj, 'vandenoever.strigi')
+            self.strigi.getStatus()
+        except:
+            self.strigi = None
+            self.error = "Strigi is not running."
+
+    def query(self, query):
+        results = []
+        # connect to Strigi
+        if self.strigi == None:
+            self.connect()
+        if self.strigi == None:
+            results.append(StrigiMatch(self, name="Error",
+                dir="Strigi not available"))
+            return results
+
+        # perform the search
+        try:
+            hits = self.strigi.getHits(query, 10, 0)
+        except:
+            # ignore the error, just return no results
+            results.append(StrigiMatch(self, name="Error",
+                dir="Strigi timeout"))
+            self.strigi = None
+            return results
+
+        # parse the results
+        for hit in hits:
+            test = re.compile("(.*)/([^/]*)$")
+            m = test.match(hit[0])
+            results.append(StrigiMatch(self, name=m.group(2), dir=m.group(1)))
+        return results
+
+def main(args):
+    h = StrigiHandler()
+    rs = h.query(args[0])
+    for r in rs:
+        print r.url
+
+if __name__=="__main__":
+    main(sys.argv)


