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

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

    Date: Sunday, January 31, 2010 @ 10:02:12
  Author: aelmahmoudy-guest
Revision: 11474

* New upstream release.
* Refresh 01-remove-pyparsing.diff patch.
* debian/control: Bumped Standards-Version to 3.8.4

Modified:
  packages/python-whoosh/trunk/debian/changelog
  packages/python-whoosh/trunk/debian/control
  packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff

Modified: packages/python-whoosh/trunk/debian/changelog
===================================================================
--- packages/python-whoosh/trunk/debian/changelog	2010-01-31 06:08:27 UTC (rev 11473)
+++ packages/python-whoosh/trunk/debian/changelog	2010-01-31 10:02:12 UTC (rev 11474)
@@ -1,14 +1,16 @@
-python-whoosh (0.3.9-1) unstable; urgency=low
+python-whoosh (0.3.15-1) UNRELEASED; urgency=low
 
   [ أحمد المحمودي (Ahmed El-Mahmoudy) ]
   * New upstream release.
   * debian/rules: Override dh_fixperms to remove executable bit from files in
     /usr/share/pyshared/*.egg-info/
+  * Refresh 01-remove-pyparsing.diff patch.
+  * debian/control: Bumped Standards-Version to 3.8.4
 
   [ Bernd Zeimetz ]
   * Switch Uploaders and Maintainers in debian/control.
 
- -- Daniel Watkins <daniel at daniel-watkins.co.uk>  Mon, 28 Dec 2009 11:39:23 +0000
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Sun, 31 Jan 2010 11:51:02 +0200
 
 python-whoosh (0.3.2-1) unstable; urgency=low
 

Modified: packages/python-whoosh/trunk/debian/control
===================================================================
--- packages/python-whoosh/trunk/debian/control	2010-01-31 06:08:27 UTC (rev 11473)
+++ packages/python-whoosh/trunk/debian/control	2010-01-31 10:02:12 UTC (rev 11474)
@@ -5,7 +5,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50), python-setuptools, quilt (>= 0.46-7)
 Build-Depends-Indep: python-support, python-pyparsing
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://whoosh.ca/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-whoosh/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-whoosh/trunk/

Modified: packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff	2010-01-31 06:08:27 UTC (rev 11473)
+++ packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff	2010-01-31 10:02:12 UTC (rev 11474)
@@ -4,29 +4,22 @@
 ## so we remove the unnecessary copy here, and fix references to it
 ## that we break.
 
---- a/src/whoosh/qparser.py
-+++ b/src/whoosh/qparser.py
-@@ -56,17 +56,16 @@ http://pyparsing.wikispaces.com/space/sh
- 
- import re
- 
--from whoosh.support.pyparsing import printables, alphanums
--from whoosh.support.pyparsing import ZeroOrMore, OneOrMore
--from whoosh.support.pyparsing import Group, Combine, Suppress, Optional, FollowedBy
--from whoosh.support.pyparsing import Literal, CharsNotIn, Word, Keyword
--from whoosh.support.pyparsing import Empty, White, Forward, QuotedString
--from whoosh.support.pyparsing import StringEnd, ParserElement
-+from pyparsing import printables, alphanums
-+from pyparsing import ZeroOrMore, OneOrMore
-+from pyparsing import Group, Combine, Suppress, Optional, FollowedBy
-+from pyparsing import Literal, CharsNotIn, Word, Keyword
-+from pyparsing import Empty, White, Forward, QuotedString
-+from pyparsing import StringEnd, ParserElement
- 
- from whoosh.analysis import NgramAnalyzer
- from whoosh.query import *
- 
--
- def _make_default_parser():
-     escapechar = "\\"
-     
+--- a/src/whoosh/qparser/default.py
++++ b/src/whoosh/qparser/default.py
+@@ -53,11 +53,11 @@
+ # - Rudolph Froger
+ # - Paul McGuire
+ 
+-from whoosh.support.pyparsing import (printables, alphanums, OneOrMore,
+-                                      Group, Combine, Suppress, Optional, FollowedBy,
+-                                      Literal, CharsNotIn, Word, Keyword,
+-                                      Empty, White, Forward, QuotedString,
+-                                      StringEnd)
++from pyparsing import (printables, alphanums, OneOrMore,
++                       Group, Combine, Suppress, Optional, FollowedBy,
++                       Literal, CharsNotIn, Word, Keyword,
++                       Empty, White, Forward, QuotedString,
++                       StringEnd)
+ from whoosh.query import *
+ 
+