[Debian-islamic-commits] [thawab] 03/06: Refreshed separate_setup.py.diff patch

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

This is an automated email from the git hooks/post-receive script.

aelmahmoudy-guest pushed a commit to branch master
in repository thawab.

commit 876a80615c8bbcd645011dfefa6ddab7afe998f8
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Wed Oct 1 14:53:58 2014 +0200

    Refreshed separate_setup.py.diff patch
    
    Removed mdbtools-0.7.diff & whoosh-2.5.diff patches, as they have been
    implemented upstream
---
 debian/patches/mdbtools-0.7.diff      | 25 -------------------------
 debian/patches/separate_setup.py.diff | 14 +++++++-------
 debian/patches/series                 |  2 --
 debian/patches/whoosh-2.5.diff        | 16 ----------------
 4 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/debian/patches/mdbtools-0.7.diff b/debian/patches/mdbtools-0.7.diff
deleted file mode 100644
index e207258..0000000
--- a/debian/patches/mdbtools-0.7.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix for mdbtools 0.7
-Bug-Debian: http://bugs.debian.org/704907
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/thawab/+bug/1112821
-Forwarded: yes
-
---- a/Thawab/shamelaUtils.py
-+++ b/Thawab/shamelaUtils.py
-@@ -206,7 +206,7 @@
-     if is_tmp: temp='temp'
-     else: temp=''
-     fn=self._getTableFile(Tb)
--    pipe=Popen(['mdb-schema', '-S','-T', Tb, fn], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
-+    pipe=Popen(['mdb-schema', '-T', Tb, fn], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
-     r=pipe.communicate()[0].replace('\r','')
-     if pipe.returncode!=0: raise TypeError
-     sql=schema_fix_text.sub('TEXT',schema_fix_int.sub('INETEGER',schema_fix_del.sub('',r))).lower()
-@@ -239,7 +239,7 @@
-     if Tb in self.imported_tables: return
-     self.importTableSchema(Tb, tb, is_tmp, tb_prefix)
-     fn=self._getTableFile(Tb)
--    pipe=Popen(['mdb-export', '-R',';\n'+mark,'-I', fn, Tb], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
-+    pipe=Popen(['mdb-export', '-R','\n'+mark,'-I', 'postgres', fn, Tb], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
-     sql_cmd=[]
-     prefix=""
-     if is_ignore: prefix="OR IGNORE INTO "
diff --git a/debian/patches/separate_setup.py.diff b/debian/patches/separate_setup.py.diff
index 5e4ddeb..9aa2860 100644
--- a/debian/patches/separate_setup.py.diff
+++ b/debian/patches/separate_setup.py.diff
@@ -5,11 +5,11 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
-@@ -15,7 +15,6 @@
- 	make -C po all
+@@ -25,7 +25,6 @@
  
- install: all
--	python setup.py install -O2 --root $(DESTDIR)
- 	$(INSTALL) -d $(datadir)/applications/
- 	$(INSTALL) -d $(datadir)/thawab/
- 	$(INSTALL) -m 0644 thawab.desktop $(datadir)/applications/
+ install: locale
+ 	@$(ECHO) "*** Installing..."
+-	@$(PYTHON) setup.py install -O2 --root $(DESTDIR)
+ 	@$(ECHO) "Copying: $(APPNAME).desktop -> $(DATADIR)/applications/"
+ 	@$(INSTALL) -d $(DATADIR)/applications/
+ 	@$(INSTALL) -d $(DATADIR)/$(APPNAME)/
diff --git a/debian/patches/series b/debian/patches/series
index f132d23..ad8e6a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 private-pkg.diff
 separate_setup.py.diff
 desktop-categories.diff
-whoosh-2.5.diff
-mdbtools-0.7.diff
diff --git a/debian/patches/whoosh-2.5.diff b/debian/patches/whoosh-2.5.diff
deleted file mode 100644
index bbd1a9e..0000000
--- a/debian/patches/whoosh-2.5.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix for Whoosh >= 2.5
-Forwarded: yes
-
-diff --git a/Thawab/whooshSearchEngine.py b/Thawab/whooshSearchEngine.py
-index a274afb..2480445 100644
---- a/Thawab/whooshSearchEngine.py
-+++ b/Thawab/whooshSearchEngine.py
-@@ -24,7 +24,7 @@ from meta import prettyId,makeId
- from whoosh import query
- from whoosh.index import EmptyIndexError, create_in, open_dir, IndexVersionError
- from whoosh.highlight import highlight, SentenceFragmenter, BasicFragmentScorer, FIRST, HtmlFormatter
--from whoosh.filedb.fileindex import _INDEX_VERSION as whoosh_ix_ver
-+from whoosh.index import _CURRENT_TOC_VERSION as whoosh_ix_ver
- from whoosh.filedb.filestore import FileStorage
- from whoosh.fields import Schema, ID, IDLIST, TEXT
- from whoosh.formats import Frequency

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git