[Python-modules-commits] r14773 - in packages/python-whoosh/trunk/debian (3 files)

[aelmahmoudy-guest at users.alioth.debian.org]

    Date: Friday, October 29, 2010 @ 06:08:40
  Author: aelmahmoudy-guest
Revision: 14773

* New upstream release
* Remove simplify.diff patch, as it is fixed upstream.

Modified:
  packages/python-whoosh/trunk/debian/changelog
  packages/python-whoosh/trunk/debian/patches/series
Deleted:
  packages/python-whoosh/trunk/debian/patches/simplify.diff

Modified: packages/python-whoosh/trunk/debian/changelog
===================================================================
--- packages/python-whoosh/trunk/debian/changelog	2010-10-28 13:43:31 UTC (rev 14772)
+++ packages/python-whoosh/trunk/debian/changelog	2010-10-29 06:08:40 UTC (rev 14773)
@@ -1,10 +1,9 @@
-python-whoosh (1.1.1-1) experimental; urgency=low
+python-whoosh (1.2.3-1) experimental; urgency=low
 
   * New upstream release.
   * Refreshed shm_check.diff patch.
-  * Added patch (simplify.diff) to make test_simplify pass.
 
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Thu, 28 Oct 2010 10:36:37 +0200
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Fri, 29 Oct 2010 08:07:24 +0200
 
 python-whoosh (1.1.0-1) experimental; urgency=low
 

Modified: packages/python-whoosh/trunk/debian/patches/series
===================================================================
--- packages/python-whoosh/trunk/debian/patches/series	2010-10-28 13:43:31 UTC (rev 14772)
+++ packages/python-whoosh/trunk/debian/patches/series	2010-10-29 06:08:40 UTC (rev 14773)
@@ -1,2 +1 @@
 shm_check.diff
-simplify.diff

Deleted: packages/python-whoosh/trunk/debian/patches/simplify.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/simplify.diff	2010-10-28 13:43:31 UTC (rev 14772)
+++ packages/python-whoosh/trunk/debian/patches/simplify.diff	2010-10-29 06:08:40 UTC (rev 14773)
@@ -1,15 +0,0 @@
-Description: Patch simplify function to make test_simplify pass
-  The change was taken from older version of Whoosh (1.1.0)
-Forwarded: http://bitbucket.org/mchaput/whoosh/issue/58/test_simplify-fails
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/src/whoosh/query.py
-+++ b/src/whoosh/query.py
-@@ -394,7 +394,7 @@
- 
-     def simplify(self, ixreader):
-         existing = [Term(self.fieldname, word, boost=self.boost)
--                    for word in set(self._words(ixreader))]
-+                    for word in self._words(ixreader)]
-         if len(existing) == 1:
-             return existing[0]
-         elif existing: