[Debian-islamic-commits] [SCM] Packaging for Thawab branch, master, updated. upstream/3.0.2-15-g5554be6
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at sabily.org
Thu Jun 17 21:23:21 UTC 2010
The following commit has been merged in the master branch:
commit 72bb070d7b6d3b0cd062c4977622df6a5d581d0d
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Fri Jun 18 00:09:19 2010 +0300
Removed pyparsing.diff & show_search_summary_tooltips.diff, as they are
applied in new upstream release.
diff --git a/debian/changelog b/debian/changelog
index d1dee61..3b5d60d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,7 @@
-thawab (3.0.2-1) unstable; urgency=low
+thawab (3.0.3-1) unstable; urgency=low
* Initial release (Closes: #513370)
* Added patch separate_setup.py.diff to remove call for setup.py from
Makefile.
- * Added patch pyparsing.diff to use pyparsing module shipped by
- python-pyparsing instead of the convenience copy in whoosh.
- * Added patch show_search_summary_tooltips.diff from upstream git to
- show search summary in tooltips.
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Tue, 15 Jun 2010 11:57:06 +0300
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Fri, 18 Jun 2010 00:12:11 +0300
diff --git a/debian/patches/pyparsing.diff b/debian/patches/pyparsing.diff
deleted file mode 100644
index 528c0bd..0000000
--- a/debian/patches/pyparsing.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Debian ships the pyparsing module in the python-pyparsing package
-Forwarded: http://git.ojuba.org/cgit/thawab/commit/?id=f2f8d50da5a4d4685c8ccbddaaadaefb2cd019eb
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/Thawab/whooshQParser.py
-+++ b/Thawab/whooshQParser.py
-@@ -18,12 +18,12 @@
- """
- import sys, os, os.path, re
-
--from whoosh.support.pyparsing import printables, alphanums
--from whoosh.support.pyparsing import ZeroOrMore, OneOrMore
--from whoosh.support.pyparsing import Group, Combine, Suppress, Optional, FollowedBy
--from whoosh.support.pyparsing import Literal, CharsNotIn, Word, Keyword, Regex
--from whoosh.support.pyparsing import Empty, White, Forward, QuotedString
--from whoosh.support.pyparsing import StringEnd, ParserElement
-+from pyparsing import printables, alphanums
-+from pyparsing import ZeroOrMore, OneOrMore
-+from pyparsing import Group, Combine, Suppress, Optional, FollowedBy
-+from pyparsing import Literal, CharsNotIn, Word, Keyword, Regex
-+from pyparsing import Empty, White, Forward, QuotedString
-+from pyparsing import StringEnd, ParserElement
- def make_thawab_qparser():
- escapechar = "\\"
-
diff --git a/debian/patches/series b/debian/patches/series
index 521440f..ae53562 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
separate_setup.py.diff
-pyparsing.diff
-show_search_summary_tooltips.diff
diff --git a/debian/patches/show_search_summary_tooltips.diff b/debian/patches/show_search_summary_tooltips.diff
deleted file mode 100644
index 1f85ef8..0000000
--- a/debian/patches/show_search_summary_tooltips.diff
+++ /dev/null
@@ -1,306 +0,0 @@
-Description: Show search summary as tooltips
-Origin: http://git.ojuba.org/cgit/thawab/commit/?id=a5ab69704b7d75bc44eee4163a8ee91594dcfb77
-Author: Muayyad Alsadi مؤيد السعدي <alsadi at ojuba.org>
-diff --git a/thawab-files/media/fx.css b/thawab-files/media/fx.css
-index 146aa78..135053b 100644
---- a/thawab-files/media/fx.css
-+++ b/thawab-files/media/fx.css
-@@ -1,4 +1,8 @@
- /* fx */
-+#async_tips_div {
-+ background-color:rgba(255,255,200,0.9);
-+}
-+
- #overlay {
- opacity:0.7;
- }
-diff --git a/thawab-files/media/main.css b/thawab-files/media/main.css
-index b892b5d..8499191 100644
---- a/thawab-files/media/main.css
-+++ b/thawab-files/media/main.css
-@@ -9,6 +9,40 @@ body {
- margin:0;padding:0;border:0;
- }
-
-+#async_tips_div {
-+ display:none;
-+ position: absolute;
-+ background-color:#ffe;
-+ left:20%;
-+}
-+#async_tips_div .match {
-+ background-color:#acf;
-+}
-+
-+#async_tips_div .term0 {
-+ background-color:#acf;
-+}
-+
-+#async_tips_div .term1 {
-+ background-color:#fca;
-+}
-+
-+#async_tips_div .term2 {
-+ background-color:#cfa;
-+}
-+
-+#async_tips_div .term3 {
-+ background-color:#fac;
-+}
-+
-+#async_tips_div .term4 {
-+ background-color:#afc;
-+}
-+
-+#async_tips_div .term5 {
-+ background-color:#caf;
-+}
-+
-
- .quran {
- font-family: "Simplified Naskh", "me_quran", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "Serif";
-diff --git a/thawab-files/media/main.js b/thawab-files/media/main.js
-index 7f2b43f..83a1f0e 100644
---- a/thawab-files/media/main.js
-+++ b/thawab-files/media/main.js
-@@ -108,18 +108,15 @@ function getAjax(url, q, success, failure) {
- xmlhttp.open("GET",s,true);
- xmlhttp.send(null);
- }
--var needs_external_json=false
--try {
-- var t=JSON.parse('"t"');
--} catch(e) {
-- needs_external_json=true;
--}
--if (!needs_external_json) {
-- var jsonParse=function (t) {return JSON.parse(t);}
-+var needs_external_json=false;
-+
-+function fromJson(t) {
-+ if (needs_external_json) return eval("("+t+")");
-+ return JSON.parse(t);
- }
-
- function getJson(url, q, success, failure) {
-- s=function(t){return success(jsonParse(t));};
-+ s=function(t){return success(fromJson(t));};
- getAjax(url, q, s, failure);
- }
-
-@@ -161,11 +158,15 @@ if (document.getElementsByClassName == undefined) {
- }
-
- function init() {
-+ try {
-+ var t=JSON.parse('"t"');
-+ } catch(e) {
-+ needs_external_json=true;
-+ }
- init_get_by_class();
- if (document.body.getAttribute(klass)!='body') {
- klass="className"; /* hack for ie */
- }
-- if (needs_external_json) import_script(script+"/_files/json.min.js");
- setTimeout(animation_loop, 100);
- animations["_s_up"]=[autoscroll_up_cb];
- animations["_s_dn"]=[autoscroll_down_cb];
-diff --git a/thawab-files/media/th-main.js b/thawab-files/media/th-main.js
-index fbc937b..7fc3439 100644
---- a/thawab-files/media/th-main.js
-+++ b/thawab-files/media/th-main.js
-@@ -4,10 +4,13 @@
- *
- **/
- var resultsPerPage=50;
--function main_search_row_factory(bu, r) {
-- return "<tr><td>"+html_escape(r.k)+"</td><td>-</td><td>-</td><td><a class='external' target='_blank' href='"+bu+encodeURI(r.k)+"#"+encodeURI(r.n)+"'>"+ html_escape(r.t)+"</a></td><td>"+html_escape(r.r)+"</td>\n";
-+var async_tips_div, mouse_x, mouse_y;
-+
-+function main_search_row_factory(u, bu, r) {
-+ return "<tr><td>"+html_escape(r.k)+"</td><td>-</td><td>-</td><td><a onmouseover='asynctip(this);' onmouseout='asynctip_hide(this);' class='external' target='_blank' rel='"+u+r.i+"' href='"+bu+encodeURI(r.k)+"#"+encodeURI(r.n)+"'>"+ html_escape(r.t)+"</a></td><td>"+html_escape(r.r)+"</td>\n";
- }
- var search_row_factory=main_search_row_factory;
-+
- function showSearchPage(hash, pg){
- var j,i=(pg-1)*resultsPerPage,o,h,l;
- var u=script+'/ajax/searchExcerpt/'+hash+'/',bu=script+'/view/';
-@@ -21,7 +24,7 @@ function showSearchPage(hash, pg){
- o.innerHTML=h;
- for (j=0;j<c;++j) {
- r=a[j];
-- h+=search_row_factory(bu, r);
-+ h+=search_row_factory(u, bu, r);
- }
- o.innerHTML=h;
- o=document.getElementsByClassName("current");
-@@ -47,6 +50,7 @@ function doSearch(q) {
- document.getElementById("SearchTime").innerHTML=d.t;
- document.getElementById("SearchRCount").innerHTML=d.c;
- pages=-Math.floor(-d.c/resultsPerPage);
-+ document.getElementById("SearchPagesCount").innerHTML=pages;
- o=document.getElementById("SearchPages");
- h='';
- o.innerHTML=h;
-@@ -65,3 +69,49 @@ function doSearch(q) {
-
- }
-
-+function moveMouse(E) {
-+ var e=window.event || E;
-+ mouse_x=window.pageXOffset+e.clientX
-+ mouse_y=window.pageYOffset+e.clientY
-+}
-+
-+function asynctip(e) {
-+ var l=document.getElementById("loading");
-+ l.style.display="block";
-+ async_tips_div.style.top=(mouse_y+e.offsetHeight+5)+"px";
-+ async_tips_div.innerHTML="...";
-+ async_tips_div.style.display="block";
-+ u=e.getAttribute('rel');
-+ getAjax(u, { },
-+ function (d) {
-+ async_tips_div.innerHTML=d;
-+ l.style.display="none"; /* should be faded */
-+ },
-+ function () {
-+ async_tips_div.style.display="none";
-+ l.style.display="none"; /* should show error */
-+ }
-+ );
-+
-+}
-+
-+function asynctip_hide(e) {
-+ async_tips_div.style.display="none";
-+}
-+
-+function async_tips_init() {
-+ var d=document.createElement("div");
-+ d.id="async_tips_div";
-+ d.style.width="60%";
-+ d.style.display="none";
-+ document.body.appendChild(d);
-+ async_tips_div=d;
-+
-+ if (typeof document.attachEvent!='undefined') {
-+ document.attachEvent('onmousemove',moveMouse);
-+ } else {
-+ document.addEventListener('mousemove',moveMouse,false);
-+ }
-+}
-+
-+init_ls.push(async_tips_init);
-diff --git a/thawab-files/media/th-view.js b/thawab-files/media/th-view.js
-index 519ff73..dd76279 100644
---- a/thawab-files/media/th-view.js
-+++ b/thawab-files/media/th-view.js
-@@ -4,8 +4,8 @@
- *
- **/
- var th_hash;
--function mini_search_row_factory(bu, r) {
-- return "<tr><td><a href='#"+encodeURI(r.n)+"'>"+ html_escape(r.t)+"</a></td><td>"+html_escape(r.r)+"</td>\n";
-+function mini_search_row_factory(u, bu, r) {
-+ return "<tr><td><a onmouseover='asynctip(this);' onmouseout='asynctip_hide(this);' rel='"+u+r.i+"' href='#"+encodeURI(r.n)+"'>"+ html_escape(r.t)+"</a></td><td>"+html_escape(r.r)+"</td>\n";
- }
- resultsPerPage=10; // defined in main.js
- search_row_factory=mini_search_row_factory;
-diff --git a/thawab-files/templates/main.html b/thawab-files/templates/main.html
-index e6b672c..06ed061 100644
---- a/thawab-files/templates/main.html
-+++ b/thawab-files/templates/main.html
-@@ -21,17 +21,17 @@ var script='%(script)s';
- <a id="logo" class="showOnFocus" href="/"><img src="%(script)s/_files/img/kutub.gif" alt="ثواب" /></a>
-
- <div id="absnav2">
-- <a class="blurOnFocus" style="float:right;" href="http://www.ojuba.org/wiki/thawab/" title="حول هذا البرنامج"><img src="%(script)s/_files/img/about.gif"/></a>
-- <a class="blurOnFocus" style="float:right;" href="http://www.ojuba.org/wiki/thawab/get" title="الحصول على ثواب"><img src="%(script)s/_files/img/rpm.gif"/></a>
-- <a class="blurOnFocus" style="float:right;" href="http://www.ojuba.org/wiki/اتصل_بنا" title="راسلنا"><img src="%(script)s/_files/img/mail.gif"/></a>
-- <a class="blurOnFocus" style="float:right;" href="http://www.linuxac.org/forum/forumdisplay.php?68" title="المنتدى"><img src="%(script)s/_files/img/forum.gif"/></a>
-- <a class="blurOnFocus" style="float:right;" href="http://git.ojuba.org/cgit/thawab/tree/" title="كود ثواب"><img src="%(script)s/_files/img/code.gif"/></a>
-+ <a class="blurOnFocus" style="float:right;" href="http://www.ojuba.org/wiki/thawab/" title="حول هذا البرنامج"><img src="%(script)s/_files/img/about.gif" alt="about" /></a>
-+ <a class="blurOnFocus" style="float:right;" href="http://www.ojuba.org/wiki/thawab/get" title="الحصول على ثواب"><img src="%(script)s/_files/img/rpm.gif" alt="get package" /></a>
-+ <a class="blurOnFocus" style="float:right;" href="http://www.ojuba.org/wiki/اتصل_بنا" title="راسلنا"><img src="%(script)s/_files/img/mail.gif" alt="contact us" /></a>
-+ <a class="blurOnFocus" style="float:right;" href="http://www.linuxac.org/forum/forumdisplay.php?68" title="المنتدى"><img src="%(script)s/_files/img/forum.gif" alt="forum" /></a>
-+ <a class="blurOnFocus" style="float:right;" href="http://git.ojuba.org/cgit/thawab/tree/" title="كود ثواب"><img src="%(script)s/_files/img/code.gif" alt="code" /></a>
-
- </div>
-
- <div id="absnav3">
-- <img src="%(script)s/_files/img/scrollup.png" class="blurOnFocus" style="float:right;" href="#" title="autoscroll up, click for document top" onclick="window.scroll(0,0);" onmouseover="autoscroll_dir=-1;" onmouseout="autoscroll_dir=0;" />
-- <img src="%(script)s/_files/img/scrolldn.png" class="blurOnFocus" style="float:right;" href="#" title="autoscroll down, click for document bottom" onclick="window.scroll(0,document.body.scrollHeight);" onmouseover="autoscroll_dir=1;" onmouseout="autoscroll_dir=0;" />
-+ <img alt="/\" src="%(script)s/_files/img/scrollup.png" class="blurOnFocus" style="float:right;" title="autoscroll up, click for document top" onclick="window.scroll(0,0);" onmouseover="autoscroll_dir=-1;" onmouseout="autoscroll_dir=0;" />
-+ <img alt="\/" src="%(script)s/_files/img/scrolldn.png" class="blurOnFocus" style="float:right;" title="autoscroll down, click for document bottom" onclick="window.scroll(0,document.body.scrollHeight);" onmouseover="autoscroll_dir=1;" onmouseout="autoscroll_dir=0;" />
- </div>
-
-
-@@ -44,7 +44,7 @@ var script='%(script)s';
- <div id="contentbody">
- <a name="search"></a><h2>البحث</h2>
- <div>
--<form name="SearchForm" onsubmit="doSearch(document.getElementById('q').value); return false;" style="margin:0;border:0;padding:0;">
-+<form action="" name="SearchForm" onsubmit="doSearch(document.getElementById('q').value); return false;" style="margin:0;border:0;padding:0;">
- <input id="q" class="search_inactive" type="text" value="نص البحث" onfocus="search_entry_focus(this);document.getElementById('searchHelpDiv').style.display='block';" onblur="search_entry_blur(this);" style="width:80%%"></input>
- </form>
- </div>
-@@ -66,7 +66,7 @@ var script='%(script)s';
- <th>باب</th><th>التقييم</th></tr>
- </thead>
- <tfoot><tr><td colspan="5"><div id="SearchPages">-</div></td></tr></tfoot>
-- <tbody id="SearchResults"></tbody>
-+ <tbody id="SearchResults"><tr><td colspan="5">-</td></tr></tbody>
- </table></center>
- </div>
-
-diff --git a/thawab-files/templates/view.html b/thawab-files/templates/view.html
-index fc8ddb2..b1d6f69 100644
---- a/thawab-files/templates/view.html
-+++ b/thawab-files/templates/view.html
-@@ -23,20 +23,20 @@ var kitabUid=encodeURI('%(kitabId)s');
- </head>
- <body dir="rtl" class="body">
- <div id="loading" class="showOnFocus"></div>
--<a id="logo" class="showOnFocus" href="/"><img src="%(script)s/_files/img/kutub.gif"/></a>
-+<a id="logo" class="showOnFocus" href="/"><img src="%(script)s/_files/img/kutub.gif" alt="ثواب" /></a>
- <div id="absnav">
- الرئيسية | اتصل بنا
- </div>
- <div id="absnav2">
-
-- <a id="prevLink" class="blurOnFocus" style="float:right;" href="%(prevUrl)s" title="%(prevTitle)s"><img src="%(script)s/_files/img/go-prev.gif"/></a>
-- <a id="upLink" class="blurOnFocus" style="float:right;" href="%(upUrl)s" title="%(upTitle)s"><img src="%(script)s/_files/img/go-up.gif"/></a>
-- <a class="blurOnFocus" style="float:right;" href="#_i0" title="%(title)s"><img src="%(script)s/_files/img/go-home.gif"/></a>
-- <a id="nextLink" class="blurOnFocus" style="float:right;" href="%(nextUrl)s" title="%(nextTitle)s"><img src="%(script)s/_files/img/go-next.gif"/></a>
-+ <a id="prevLink" class="blurOnFocus" style="float:right;" href="%(prevUrl)s" title="%(prevTitle)s"><img src="%(script)s/_files/img/go-prev.gif" alt="prev" /></a>
-+ <a id="upLink" class="blurOnFocus" style="float:right;" href="%(upUrl)s" title="%(upTitle)s"><img src="%(script)s/_files/img/go-up.gif" alt="up" /></a>
-+ <a class="blurOnFocus" style="float:right;" href="#_i0" title="%(title)s"><img src="%(script)s/_files/img/go-home.gif" alt="home" /></a>
-+ <a id="nextLink" class="blurOnFocus" style="float:right;" href="%(nextUrl)s" title="%(nextTitle)s"><img src="%(script)s/_files/img/go-next.gif" alt="next" /></a>
- </div>
- <div id="absnav3">
-- <img src="%(script)s/_files/img/scrollup.png" class="blurOnFocus" style="float:right;" href="#" title="autoscroll up, click for document top" onclick="window.scroll(0,0);" onmouseover="autoscroll_dir=-1;" onmouseout="autoscroll_dir=0;" />
-- <img src="%(script)s/_files/img/scrolldn.png" class="blurOnFocus" style="float:right;" href="#" title="autoscroll down, click for document bottom" onclick="window.scroll(0,document.body.scrollHeight);" onmouseover="autoscroll_dir=1;" onmouseout="autoscroll_dir=0;" />
-+ <img alt="/\" src="%(script)s/_files/img/scrollup.png" class="blurOnFocus" style="float:right;" title="autoscroll up, click for document top" onclick="window.scroll(0,0);" onmouseover="autoscroll_dir=-1;" onmouseout="autoscroll_dir=0;" />
-+ <img alt="\/" src="%(script)s/_files/img/scrolldn.png" class="blurOnFocus" style="float:right;" title="autoscroll down, click for document bottom" onclick="window.scroll(0,document.body.scrollHeight);" onmouseover="autoscroll_dir=1;" onmouseout="autoscroll_dir=0;" />
- </div>
- <div id="results" onmouseover="this.style.height='300px';" onmouseout="this.style.height='8px';">
-
-@@ -46,14 +46,14 @@ var kitabUid=encodeURI('%(kitabId)s');
- </div>
- <center><table style="width:90%%;">
- <tfoot><tr><td colspan="2"><div id="SearchPages">-</div></td></tr></tfoot>
-- <tbody id="SearchResults"></tbody>
-+ <tbody id="SearchResults"><tr><td colspan="2">-</td></tr></tbody>
- </table></center>
- </div>
-
- </div>
- <div id="minisearch">
--<img src="%(script)s/_files/img/search.gif" style="float:right;" />
--<form name="miniSearchForm" onsubmit="doMiniSearch(document.getElementById('q').value); return false;" style="margin:0;border:0;padding:0;">
-+<img src="%(script)s/_files/img/search.gif" style="float:right;" alt="search" />
-+<form action="" name="miniSearchForm" onsubmit="doMiniSearch(document.getElementById('q').value); return false;" style="margin:0;border:0;padding:0;">
- <input id="q" class="search_inactive" type="text" value="نص البحث" onfocus="search_entry_focus(this);document.getElementById('results').style.height='300px';" onblur="search_entry_blur(this);"></input>
- </form>
- </div>
--
Packaging for Thawab
More information about the Debian-islamic-commits
mailing list