[Python-modules-commits] r12056 - in packages/pystemmer/trunk/debian (4 files)

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

    Date: Monday, March 1, 2010 @ 18:10:27
  Author: stefanor-guest
Revision: 12056

Drop force-pyrex.diff and simply delete bundled generated C

Modified:
  packages/pystemmer/trunk/debian/patches/series
  packages/pystemmer/trunk/debian/patches/test-exit-code.diff
  packages/pystemmer/trunk/debian/rules
Deleted:
  packages/pystemmer/trunk/debian/patches/force-pyrex.diff

Deleted: packages/pystemmer/trunk/debian/patches/force-pyrex.diff
===================================================================
--- packages/pystemmer/trunk/debian/patches/force-pyrex.diff	2010-03-01 18:09:29 UTC (rev 12055)
+++ packages/pystemmer/trunk/debian/patches/force-pyrex.diff	2010-03-01 18:10:27 UTC (rev 12056)
@@ -1,21 +0,0 @@
-Description: Don't allow setup.py to silently use existing Pyrex-generated C.
-Author: Stefano Rivera <stefano at rivera.za.net>
-Forwarded: no
-Last-Update: 1010-02-27
-
---- a/setup.py
-+++ b/setup.py
-@@ -3,11 +3,8 @@
- from distutils.core import setup, Extension
- import os.path
- 
--try:
--    from Pyrex.Distutils import build_ext
--    have_pyrex = 1
--except:
--    have_pyrex = 0
-+from Pyrex.Distutils import build_ext
-+have_pyrex = 1
- 
- # Directory which libstemmer sources are unpacked in.
- library_dir = 'libstemmer_c'

Modified: packages/pystemmer/trunk/debian/patches/series
===================================================================
--- packages/pystemmer/trunk/debian/patches/series	2010-03-01 18:09:29 UTC (rev 12055)
+++ packages/pystemmer/trunk/debian/patches/series	2010-03-01 18:10:27 UTC (rev 12056)
@@ -1,2 +1 @@
-force-pyrex.diff
 test-exit-code.diff

Modified: packages/pystemmer/trunk/debian/patches/test-exit-code.diff
===================================================================
--- packages/pystemmer/trunk/debian/patches/test-exit-code.diff	2010-03-01 18:09:29 UTC (rev 12055)
+++ packages/pystemmer/trunk/debian/patches/test-exit-code.diff	2010-03-01 18:10:27 UTC (rev 12056)
@@ -5,15 +5,15 @@
 
 --- a/runtests.py
 +++ b/runtests.py
-@@ -1,5 +1,9 @@
+@@ -1,5 +1,10 @@
  #!/usr/bin/env python
--
+ 
  import doctest
 -doctest.testfile('docs/quickstart.txt')
 +from sys import exit
+ 
++fails, tests = doctest.testfile('docs/quickstart.txt')
 +
-+fails, tests = doctest.testfile('docs/quickstart.txt')
- 
 +if fails > 0:
 +    exit(1)
 +print 'All %i tests passed' % tests

Modified: packages/pystemmer/trunk/debian/rules
===================================================================
--- packages/pystemmer/trunk/debian/rules	2010-03-01 18:09:29 UTC (rev 12055)
+++ packages/pystemmer/trunk/debian/rules	2010-03-01 18:10:27 UTC (rev 12056)
@@ -4,6 +4,7 @@
 	dh $@
 
 override_dh_auto_build:
+	rm src/Stemmer.c
 	dh_auto_build
 	mkdir -p debian/html/api
 	epydoc --html -o debian/html/api --name="PyStemmer" \