[Pkg-cli-apps-commits] r3731 - in /packages/beagle/trunk/debian: beagleSearch.js changelog compat control patches/00list rules sidebar.css sidebar.xul watch
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Mon Feb 18 23:44:03 UTC 2008
Author: meebey
Date: Mon Feb 18 23:44:03 2008
New Revision: 3731
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3731
Log:
beagle 0.3.3-2 release
Added:
packages/beagle/trunk/debian/beagleSearch.js
packages/beagle/trunk/debian/sidebar.css
packages/beagle/trunk/debian/sidebar.xul
Modified:
packages/beagle/trunk/debian/changelog
packages/beagle/trunk/debian/compat
packages/beagle/trunk/debian/control
packages/beagle/trunk/debian/patches/00list
packages/beagle/trunk/debian/rules
packages/beagle/trunk/debian/watch
Added: packages/beagle/trunk/debian/beagleSearch.js
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/beagleSearch.js?rev=3731&op=file
==============================================================================
--- packages/beagle/trunk/debian/beagleSearch.js (added)
+++ packages/beagle/trunk/debian/beagleSearch.js Mon Feb 18 23:44:03 2008
@@ -1,0 +1,208 @@
+var xmlhttp = new XMLHttpRequest ();
+var parser = new DOMParser ();
+
+function init ()
+{
+ var input_box = document.getElementById ("searchinput");
+ input_box.addEventListener ("keypress", InputKeypressHandler, false);
+}
+
+function cleanup ()
+{
+ var input_box = document.getElementById ("searchinput");
+ input_box.addEventListener ("keypress", InputKeypressHandler, false);
+}
+
+function InputKeypressHandler (evt)
+{
+ if (evt.which == 13) {
+ evt.stopPropagation ();
+ if (evt.cancelable) {
+ evt.preventDefault();
+ }
+
+ Search ();
+ }
+}
+
+function Search ()
+{
+ var query_str = document.getElementById ("searchinput").value;
+ //alert ("Searching for '" + query_str + "'");
+ if (query_str.length == 0) {
+ return;
+ } else if (query_str == '42') {
+ window.location = "http://en.wikipedia.org/wiki/The_Answer_to_Life,_the_Universe,_and_Everything";
+ return;
+ } else if (query_str == '4u7h0rz') {
+ window.location = "http://svn.gnome.org/viewvc/beagle/trunk/beagle/AUTHORS?view=markup";
+ return;
+ }
+
+ var req_string = '<?xml version="1.0" encoding="utf-8"?> <RequestWrapper xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Message xsi:type="Query"> <IsIndexListener>false</IsIndexListener> <Parts> <Part xsi:type="QueryPart_Human"> <Logic>Required</Logic> <QueryString>type:WebHistory OR type:Bookmark</QueryString> </Part><Part xsi:type="QueryPart_Human"> <Logic>Required</Logic> <QueryString>' + query_str + '</QueryString> </Part> </Parts> <QueryDomain>Local System</QueryDomain> <MaxHits>20</MaxHits> </Message> </RequestWrapper> ';
+
+ xmlhttp.onreadystatechange = state_change_search;
+ xmlhttp.onerror = error_handler;
+ // If cross-site problem occurs,
+ // http://blog.dirolf.com/2007/06/enabling-cross-domain-ajax-in-firefox.html
+ xmlhttp.open ("POST", "http://localhost:4000/", true);
+ //XHR binary charset opt by mgran 2006 [http://mgran.blogspot.com]
+ xmlhttp.overrideMimeType ('text/txt; charset=utf-8'); // if charset is changed, need to handle bom
+ //xmlhttp.overrideMimeType('text/txt; charset=x-user-defined');
+ xmlhttp.send (req_string);
+ document.getElementById ("searchinput").disabled = true;
+
+ return;
+}
+
+function error_handler (e)
+{
+ var result_list = document.getElementById ("resultlist");
+ // FIXME: i18n
+ result_list.innerHTML = "<html:b>Error!</html:b><html:br />Beagle service needs to be running with the web interface enabled.<html:br /><html:a href='http://beagle-project.org/Beagle_Webinterface' onclick='return openlink(\"http://beagle-project.org/Beagle_Webinterface\");'>Beagle Webinterface</html:a>";
+ document.getElementById ("searchinput").disabled = false;
+}
+
+function state_change_search ()
+{
+ if (xmlhttp.readyState == 4)
+ HandleResults ();
+}
+
+function HandleResults ()
+{
+ if (xmlhttp.status != 200) {
+ error_handler ();
+ return;
+ }
+
+ document.getElementById ("searchinput").disabled = false;
+
+ //dump("Response:\n");
+ //dump(xmlhttp.responseText);
+ //dump("\n");
+ res = xmlhttp.responseText;
+
+ // if charset is x-user-defined split by \uF7FF
+ // if charset is utf-8, split by FFFD
+ // And dont ask me why!
+ var responses = res.split ('\uFFFD');
+
+ var result_str = "<html:ul>";
+
+ var no_result = true;
+
+ // Process hit xml nodes with xsl and append with javascript
+ for (var i = 0; i < responses.length; ++i) {
+ if (responses [i].length <= 0) {
+ continue;
+ }
+
+ var response_dom = parser.parseFromString (responses [i], "text/xml");
+ var msg_node = response_dom.getElementsByTagName ("Message") [0];
+ if (msg_node.getAttributeNS ('http://www.w3.org/2001/XMLSchema-instance', 'type') != 'HitsAddedResponse')
+ continue;
+
+ var hits = msg_node.getElementsByTagName ("Hit");
+ no_result &= (hits.length == 0);
+
+ for (var j = 0; j < hits.length; ++j) {
+ var uri = hits [j].getAttribute ("Uri");
+ uri = EscapeAmpersand (uri); // XHTML gotcha
+ var title = null;
+ var identifier = null;
+ var bookmark = false;
+
+ var properties = hits [j].getElementsByTagName ("Property");
+ for (var k = 0; k < properties.length; ++k) {
+ var key = properties [k].getAttribute ("Key");
+
+ if (key == "beagle:HitType" && (properties [k].getAttribute ("Value") == "Bookmark")) {
+ bookmark = true;
+ continue;
+ }
+
+ if (key == "dc:title") {
+ title = properties [k].getAttribute ("Value");
+ //title = reduce (title, 40, "..."); // FIXME
+ continue;
+ }
+
+ if (key == "dc:identifier")
+ identifier = properties [k].getAttribute ("Value");
+ }
+
+ if (bookmark)
+ uri = identifier;
+
+ if (title == null)
+ title = uri.substr (0, 40) + "...";
+
+ //dump (uri + "," + title + "\n");
+ result_str += "<html:li>";
+
+ if (bookmark)
+ result_str += "<html:span>B</html:span>";
+
+ result_str += "<html:a href='";
+ result_str += uri;
+ result_str += "' onclick='return openlink(\"";
+ result_str += uri;
+ result_str += "\");'>";
+ result_str += title;
+ result_str += "</html:a></html:li>";
+ }
+ }
+
+ if (no_result)
+ result_str = "<html:b>No web pages found.</html:b>";
+ else
+ result_str += "</html:ul>";
+ //dump (result_str);
+ //dump ("\n");
+
+ var result_list = document.getElementById ("resultlist");
+ result_list.innerHTML = result_str;
+}
+
+// From http://sastools.com/b2/post/79394063
+function reduce(str,l,p)
+{
+ var words=str.split(" ");
+ var numWords=words.length;
+ var output=[];
+ var ol,cWord,w;
+ for(w=0; w<numwords; ++w)
+ {
+ cWord=words[w];
+ cwl=cWord.length;
+ if((ol+cwl)<=l)
+ {
+ output.push(cWord);
+ ol+=cwl+1;
+ }
+ else
+ break;
+ }
+ return output.join(" ")+p;
+}
+
+function openlink (link)
+{
+ var mainWindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+ .getInterface(Components.interfaces.nsIWebNavigation)
+ .QueryInterface(Components.interfaces.nsIDocShellTreeItem)
+ .rootTreeItem
+ .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+ .getInterface(Components.interfaces.nsIDOMWindow);
+
+ var browser = mainWindow.getBrowser ();
+ browser.selectedTab = browser.addTab (link);
+
+ return false;
+}
+
+function EscapeAmpersand (url)
+{
+ return url.replace (/&/g, "&");
+}
Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=3731&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Mon Feb 18 23:44:03 2008
@@ -1,8 +1,28 @@
-beagle (0.3.3-2) UNRELEASED; urgency=low
-
- * Add libtaglib2.0-cil to build dependencies (Closes: #463999)
-
- -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 05 Feb 2008 12:10:39 +0100
+beagle (0.3.3-2) unstable; urgency=low
+
+ [ Jose Carlos Garcia Sogo ]
+ * Add libtaglib2.0-cil to build dependencies (Closes: #463999)
+
+ [ Mirco Bauer ]
+ * debian/rules:
+ + Use dh_clistrip instead of custom find commands.
+ * debian/control:
+ + Updated cli-common-dev build dependency to >= 0.5.4, as we use
+ dh_clistrip from it now.
+ + Removed debian revision (-1) from libndesk-dbus1.0-cil build dependency,
+ to aid backports.
+ + Added schedutils | util-linux (>= 2.13.1) to Recommends, as beagle
+ optionally uses ionice in /etc/cron.daily/beagle-crawl-system.
+ (Closes: #466101)
+ * debian/compat:
+ + Bumped to 5, we build-depend on debhelper >= 5 already anyhow.
+ * debian/rules
+ debian/sidebar.xul
+ debian/sidebar.css
+ debian/beagleSearch.js:
+ + Install missing files for the iceweasel plugin. (Closes: #464184)
+
+ -- Mirco Bauer <meebey at debian.org> Mon, 18 Feb 2008 23:27:00 +0100
beagle (0.3.3-1) unstable; urgency=low
Modified: packages/beagle/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/compat?rev=3731&op=diff
==============================================================================
--- packages/beagle/trunk/debian/compat (original)
+++ packages/beagle/trunk/debian/compat Mon Feb 18 23:44:03 2008
@@ -1,1 +1,1 @@
-4
+5
Modified: packages/beagle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/control?rev=3731&op=diff
==============================================================================
--- packages/beagle/trunk/debian/control (original)
+++ packages/beagle/trunk/debian/control Mon Feb 18 23:44:03 2008
@@ -3,7 +3,44 @@
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4) | c-sharp-2.0-compiler, libmono-dev (>= 1.2.4), libmono-cairo2.0-cil, libgtk2.0-cil (>= 2.4), libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3), libgalago1.0-cil (>= 0.5), libgtk2.0-dev (>= 2.6), libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), autotools-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip2.84-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil (>= 0.6), unzip, gtk-doc-tools, xdg-utils, monodoc-base, libndesk-dbus-glib1.0-cil, libndesk-dbus1.0-cil (>=0.5.2-1), libavahi1.0-cil (>= 0.6.10), libtaglib2.0-cil
+Build-Depends: debhelper (>= 5.0.37.2),
+ cli-common-dev (>= 0.5.4),
+ dpatch,
+ pkg-config,
+ intltool,
+ autotools-dev,
+ zip,
+ unzip,
+ gtk-doc-tools,
+ xdg-utils,
+ mono-gmcs (>= 1.2.4) | c-sharp-2.0-compiler,
+ libmono-dev (>= 1.2.4),
+ libmono-cairo2.0-cil,
+ libgtk2.0-cil (>= 2.4),
+ libgnome2.0-cil,
+ libglade2.0-cil,
+ libgconf2.0-cil,
+ libgmime2.2-cil,
+ libevolution3.0-cil (>= 0.13.3),
+ libgalago1.0-cil (>= 0.5),
+ libgtk2.0-dev (>= 2.6),
+ libexif-dev,
+ libsqlite3-dev,
+ libmono-sqlite2.0-cil,
+ libxss-dev,
+ libgnomevfs2-dev (>= 2.6),
+ libgnome2-dev (>= 2.6),
+ librsvg2-dev,
+ libxml2-dev (>= 2.6.19),
+ libmono-sharpzip2.84-cil,
+ libmono-system-runtime2.0-cil,
+ libwv-dev,
+ libgsf0.0-cil (>= 0.6),
+ libndesk-dbus-glib1.0-cil,
+ libndesk-dbus1.0-cil (>= 0.5.2),
+ libavahi1.0-cil (>= 0.6.10),
+ libtaglib2.0-cil,
+ monodoc-base,
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/beagle/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/
@@ -11,9 +48,9 @@
Package: beagle
Architecture: any
+Suggests: gnumeric, beagle-backend-evolution, iceweasel-beagle, icedove-beagle
+Recommends: schedutils | util-linux (>= 2.13.1), poppler-utils, mono-gmcs
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, bash (>= 3.0), adduser, dbus, xdg-utils
-Recommends: poppler-utils, mono-gmcs
-Suggests: gnumeric, beagle-backend-evolution, iceweasel-beagle, icedove-beagle
Description: indexing and search tool for your personal data
A desktop search util for indexing and searching user's data. At the moment,
it can index filesystems, Pidgin logs, Evolution mail and data, RSS and other.
Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=3731&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Mon Feb 18 23:44:03 2008
@@ -2,7 +2,6 @@
crawl-rules
icedove
enhanced_logging_support
-#fix_GMime.StreamFs.Seek_usage
fix_UiUtil.dll.config
fix_Util.dll.config
fix_beagle-build-index-manpage.dpatch
Modified: packages/beagle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/rules?rev=3731&op=diff
==============================================================================
--- packages/beagle/trunk/debian/rules (original)
+++ packages/beagle/trunk/debian/rules Mon Feb 18 23:44:03 2008
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
@@ -19,8 +18,6 @@
else
CFLAGS += -O2
endif
-
-PYVERS=$(shell pyversions -vs)
configure: configure-stamp
configure-stamp: patch-stamp
@@ -45,12 +42,9 @@
clean-patched:
dh_testdir
dh_testroot
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -rf $(MONO_SHARED_DIR)/.wapi
rm -f build-stamp configure-stamp patch-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- rm -rf $(MONO_SHARED_DIR)/.wapi
-
dh_clean
install: build-stamp install-arch install-indep
@@ -60,14 +54,8 @@
dh_testroot
dh_clean -k
dh_installdirs -a
-
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
dh_install -a --sourcedir=debian/tmp
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- find debian/ -type f -name "*.mdb" -delete
-endif
# Remove settings menu item.
rm $(CURDIR)/debian/beagle/usr/share/applications/beagle-settings.desktop
@@ -87,9 +75,17 @@
mv debian/beagle/usr/lib/beagle/Backends/Evolution* debian/beagle-backend-evolution/usr/lib/beagle/Backends/
-# Install Iceweasel and Icedove extensions
+ # install Iceweasel and Icedove extensions
unzip firefox-extension/beagle.xpi -d $(CURDIR)/debian/iceweasel-beagle/usr/lib/iceweasel/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/
+ # install missing sidebar.xul and beagleSearch.js
+ cp $(CURDIR)/debian/sidebar.xul \
+ $(CURDIR)/debian/beagleSearch.js \
+ $(CURDIR)/debian/iceweasel-beagle/usr/lib/iceweasel/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/chrome/content/
+ # install missing sidebar.css
+ cp $(CURDIR)/debian/sidebar.css \
+ $(CURDIR)/debian/iceweasel-beagle/usr/lib/iceweasel/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/chrome/skin/classic/
unzip thunderbird-extension/beagle.xpi -d $(CURDIR)/debian/icedove-beagle/usr/lib/icedove/extensions/{b656ef18-fd76-45e6-95cc-8043f26361e7}
+ # fix permissions, this isn't crappy windows with +x on everything
find debian/iceweasel-beagle/usr/lib/iceweasel/extensions -type f -exec chmod -x {} \;
binary-indep: build install
@@ -102,6 +98,7 @@
# dh_makeclilibs -m 1.0 -i
dh_link -i
dh_strip -i
+ dh_clistrip -i
dh_compress -i -X.xpi
dh_fixperms -i
dh_clifixperms -i
@@ -123,6 +120,7 @@
# dh_makeclilibs -a -V
dh_link -a
dh_strip -a
+ dh_clistrip -a
dh_compress -a -X.xpi
dh_fixperms -a
dh_clifixperms -a
Added: packages/beagle/trunk/debian/sidebar.css
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/sidebar.css?rev=3731&op=file
==============================================================================
--- packages/beagle/trunk/debian/sidebar.css (added)
+++ packages/beagle/trunk/debian/sidebar.css Mon Feb 18 23:44:03 2008
@@ -1,0 +1,18 @@
+a {
+ text-decoration: underline;
+ color: blue;
+}
+
+ul {
+ list-style-position: inside;
+ list-style-type: decimal;
+ padding-left: 0;
+ margin-left: 4px;
+}
+
+span {
+ background-color:cyan;
+ padding: 2px;
+ margin-right: 1px;
+ margin-left: -2px;
+}
Added: packages/beagle/trunk/debian/sidebar.xul
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/sidebar.xul?rev=3731&op=file
==============================================================================
--- packages/beagle/trunk/debian/sidebar.xul (added)
+++ packages/beagle/trunk/debian/sidebar.xul Mon Feb 18 23:44:03 2008
@@ -1,0 +1,19 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type"text/css" ?>
+<?xml-stylesheet href="chrome://beagle/skin/sidebar.css" type"text/css" ?>
+<!DOCTYPE page SYSTEM "chrome://beagle/locale/beagle.dtd">
+
+<page
+ id="beagle-sidebar-page"
+ title="&beagle.sidebar.title;"
+ onload="init();"
+ onunload="cleanup();"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ >
+ <script src="chrome://beagle/content/beagleSearch.js" />
+ <vbox flex="1">
+ <textbox id="searchinput" />
+ <html:div id="resultlist" />
+ </vbox>
+</page>
Modified: packages/beagle/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/watch?rev=3731&op=diff
==============================================================================
--- packages/beagle/trunk/debian/watch (original)
+++ packages/beagle/trunk/debian/watch Mon Feb 18 23:44:03 2008
@@ -1,5 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
version=3
ftp://ftp.gnome.org/pub/GNOME/sources/beagle/0.3/beagle-(.*)\.tar\.gz debian uupdate
More information about the Pkg-cli-apps-commits
mailing list