[Debian-islamic-commits] [SCM] Packaging for Thawab branch, master, updated. debian/3.0.11-1-2-gbc72024

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 269908301c02d196380f39aca2cf1dc9e230dbbf
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Aug 12 13:11:47 2011 +0200

    Imported Upstream version 3.0.12

diff --git a/Thawab/gtkUi.py b/Thawab/gtkUi.py
index 3ee3f15..f13e412 100644
--- a/Thawab/gtkUi.py
+++ b/Thawab/gtkUi.py
@@ -782,7 +782,7 @@ class ThMainWindow(gtk.Window):
     img.set_from_stock(gtk.STOCK_HELP, gtk.ICON_SIZE_BUTTON)
     b=gtk.ToolButton(icon_widget=img, label=_("Help"))
     b.set_tooltip_text(_("Show user manual"))
-    b.connect('clicked', lambda a: self._content.new_tab ("http://127.0.0.1:%d/_files/manual/manual.html" % port))
+    b.connect('clicked', lambda a: self._content.new_tab ("http://127.0.0.1:%d/_theme/manual/manual.html" % port))
     tools.insert(b, -1)
 
     self._content.new_tab()
diff --git a/Thawab/shamelaUtils.py b/Thawab/shamelaUtils.py
index 841aeda..4862a72 100644
--- a/Thawab/shamelaUtils.py
+++ b/Thawab/shamelaUtils.py
@@ -455,7 +455,7 @@ def shamelaImport(cursor, sh, bkid, footnote_re=ur'\((\d+)\)', body_footnote_re=
   c=sh.c
   # step 0: prepare shorts
   shorts_t=c.execute("SELECT islamshort FROM main WHERE bkid=?", (bkid,)).fetchone()
-  if shorts_t: shorts_t=shorts_t[0]
+  if shorts_t: shorts_t=shorts_t[0] or 0
   else: shorts_t=0
   if shorts_t>1:
     shorts_dict=dict(c.execute("SELECT ramz,nass FROM shorts WHERE bk=?", (bkid,)).fetchall())
diff --git a/thawab.spec b/thawab.spec
index 64a91ee..a0cff07 100644
--- a/thawab.spec
+++ b/thawab.spec
@@ -1,7 +1,7 @@
 Name: thawab
 Summary: Thawab Arabic/Islamic encyclopedia system
 URL: http://thawab.ojuba.org/
-Version: 3.0.11
+Version: 3.0.12
 Release: 1%{?dist}
 Source0: http://git.ojuba.org/cgit/%{name}/snapshot/%{name}-%{version}.tar.bz2
 License: Waqf

-- 
Packaging for Thawab