[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. da0f006eb18c66b660068dc62935c5c1b25113b9

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 473a4f0fe31082a821d27796d692c5691347b70f
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Dec 27 22:15:31 2009 +0100

    Add a patch catch_InvalidTokenOffsetsException.diff to fix build issue.

diff --git a/debian/changelog b/debian/changelog
index d8b5338..b029299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,7 +33,10 @@ zekr (0.7.5~beta2+dfsg-1~3.gbp16ee3d) UNRELEASED; urgency=low
       unknown.
   * Add a free (under same license of the package) sura-header.png
 
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Tue, 22 Dec 2009 13:32:22 +0200
+  [ Mehdi Dogguy ]
+  * Add a patch catch_InvalidTokenOffsetsException.diff to fix build issue.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 27 Dec 2009 22:14:42 +0100
 
 zekr (0.7.1-3~ppa11) jaunty; urgency=low
 
diff --git a/debian/patches/catch_InvalidTokenOffsetsException.diff b/debian/patches/catch_InvalidTokenOffsetsException.diff
new file mode 100644
index 0000000..daf8660
--- /dev/null
+++ b/debian/patches/catch_InvalidTokenOffsetsException.diff
@@ -0,0 +1,30 @@
+Index: zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/engine/search/lucene/QuranTextSearcher.java
+===================================================================
+--- zekr-0.7.5~beta2+dfsg.orig/src/net/sf/zekr/engine/search/lucene/QuranTextSearcher.java	2009-12-27 19:44:19.000000000 +0100
++++ zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/engine/search/lucene/QuranTextSearcher.java	2009-12-27 19:45:16.000000000 +0100
+@@ -41,6 +41,7 @@
+ import org.apache.lucene.search.highlight.Formatter;
+ import org.apache.lucene.search.highlight.Highlighter;
+ import org.apache.lucene.search.highlight.QueryScorer;
++import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
+ 
+ /**
+  * @author Mohsen Saboorian
+@@ -151,7 +152,7 @@
+ 		return searchScope;
+ 	}
+ 
+-	public SearchResultModel search(String query) throws IOException, ParseException {
++	public SearchResultModel search(String query) throws IOException, ParseException, InvalidTokenOffsetsException {
+ 		this.rawQuery = query;
+ 		String s = SearchUtils.simplifyAdvancedSearchQuery(query);
+ 		results = internalSearch(s);
+@@ -169,7 +170,7 @@
+ 	 * @throws IOException
+ 	 * @throws ParseException
+ 	 */
+-	private List internalSearch(String q) throws IOException, ParseException {
++	private List internalSearch(String q) throws IOException, ParseException, InvalidTokenOffsetsException {
+ 		IndexSearcher is = new IndexSearcher(zekrIndexReader.indexReader);
+ 		QueryParser parser = new QueryParser(QuranTextIndexer.CONTENTS_FIELD, analyzer);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 663cdbc..f80f0f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03_KeyboardShortcut_oldswt.patch
 03_mozilla_five_home.diff
 build_manifest.diff
+catch_InvalidTokenOffsetsException.diff

-- 
Packaging for Zekr