[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 15c1c6f709bcc4bff47a716638e9a10e8a78272f
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Thu Jun 17 22:51:26 2010 +0300

    Separate the diff that moves the call for generating Qur'an index to a
    separate patch

diff --git a/debian/patches/separate_setup.py.diff b/debian/patches/gen-index_setup.py.diff
similarity index 78%
copy from debian/patches/separate_setup.py.diff
copy to debian/patches/gen-index_setup.py.diff
index 95a4ca9..d892341 100644
--- a/debian/patches/separate_setup.py.diff
+++ b/debian/patches/gen-index_setup.py.diff
@@ -1,5 +1,5 @@
-Description: Do not call setup.py from Makefile
- For Debian packaging, it would be better to call setup.py using debhelper.
+Description: 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.
 Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
 Forwarded: not-needed
 
@@ -14,14 +14,6 @@ Forwarded: not-needed
  
  icons:
  	for i in 96 72 64 48 36 32 24 22 16; do \
-@@ -21,7 +21,6 @@
- 
- install: all
- 	rm othman-data/quran-kareem.png || :
--	python setup.py install -O2 --root $(DESTDIR)
- 	$(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 @@
diff --git a/debian/patches/separate_setup.py.diff b/debian/patches/separate_setup.py.diff
index 95a4ca9..c49a2c7 100644
--- a/debian/patches/separate_setup.py.diff
+++ b/debian/patches/separate_setup.py.diff
@@ -5,15 +5,6 @@ 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
@@ -22,43 +13,3 @@ 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
- )
- 
diff --git a/debian/patches/series b/debian/patches/series
index ae53562..18c6750 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 separate_setup.py.diff
+gen-index_setup.py.diff

-- 
Packaging for Othman