[Python-modules-commits] r12219 - in packages/pystemmer/trunk/debian (5 files)

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

    Date: Monday, March 8, 2010 @ 22:20:07
  Author: stefanor-guest
Revision: 12219

Build against libstemmer package, rather than included libstemmer_c

Added:
  packages/pystemmer/trunk/debian/patches/link-libstemmer.diff
Modified:
  packages/pystemmer/trunk/debian/changelog
  packages/pystemmer/trunk/debian/control
  packages/pystemmer/trunk/debian/patches/series
  packages/pystemmer/trunk/debian/rules

Modified: packages/pystemmer/trunk/debian/changelog
===================================================================
--- packages/pystemmer/trunk/debian/changelog	2010-03-08 01:35:09 UTC (rev 12218)
+++ packages/pystemmer/trunk/debian/changelog	2010-03-08 22:20:07 UTC (rev 12219)
@@ -1,5 +1,5 @@
 pystemmer (1.1.0-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #375441, #486623)
+  * Initial release (Closes: #375441)
 
- -- Stefano Rivera <stefano at rivera.za.net>  Mon, 01 Mar 2010 20:52:33 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Tue, 09 Mar 2010 00:19:35 +0200

Modified: packages/pystemmer/trunk/debian/control
===================================================================
--- packages/pystemmer/trunk/debian/control	2010-03-08 01:35:09 UTC (rev 12218)
+++ packages/pystemmer/trunk/debian/control	2010-03-08 22:20:07 UTC (rev 12219)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefano at rivera.za.net>
-Build-Depends: debhelper (>= 7.3.5~), python-support (>= 0.90), python-all-dev,
- python-all-dbg, python-pyrex, python-epydoc
+Build-Depends: debhelper (>= 7.3.5~), libstemmer1-dev,
+ python-support (>= 0.90), python-all-dev, python-all-dbg, python-pyrex,
+ python-epydoc
 XS-Python-Version: >= 2.4
 Standards-Version: 3.8.4
 Homepage: http://snowball.tartarus.org/

Added: packages/pystemmer/trunk/debian/patches/link-libstemmer.diff
===================================================================
--- packages/pystemmer/trunk/debian/patches/link-libstemmer.diff	                        (rev 0)
+++ packages/pystemmer/trunk/debian/patches/link-libstemmer.diff	2010-03-08 22:20:07 UTC (rev 12219)
@@ -0,0 +1,51 @@
+Description: Dynamically Link against libstemmer rather than using included
+ libstemmer_c sources.
+Author: Stefano Rivera <stefano at rivera.za.net>
+Forwarded: no
+Last-Update: 2010-03-08
+
+--- a/setup.py
++++ b/setup.py
+@@ -9,31 +9,14 @@
+ except:
+     have_pyrex = 0
+ 
+-# Directory which libstemmer sources are unpacked in.
+-library_dir = 'libstemmer_c'
+-
+-# Directories in libstemmer which contain libstemmer sources (ie, not
+-# examples, etc).
+-library_core_dirs = ('src_c', 'runtime', 'libstemmer', 'include')
+-
+-# Read the manifest of files in libstemmer.
+-src_files = [os.path.join(library_dir, line.strip().replace(' \\', ''))
+-             for line in open(os.path.join(library_dir, 'mkinc_utf8.mak'))
+-             if len(line.strip()) > 2
+-             and (line.strip().endswith('.c \\') or line.strip().endswith('.c'))
+-             and os.path.split(line.strip())[0] in library_core_dirs]
+-
+-# Set the include path to include libstemmer.
+-include_dirs = ('src', os.path.join(library_dir, 'include'))
+-
+ if have_pyrex:
+     # Add the pyrex sources, and a special rule so distutils knows how to
+     # use them.
+-    src_files.append('src/Stemmer.pyx')
++    src_files = ['src/Stemmer.pyx']
+     cmdclass = {'build_ext': build_ext}
+ else:
+     # Add just the C sources.
+-    src_files.append('src/Stemmer.c')
++    src_files = ['src/Stemmer.c']
+     cmdclass = {}
+       
+ long_description = r"""
+@@ -108,7 +91,7 @@
+       ],
+ 
+       ext_modules = [Extension('Stemmer', src_files,
+-                               include_dirs = include_dirs)],
++                               libraries=['stemmer'])],
+       cmdclass = cmdclass
+      )
+ 

Modified: packages/pystemmer/trunk/debian/patches/series
===================================================================
--- packages/pystemmer/trunk/debian/patches/series	2010-03-08 01:35:09 UTC (rev 12218)
+++ packages/pystemmer/trunk/debian/patches/series	2010-03-08 22:20:07 UTC (rev 12219)
@@ -1 +1,2 @@
 test-exit-code.diff
+link-libstemmer.diff

Modified: packages/pystemmer/trunk/debian/rules
===================================================================
--- packages/pystemmer/trunk/debian/rules	2010-03-08 01:35:09 UTC (rev 12218)
+++ packages/pystemmer/trunk/debian/rules	2010-03-08 22:20:07 UTC (rev 12219)
@@ -31,3 +31,6 @@
 override_dh_strip:
 	dh_strip --dbg-package=python-stemmer-dbg
 	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
+
+override_dh_installdocs:
+	dh_installdocs --link-doc=python-stemmer