[Debian-islamic-commits] [SCM] Packaging for Othman branch, master, updated. upstream/0.2.5-20-g7acc8d0

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit d3b6114add33de424335fa649c3742c5948129df
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Thu Jun 17 21:41:48 2010 +0300

    Update patch to also move call to generate Qur'an index from Makefile to
    setup.py, that would make the package build even if python2.5 is the
    default python.

diff --git a/debian/patches/separate_setup.py.diff b/debian/patches/separate_setup.py.diff
index c49a2c7..95a4ca9 100644
--- a/debian/patches/separate_setup.py.diff
+++ b/debian/patches/separate_setup.py.diff
@@ -5,6 +5,15 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
+@@ -5,7 +5,7 @@
+ SOURCES=$(wildcard *.desktop.in)
+ TARGETS=${SOURCES:.in=}
+ 
+-all: $(TARGETS) icons othman-data/ix.db
++all: $(TARGETS) icons
+ 
+ icons:
+ 	for i in 96 72 64 48 36 32 24 22 16; do \
 @@ -21,7 +21,6 @@
  
  install: all
@@ -13,3 +22,43 @@ Forwarded: not-needed
  	$(INSTALL) -d $(datadir)/applications/
  	$(INSTALL) -m 0644 Othman.desktop $(datadir)/applications/
  	for i in 96 72 64 48 36 32 24 22 16; do \
+--- a/setup.py
++++ b/setup.py
+@@ -6,6 +6,29 @@
+ # to install type: 
+ # python setup.py install --root=/
+ 
++from distutils.command.build import build
++from distutils.command.clean import clean
++
++class my_build(build):
++  def run(self):
++    build.run(self)
++    # generate data
++    from othman.core import othmanCore, searchIndexer
++
++    if not os.path.isfile('othman-data/ix.db'):
++      q=othmanCore(False)
++      ix=searchIndexer(True)
++      for n,(o,i) in enumerate(q.getAyatIter(1, 6236)):
++        for w in i.split(): ix.addWord(w,n+1)
++      d=os.path.dirname(sys.argv[0])
++      ix.save()
++
++class my_clean(clean):
++  def run(self):
++    clean.run(self)
++    try: os.unlink('othman-data/ix.db')
++    except OSError: pass
++
+ locales=map(lambda i: ('share/'+i,[''+i+'/othman.mo',]),glob('locale/*/LC_MESSAGES'))
+ data_files=[('share/othman/',glob('othman-data/*'))]
+ data_files.extend(locales)
+@@ -23,6 +46,7 @@
+           'Operating System :: POSIX',
+           'Programming Language :: Python',
+           ],
++      cmdclass={'build': my_build, 'clean': my_clean},
+       data_files=data_files
+ )
+ 

-- 
Packaging for Othman