[Debian-islamic-commits] [thawab] 01/08: Imported Upstream version 3.2.0
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at sabily.org
Thu Mar 19 07:38:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
aelmahmoudy-guest pushed a commit to branch master
in repository thawab.
commit 6556a0f25ec8c7c9225408cb8ec65e87b9a1a62f
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date: Tue Mar 17 13:08:51 2015 +0200
Imported Upstream version 3.2.0
---
Makefile | 2 ++
Thawab/gtkUi.py | 17 +++++++++++++++++
setup.py | 2 +-
thawab-data/themes/default/static/main.css | 4 ++--
thawab-data/themes/default/static/manual/all.css | 4 ++--
thawab-server | 6 ++++++
thawab.spec | 8 ++++++--
7 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index a99594c..f794688 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ uninstall:
@$(RM) -f $(DESTDIR)/usr/share/locale/*/LC_MESSAGES/$(APPNAME).mo
@$(ECHO) "- Removing: $(DESTDIR)/usr/bin/$(APPNAME)"
@$(RM) -f $(DESTDIR)/usr/bin/$(APPNAME)-gtk
+ @$(RM) -f $(DESTDIR)/usr/bin/$(APPNAME)-server
@$(ECHO) "- Removing: $(DESTDIR)/usr/lib/python*/*-packages/Thawab"
@$(RM) -rf $(DESTDIR)/usr/lib/python*/*-packages/Thawab
@$(ECHO) "- Removing: $(DESTDIR)/usr/lib/python*/*-packages/$(APPNAME)*"
@@ -58,6 +59,7 @@ uninstall:
@$(RM) -f $(DESTDIR)/usr/*/share/locale/*/LC_MESSAGES/$(APPNAME).mo
@$(ECHO) "- Removing: $(DESTDIR)/usr/*/bin/$(APPNAME)"
@$(RM) -f $(DESTDIR)/usr/*/bin/$(APPNAME)-gtk
+ @$(RM) -f $(DESTDIR)/usr/*/bin/$(APPNAME)-server
@$(ECHO) "- Removing: $(DESTDIR)/usr/*/lib/python*/*-packages/Thawab"
@$(RM) -rf $(DESTDIR)/usr/*/lib/python*/*-packages/Thawab
@$(ECHO) "- Removing: $(DESTDIR)/usr/*/lib/python*/*-packages/$(APPNAME)*"
diff --git a/Thawab/gtkUi.py b/Thawab/gtkUi.py
index aca1efa..bf69320 100644
--- a/Thawab/gtkUi.py
+++ b/Thawab/gtkUi.py
@@ -1011,6 +1011,23 @@ def launchServer():
launched = True
return th, port, server
+def onlyterminal(): #To run thawab by terminal only by thawab-server
+ exedir = os.path.dirname(sys.argv[0])
+ ld = os.path.join(exedir,'..','share','locale')
+ if not os.path.isdir(ld):
+ ld = os.path.join(exedir, 'locale')
+ gettext.install('thawab', ld, unicode = 0)
+ th, port, server = launchServer()
+
+ try:
+ thread=threading.Thread(target=server.serve_forever, args=())
+ thread.daemon=True
+ thread.start()
+ while True: time.sleep(100)
+ except (KeyboardInterrupt, SystemExit):
+ print '\nHope to made a nice time, Ojuba team <ojuba.org>.\n'
+ os._exit(0)
+
def main():
exedir = os.path.dirname(sys.argv[0])
ld = os.path.join(exedir,'..','share','locale')
diff --git a/setup.py b/setup.py
index 959a206..e5b95b3 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup (name='thawab', version='3.0.10',
url='http://thawab.ojuba.org/',
license='Waqf',
packages=['Thawab'],
- scripts=['thawab-gtk'],
+ scripts=['thawab-gtk','thawab-server'],
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: End Users/Desktop',
diff --git a/thawab-data/themes/default/static/main.css b/thawab-data/themes/default/static/main.css
index 4ea21e0..b8f7008 100644
--- a/thawab-data/themes/default/static/main.css
+++ b/thawab-data/themes/default/static/main.css
@@ -5,7 +5,7 @@ a[href]:hover { text-decoration: underline; }
a[target] { background: transparent url('img/external.gif') top left no-repeat; padding-left:12px;}
body {
- font-family: "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans";
+ font-family: "amiri", "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans";
background:#000;
margin:0;padding:0;border:0;
}
@@ -56,7 +56,7 @@ clear:both;
.quran {
- font-family: "amiri", "Simplified Naskh", "me_quran", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "Serif";
+ font-family: "amiri-quran", "amiri", "Simplified Naskh", "me_quran", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "Serif";
font-size: 150%;
color: #240;
background-color:#ffe;
diff --git a/thawab-data/themes/default/static/manual/all.css b/thawab-data/themes/default/static/manual/all.css
index 922b65a..508a11e 100644
--- a/thawab-data/themes/default/static/manual/all.css
+++ b/thawab-data/themes/default/static/manual/all.css
@@ -6,7 +6,7 @@ a[href]:hover { text-decoration: underline; }
a[target] { background: transparent url('../img/external.gif') top left no-repeat; padding: 0 0 0 12px;}
body {
- font-family: "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans";
+ font-family: "amiri", "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans";
background:#999;
margin:0;padding:3em;border:0;
}
@@ -16,7 +16,7 @@ body {
border: #aaa solid 4px;
}
h1, h2, h3, h4 {
- font-family: "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans", sans-serif;
+ font-family: "amiri", "Liberation Sans", "KacstOne", "Simplified Naskh", "KFGQPC Uthman Taha Naskh", "ArabeyesQr", "Times New Roman", "sans", "Sans", sans-serif;
color: #437f22;
font-weight: bold;
}
diff --git a/thawab-server b/thawab-server
new file mode 100755
index 0000000..cad4921
--- /dev/null
+++ b/thawab-server
@@ -0,0 +1,6 @@
+#!/usr/bin/python2
+# -*- coding: UTF-8 -*-
+
+from Thawab.gtkUi import onlyterminal
+onlyterminal()
+
diff --git a/thawab.spec b/thawab.spec
index bec36d3..a0df9aa 100644
--- a/thawab.spec
+++ b/thawab.spec
@@ -4,8 +4,8 @@
Name: thawab
Summary: Thawab Arabic/Islamic encyclopedia system
URL: http://ojuba.org/
-Version: 3.1.1
-Release: 2%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
License: WAQFv2
Group: System Environment/Base
@@ -55,6 +55,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc waqf2-ar.pdf readme
%{_bindir}/thawab-gtk
+%{_bindir}/thawab-server
%{python2_sitelib}/Thawab/*
%{python2_sitelib}/*.egg-info
%{_datadir}/thawab/
@@ -64,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/locale/*/*/*.mo
%changelog
+* Sat Feb 14 2015 Mosaab Alzoubi <moceap at hotmail.com> - 3.2.0-1
+- Add Thawab Server.
+
* Sat Feb 15 2014 Mosaab Alzoubi <moceap at hotmail.com> - 3.1.1-2
- Genera Revision.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git
More information about the Debian-islamic-commits
mailing list