[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.3+dfsg-1-3-g1076cf5

Jo Shields directhex at apebox.org
Wed Jan 6 18:10:45 UTC 2010


The following commit has been merged in the master branch:
commit 1076cf582d2d27dd1785435310f58b4939dac536
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Jan 6 18:09:11 2010 +0000

    Fix Monodoc crash on ()

diff --git a/debian/changelog b/debian/changelog
index 5479188..fa9dcd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 mono (2.4.3+dfsg-2) UNRELEASED; urgency=low
 
-  * debian/patches:dont_assert_on_empty_DGC_field_r146984.dpatch:
+  * debian/patches/dont_assert_on_empty_DGC_field_r146984.dpatch:
     + Backport fix from upstream which causes IKVM to fail to build
       (Closes: #562393)
+  * debian/patches/escape_Lucene.Net_search_string_r148946.dpatch:
+    + Backport fix from upsrream which causes Monodoc to crash when
+      searching for "()" and other characters (Closes: #516597)
 
  -- Jo Shields <directhex at apebox.org>  Wed, 06 Jan 2010 17:56:22 +0000
 
diff --git a/debian/patches/escape_Lucene.Net_search_string_r148946.dpatch b/debian/patches/escape_Lucene.Net_search_string_r148946.dpatch
new file mode 100644
index 0000000..f385964
--- /dev/null
+++ b/debian/patches/escape_Lucene.Net_search_string_r148946.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## escape_Lucene.Net_search_string_r148946.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of upstream SVN revision r148946. Fixes a crash in the documentation
+## DP: browser when searching for things like "()"
+
+ at DPATCH@
+--- branches/mono-2-4/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/QueryParser.cs	2009/01/20 16:20:03	123891
++++ branches/mono-2-4/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/QueryParser.cs	2009/12/30 20:05:46	148946
+@@ -108,7 +108,7 @@
+ 		static public Query Parse(System.String query, System.String field, Analyzer analyzer)
+ 		{
+ 			QueryParser parser = new QueryParser(field, analyzer);
+-			return parser.Parse(query);
++			return parser.Parse(Escape(query));
+ 		}
+ 		
+ 		/// <summary>Constructs a query parser.</summary>

-- 
mono



More information about the Pkg-mono-svn-commits mailing list