[Pkg-mono-svn-commits] rev 3121 - in beagle/trunk/debian: . patches
Jose Carlos Garcia Sogo
jsogo at alioth.debian.org
Sat May 12 23:02:52 UTC 2007
Author: jsogo
Date: 2007-05-12 23:02:50 +0000 (Sat, 12 May 2007)
New Revision: 3121
Removed:
beagle/trunk/debian/patches/filter_xhtml.dpatch
Modified:
beagle/trunk/debian/beagle.menu
beagle/trunk/debian/changelog
beagle/trunk/debian/patches/00list
beagle/trunk/debian/rules
Log:
beagle
+ Disable filter_xhtml patch as it is included upstream
+ install beagle.menu file and update it to use beagle-search util
Modified: beagle/trunk/debian/beagle.menu
===================================================================
--- beagle/trunk/debian/beagle.menu 2007-05-12 22:34:17 UTC (rev 3120)
+++ beagle/trunk/debian/beagle.menu 2007-05-12 23:02:50 UTC (rev 3121)
@@ -1,2 +1,2 @@
?package(beagle):needs="X11" section="Apps/Tools"\
- title="Best" command="/usr/bin/best" icon="/usr/share/pixmaps/best.png"
+ title="Beagle Search" command="/usr/bin/beagle-search" icon="/usr/share/pixmaps/system-search.png"
Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog 2007-05-12 22:34:17 UTC (rev 3120)
+++ beagle/trunk/debian/changelog 2007-05-12 23:02:50 UTC (rev 3121)
@@ -1,11 +1,12 @@
-beagle (0.2.17-1) UNRELEASED; urgency=low
+beagle (0.2.17-1) unstable; urgency=low
* New upstream release.
+ Disable on battery works also in beage-build-index and
- beagle-crawl-system.
+ beagle-crawl-system. (Closes: #396926)
* Search properties no longer appear in Applications menu (Closes: #398197)
* Recompile with latest evolution-sharp (Closes: #414343)
- * Patch from OS Systems were applied in 0.2.16-4 (Closes: #417527)
+ * Update beagle.menu file to run beagle-search command and use new icon.
+ Call dh_installmenu in debian/rules. (Closes: #420704)
* debian/patches:
+ beagle-crawl-safely: add new --disable-on-battery option
+ crawl-rules: add DISABLE_ON_BATTERY option to all system wide rules
@@ -13,8 +14,9 @@
+ usebash: add beagle-contactviewer (Closes: #421687)
+ name-iceweasel: new; change mozilla for iceweasel brand. (Closes: #413396)
+ typos: new; fix different typos in the package (Closes: #409139)
+ + filter-xhtml: included upstream; deleted.
- -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 08 May 2007 23:17:25 +0200
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 13 May 2007 00:44:40 +0200
beagle (0.2.16.3-3) unstable; urgency=low
@@ -27,7 +29,7 @@
beagle (0.2.16.3-2) unstable; urgency=low
* Recompile in an unstable environment and upload to unstable.
- * O.S. Systems patch actually closes #417527
+ * O.S. Systems patch actually closes 417527
* The new upstream released fixed:
+ problem with Kmail backend (Closes: #416456)
+ FilterDOC is being used again (Closes: #414701)
Modified: beagle/trunk/debian/patches/00list
===================================================================
--- beagle/trunk/debian/patches/00list 2007-05-12 22:34:17 UTC (rev 3120)
+++ beagle/trunk/debian/patches/00list 2007-05-12 23:02:50 UTC (rev 3121)
@@ -6,4 +6,3 @@
use-python2.4.dpatch
relibtoolize.dpatch
fix_desktop_files.dpatch
-filter_xhtml.dpatch
Deleted: beagle/trunk/debian/patches/filter_xhtml.dpatch
===================================================================
--- beagle/trunk/debian/patches/filter_xhtml.dpatch 2007-05-12 22:34:17 UTC (rev 3120)
+++ beagle/trunk/debian/patches/filter_xhtml.dpatch 2007-05-12 23:02:50 UTC (rev 3121)
@@ -1,457 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## filter_xhtml.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad beagle-0.2.16.3~/Filters/FilterHtml.cs beagle-0.2.16.3/Filters/FilterHtml.cs
---- beagle-0.2.16.3~/Filters/FilterHtml.cs 2007-02-07 20:04:18.000000000 +0100
-+++ beagle-0.2.16.3/Filters/FilterHtml.cs 2007-04-08 03:06:35.000000000 +0200
-@@ -429,6 +429,7 @@
- override protected void RegisterSupportedTypes ()
- {
- AddSupportedFlavor (FilterFlavor.NewFromMimeType ("text/html"));
-+ AddSupportedFlavor (FilterFlavor.NewFromMimeType ("application/xhtml+xml"));
- }
- }
-
-diff -urNad beagle-0.2.16.3~/Filters/FilterHtml.cs.orig beagle-0.2.16.3/Filters/FilterHtml.cs.orig
---- beagle-0.2.16.3~/Filters/FilterHtml.cs.orig 1970-01-01 01:00:00.000000000 +0100
-+++ beagle-0.2.16.3/Filters/FilterHtml.cs.orig 2007-02-07 20:04:18.000000000 +0100
-@@ -0,0 +1,435 @@
-+//
-+// FilterHtml.cs
-+//
-+// Copyright (C) 2005 Debajyoti Bera <dbera.web at gmail.com>
-+// Copyright (C) 2004 Novell, Inc.
-+//
-+
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a
-+// copy of this software and associated documentation files (the "Software"),
-+// to deal in the Software without restriction, including without limitation
-+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+// and/or sell copies of the Software, and to permit persons to whom the
-+// Software is furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in
-+// all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+// DEALINGS IN THE SOFTWARE.
-+//
-+
-+
-+using System;
-+using System.Collections;
-+using System.IO;
-+using System.Text;
-+using SW=System.Web;
-+
-+using Beagle.Daemon;
-+using Beagle.Util;
-+
-+using HtmlAgilityPack;
-+
-+namespace Beagle.Filters {
-+
-+ public class FilterHtml : Beagle.Daemon.Filter {
-+
-+ // When see <b> push "b" in the stack
-+ // When see </b> pop from the stack
-+ // For good error checking, we should compare
-+ // current element with what was popped
-+ // Currently, we just count the start and end tags using HotUp and HotDown
-+ // This allows unmatched elements to pass through
-+
-+ // Do similar thing for ignore elements
-+ private int ignore_level;
-+
-+ private bool building_text;
-+ private StringBuilder builder;
-+ protected Encoding enc;
-+ private HtmlDocument doc;
-+
-+ // delegate types
-+ public delegate int AppendTextCallback (string s);
-+ public delegate void AddPropertyCallback (Beagle.Property p);
-+ public delegate void AppendSpaceCallback ();
-+ public delegate void HotCallback ();
-+
-+ // delegates
-+ private new AppendTextCallback AppendText;
-+ private new AppendTextCallback AppendWord;
-+ private new AddPropertyCallback AddProperty;
-+ private new AppendSpaceCallback AppendWhiteSpace;
-+ private new AppendSpaceCallback AppendStructuralBreak;
-+ private new HotCallback HotUp;
-+ private new HotCallback HotDown;
-+
-+ public FilterHtml (bool register_filter)
-+ {
-+ if (register_filter) {
-+ // 1: Add meta keyword fields as meta:key
-+ SetVersion (1);
-+ SnippetMode = true;
-+
-+ AppendText = new AppendTextCallback (base.AppendText);
-+ AppendWord = new AppendTextCallback (base.AppendWord);
-+ AddProperty = new AddPropertyCallback (base.AddProperty);
-+ AppendWhiteSpace = new AppendSpaceCallback (base.AppendWhiteSpace);
-+ AppendStructuralBreak = new AppendSpaceCallback (base.AppendStructuralBreak);
-+ HotUp = new HotCallback (base.HotUp);
-+ HotDown = new HotCallback (base.HotDown);
-+ }
-+
-+ ignore_level = 0;
-+ building_text = false;
-+ builder = new StringBuilder ();
-+ }
-+
-+ public FilterHtml () : this (true) {}
-+
-+ protected bool NodeIsHot (String nodeName)
-+ {
-+ return nodeName == "b"
-+ || nodeName == "u"
-+ || nodeName == "em"
-+ || nodeName == "strong"
-+ || nodeName == "big"
-+ || nodeName == "h1"
-+ || nodeName == "h2"
-+ || nodeName == "h3"
-+ || nodeName == "h4"
-+ || nodeName == "h5"
-+ || nodeName == "h6"
-+ || nodeName == "i"
-+ || nodeName == "th";
-+ }
-+
-+ protected static bool NodeBreaksText (String nodeName)
-+ {
-+ return nodeName == "td"
-+ || nodeName == "a"
-+ || nodeName == "div"
-+ || nodeName == "option";
-+ }
-+
-+ protected static bool NodeBreaksStructure (string nodeName)
-+ {
-+ return nodeName == "p"
-+ || nodeName == "br"
-+ || nodeName == "h1"
-+ || nodeName == "h2"
-+ || nodeName == "h3"
-+ || nodeName == "h4"
-+ || nodeName == "h5"
-+ || nodeName == "h6";
-+ }
-+
-+ protected static bool NodeIsContentFree (String nodeName)
-+ {
-+ return nodeName == "script"
-+ || nodeName == "map"
-+ || nodeName == "style";
-+ }
-+
-+ protected static bool NodeIsNonBody (string nodeName)
-+ {
-+ return nodeName == "html"
-+ || nodeName == "head"
-+ || nodeName == "meta"
-+ || nodeName == "style"
-+ || nodeName == "title"
-+ || nodeName == "link"
-+ || nodeName == "script";
-+ }
-+
-+ protected static bool NodeIsInBody (string nodeName)
-+ {
-+ return (nodeName == "script" || (! NodeIsNonBody (nodeName)));
-+ }
-+
-+ protected void HandleTitleNode (HtmlNode node)
-+ {
-+ if (node.StartTag) {
-+ builder.Length = 0;
-+ building_text = true;
-+ } else {
-+ String title = HtmlEntity.DeEntitize (builder.ToString ());
-+ AddProperty (Beagle.Property.New ("dc:title", title));
-+ builder.Length = 0;
-+ building_text = false;
-+ }
-+ }
-+
-+ protected void HandleMetaNode (HtmlNode node)
-+ {
-+ string name = node.GetAttributeValue ("name", String.Empty);
-+ string content = node.GetAttributeValue ("content", String.Empty);
-+ if (name != String.Empty)
-+ AddProperty (Beagle.Property.New ("meta:" + name, content));
-+ }
-+
-+ protected void HandleContentFreeNode (HtmlNode node)
-+ {
-+ // so node is a content-free node
-+ // ignore contents of such node
-+ if (node.StartTag)
-+ ignore_level ++;
-+ else
-+ ignore_level = (ignore_level > 1 ? ignore_level - 1 : 0);
-+ }
-+
-+ protected void HandleContentRichNode (HtmlNode node)
-+ {
-+ bool isHot = NodeIsHot (node.Name);
-+ bool breaksText = NodeBreaksText (node.Name);
-+ bool breaksStructure = NodeBreaksStructure (node.Name);
-+
-+ if (breaksText)
-+ AppendWhiteSpace ();
-+
-+ if (node.StartTag) {
-+ if (isHot) {
-+ HotUp ();
-+ }
-+ if (node.Name == "img") {
-+ string attr = node.GetAttributeValue ("alt", String.Empty);
-+ if (attr != String.Empty) {
-+ string s = HtmlEntity.DeEntitize (attr);
-+ AppendWord (s);
-+ AppendWhiteSpace ();
-+ added_text_count += (s.Length + 1);
-+ }
-+ } else if (node.Name == "a") {
-+ string attr = node.GetAttributeValue ("href", String.Empty);
-+ if (attr != String.Empty) {
-+ string s = HtmlEntity.DeEntitize (
-+ SW.HttpUtility.UrlDecode (attr, enc));
-+ AppendWord (s);
-+ AppendWhiteSpace ();
-+ added_text_count += (s.Length + 1);
-+ }
-+ }
-+ } else { // (! node.StartTag)
-+ if (isHot) {
-+ HotDown ();
-+ }
-+ if (breaksStructure)
-+ AppendStructuralBreak ();
-+ }
-+
-+ if (breaksText)
-+ AppendWhiteSpace ();
-+ }
-+
-+ int added_text_count = 0;
-+
-+ protected void HandleTextNode (HtmlNode node)
-+ {
-+ // FIXME Do we need to trim the text ?
-+ String text = ((HtmlTextNode)node).Text;
-+ if (ignore_level != 0)
-+ return; // still ignoring ...
-+ if (building_text)
-+ builder.Append (text);
-+ else {
-+ string s = HtmlEntity.DeEntitize (text);
-+ AppendText (s);
-+ added_text_count += s.Length;
-+ }
-+ //if (hot_stack.Count != 0)
-+ //Console.WriteLine (" TEXT:" + text + " ignore=" + ignore_level);
-+ }
-+
-+ protected bool HandleNodeEventHead (HtmlNode node)
-+ {
-+ //Log.Debug ("HandleNodeEventHead (<{0}{1}>)", (node.StartTag ? "" : "/"), node.Name);
-+ switch (node.NodeType) {
-+
-+ case HtmlNodeType.Document:
-+ case HtmlNodeType.Element:
-+ if (! NodeIsNonBody (node.Name)) {
-+ doc.PauseLoad ();
-+ } else if (node.Name == "title") {
-+ HandleTitleNode (node);
-+ } else if (node.Name == "meta") {
-+ HandleMetaNode (node);
-+ } else if (NodeIsContentFree (node.Name)) {
-+ HandleContentFreeNode (node);
-+ }
-+ break;
-+
-+ case HtmlNodeType.Text:
-+ HandleTextNode (node);
-+ break;
-+ }
-+
-+ return true;
-+ }
-+
-+ protected bool HandleNodeEventBody (HtmlNode node)
-+ {
-+ //Log.Debug ("HandleNodeEventBody (<{0}{1}>)", (node.StartTag ? "" : "/"), node.Name);
-+ switch (node.NodeType) {
-+
-+ case HtmlNodeType.Document:
-+ case HtmlNodeType.Element:
-+ if (! NodeIsInBody (node.Name)) {
-+ break;
-+ } else if (! NodeIsContentFree (node.Name)) {
-+ HandleContentRichNode (node);
-+ } else {
-+ HandleContentFreeNode (node);
-+ }
-+ break;
-+
-+ case HtmlNodeType.Text:
-+ HandleTextNode (node);
-+ break;
-+ }
-+
-+ if (added_text_count > 2048) {
-+ added_text_count = 0;
-+ doc.PauseLoad ();
-+ }
-+
-+ return true;
-+ }
-+
-+ // Combined handler when you do not need separate head and body events
-+ protected bool HandleNodeEvent (HtmlNode node)
-+ {
-+ switch (node.NodeType) {
-+
-+ case HtmlNodeType.Document:
-+ case HtmlNodeType.Element:
-+ if (node.Name == "title") {
-+ HandleTitleNode (node);
-+ } else if (node.Name == "meta") {
-+ HandleMetaNode (node);
-+ } else if (! NodeIsContentFree (node.Name)) {
-+ HandleContentRichNode (node);
-+ } else {
-+ HandleContentFreeNode (node);
-+ }
-+ break;
-+
-+ case HtmlNodeType.Text:
-+ HandleTextNode (node);
-+ break;
-+ }
-+
-+ // HandleNodeEvent() does not use pause/resume parsing
-+ // So, check if more words are allowed to be extracted
-+ if (! AllowMoreWords ())
-+ return false;
-+ return true;
-+ }
-+
-+ override protected void DoPullProperties ()
-+ {
-+ enc = null;
-+
-+ foreach (Property prop in IndexableProperties) {
-+ if (prop.Key != StringFu.UnindexedNamespace + "encoding")
-+ continue;
-+
-+ try {
-+ enc = Encoding.GetEncoding ((string) prop.Value);
-+ } catch (NotSupportedException) {
-+ // Encoding passed in isn't supported. Maybe
-+ // we'll get lucky detecting it from the
-+ // document instead.
-+ }
-+
-+ break;
-+ }
-+
-+ if (enc == null) {
-+ // we need to tell the parser to detect encoding,
-+ HtmlDocument temp_doc = new HtmlDocument ();
-+ try {
-+ enc = temp_doc.DetectEncoding (Stream);
-+ } catch (NotSupportedException) {
-+ enc = Encoding.ASCII;
-+ }
-+ //Console.WriteLine ("Detected encoding:" + (enc == null ? "null" : enc.EncodingName));
-+ temp_doc = null;
-+ Stream.Seek (0, SeekOrigin.Begin);
-+ }
-+
-+ doc = new HtmlDocument ();
-+ doc.ReportNode += HandleNodeEventHead;
-+ doc.StreamMode = true;
-+ // we already determined encoding
-+ doc.OptionReadEncoding = false;
-+
-+ try {
-+ if (enc == null)
-+ doc.Load (Stream);
-+ else
-+ doc.Load (Stream, enc);
-+ } catch (NotSupportedException) {
-+ enc = Encoding.ASCII;
-+ doc.Load (Stream, enc);
-+ } catch (Exception e) {
-+ Log.Debug (e, "Exception while filtering HTML file " +FileInfo.FullName);
-+ }
-+ }
-+
-+ override protected void DoPullSetup ()
-+ {
-+ doc.ReportNode -= HandleNodeEventHead;
-+ doc.ReportNode += HandleNodeEventBody;
-+ }
-+
-+ override protected void DoPull ()
-+ {
-+ doc.ResumeLoad ();
-+
-+ if (doc.DoneParsing)
-+ Finished ();
-+ }
-+
-+ public void ExtractText (string html_string,
-+ AppendTextCallback append_text_cb,
-+ AddPropertyCallback add_prop_cb,
-+ AppendSpaceCallback append_white_cb,
-+ AppendSpaceCallback append_break_cb,
-+ HotCallback hot_up_cb,
-+ HotCallback hot_down_cb)
-+ {
-+ AppendText = append_text_cb;
-+ AppendWord = append_text_cb;
-+ AddProperty = add_prop_cb;
-+ AppendWhiteSpace = append_white_cb;
-+ AppendStructuralBreak = append_break_cb;
-+ HotUp = hot_up_cb;
-+ HotDown = hot_down_cb;
-+
-+ HtmlDocument doc = new HtmlDocument ();
-+ doc.ReportNode += HandleNodeEvent;
-+
-+ doc.StreamMode = true;
-+
-+ try {
-+ doc.LoadHtml (html_string);
-+ } catch (Exception e) {
-+ Log.Debug (e, "Exception while filtering html string [{0}]", html_string);
-+ }
-+
-+ }
-+
-+ override protected void RegisterSupportedTypes ()
-+ {
-+ AddSupportedFlavor (FilterFlavor.NewFromMimeType ("text/html"));
-+ }
-+ }
-+
-+}
Modified: beagle/trunk/debian/rules
===================================================================
--- beagle/trunk/debian/rules 2007-05-12 22:34:17 UTC (rev 3120)
+++ beagle/trunk/debian/rules 2007-05-12 23:02:50 UTC (rev 3121)
@@ -106,6 +106,7 @@
dh_testroot
dh_installchangelogs -i ChangeLog
dh_installdocs -i
+ dh_installmenu -i
# dh_makeshlibs
# dh_makeclilibs -m 1.0 -i
dh_link -i
@@ -125,6 +126,7 @@
dh_installchangelogs -a ChangeLog
dh_installdocs -a
dh_installexamples -a
+ dh_installmenu -a
dh_installman -a
dh_makeshlibs -plibbeagle0 -V
dh_pysupport -ppython-beagle
More information about the Pkg-mono-svn-commits
mailing list