[Python-modules-commits] r18229 - in packages/pystemmer/trunk/debian (11 files)

stefanor at users.alioth.debian.org stefanor at users.alioth.debian.org
Sun Aug 21 21:33:39 UTC 2011


    Date: Sunday, August 21, 2011 @ 21:33:38
  Author: stefanor
Revision: 18229

* New upstream release.
  - Uses Cython instead of Pyrex
  - Python3 support.
* Build python3 packages.
* Split documentation into python-stemmer-doc.
* Use py_builddir_sh macro from python.mk.
  - Bump python B-D to >= 2.6.6-14~.

Added:
  packages/pystemmer/trunk/debian/python-stemmer-doc.doc-base
    (from rev 18224, packages/pystemmer/trunk/debian/doc-base)
  packages/pystemmer/trunk/debian/python-stemmer-doc.docs
    (from rev 18224, packages/pystemmer/trunk/debian/docs)
Modified:
  packages/pystemmer/trunk/debian/changelog
  packages/pystemmer/trunk/debian/control
  packages/pystemmer/trunk/debian/patches/link-libstemmer.diff
  packages/pystemmer/trunk/debian/patches/test-exit-code.diff
  packages/pystemmer/trunk/debian/rules
Deleted:
  packages/pystemmer/trunk/debian/doc-base
  packages/pystemmer/trunk/debian/docs
  packages/pystemmer/trunk/debian/python-stemmer-dbg.install
  packages/pystemmer/trunk/debian/python-stemmer.install

Modified: packages/pystemmer/trunk/debian/changelog
===================================================================
--- packages/pystemmer/trunk/debian/changelog	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/changelog	2011-08-21 21:33:38 UTC (rev 18229)
@@ -1,5 +1,12 @@
-pystemmer (1.1.0+dfsg-3) UNRELEASED; urgency=low
+pystemmer (1.2.0+dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    - Uses Cython instead of Pyrex
+    - Python3 support.
+  * Build python3 packages.
+  * Split documentation into python-stemmer-doc.
+  * Use py_builddir_sh macro from python.mk.
+    - Bump python B-D to >= 2.6.6-14~.
   * Install .egg-info
 
  -- Stefano Rivera <stefanor at debian.org>  Tue, 21 Jun 2011 11:57:20 +0200

Modified: packages/pystemmer/trunk/debian/control
===================================================================
--- packages/pystemmer/trunk/debian/control	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/control	2011-08-21 21:33:38 UTC (rev 18229)
@@ -4,13 +4,16 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefanor at debian.org>
 Build-Depends:
+ cython-dbg,
  debhelper (>= 7.3.5~),
  libstemmer-dev,
  python-all-dbg,
- python-all-dev (>= 2.6.5-13~),
+ python-all-dev (>= 2.6.6-14~),
  python-epydoc,
- python-pyrex
+ python3-all-dbg,
+ python3-all-dev (>= 3.1.2-6~)
 X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
 Standards-Version: 3.9.2
 Homepage: http://snowball.tartarus.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pystemmer/trunk/
@@ -18,6 +21,7 @@
 
 Package: python-stemmer
 Architecture: any
+Suggests: python-stemmer-doc
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Description: Python bindings for libstemmer - snowball stemming algorithms
  PyStemmer provides access to efficient algorithms for calculating a "stemmed"
@@ -45,7 +49,7 @@
  ${python:Depends},
  ${shlibs:Depends}
 Recommends: python-dbg
-Description: Python bindings for libstemmer - snowball stemming algorithms (debug extension)
+Description: Python bindings for libstemmer (debug extension)
  PyStemmer provides access to efficient algorithms for calculating a "stemmed"
  form of a word.  This is a form with most of the common morphological endings
  removed; hopefully representing a common linguistic base form.
@@ -54,3 +58,59 @@
  wrapping the libstemmer library from the Snowball project in a Python module.
  .
  This package contains the extensions built for the Python debug interpreter.
+
+Package: python-stemmer-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Description: Python bindings for libstemmer (documentation)
+ PyStemmer provides access to efficient algorithms for calculating a "stemmed"
+ form of a word.  This is a form with most of the common morphological endings
+ removed; hopefully representing a common linguistic base form.
+ .
+ PyStemmer provides algorithms for several (mainly European) languages, by
+ wrapping the libstemmer library from the Snowball project in a Python module.
+ .
+ This package contains the documentation for the extension.
+
+Package: python3-stemmer
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Suggests: python-stemmer-doc
+Description: Python 3 bindings for libstemmer - snowball stemming algorithms
+ PyStemmer provides access to efficient algorithms for calculating a "stemmed"
+ form of a word.  This is a form with most of the common morphological endings
+ removed; hopefully representing a common linguistic base form.  This is most
+ useful in building search engines and information retrieval software; for
+ example, a search with stemming enabled should be able to find a document
+ containing "cycling" given the query "cycles".
+ .
+ PyStemmer provides algorithms for several (mainly European) languages, by
+ wrapping the libstemmer library from the Snowball project in a Python 3
+ module.
+ .
+ It also provides access to the classic Porter stemming algorithm for English:
+ although this has been superseded by an improved algorithm, the original
+ algorithm may be of interest to information retrieval researchers wishing to
+ reproduce results of earlier experiments.
+
+Package: python3-stemmer-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ python3-stemmer (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Recommends: python3-dbg
+Description: Python 3 bindings for libstemmer (debug extension)
+ PyStemmer provides access to efficient algorithms for calculating a "stemmed"
+ form of a word.  This is a form with most of the common morphological endings
+ removed; hopefully representing a common linguistic base form.
+ .
+ PyStemmer provides algorithms for several (mainly European) languages, by
+ wrapping the libstemmer library from the Snowball project in a Python 3
+ module.
+ .
+ This package contains the extensions built for the Python 3 debug interpreter.

Deleted: packages/pystemmer/trunk/debian/doc-base
===================================================================
--- packages/pystemmer/trunk/debian/doc-base	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/doc-base	2011-08-21 21:33:38 UTC (rev 18229)
@@ -1,9 +0,0 @@
-Document: pystemmer
-Title: PyStemmer API Documentation
-Author: Richard Boulton
-Abstract: Python bindings for libstemmer - snowball stemming algorithms
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-stemmer/html/api/index.html
-Files: /usr/share/doc/python-stemmer/html/api/*.html

Deleted: packages/pystemmer/trunk/debian/docs
===================================================================
--- packages/pystemmer/trunk/debian/docs	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/docs	2011-08-21 21:33:38 UTC (rev 18229)
@@ -1,3 +0,0 @@
-README
-docs/quickstart.txt
-debian/html

Modified: packages/pystemmer/trunk/debian/patches/link-libstemmer.diff
===================================================================
--- packages/pystemmer/trunk/debian/patches/link-libstemmer.diff	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/patches/link-libstemmer.diff	2011-08-21 21:33:38 UTC (rev 18229)
@@ -2,8 +2,8 @@
  Dynamically Link against libstemmer rather than using included libstemmer_c
  sources.
 Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: no
-Last-Update: 2011-02-05
+Forwarded: not-needed
+Last-Update: 2011-08-21
 
 --- a/setup.py
 +++ b/setup.py

Modified: packages/pystemmer/trunk/debian/patches/test-exit-code.diff
===================================================================
--- packages/pystemmer/trunk/debian/patches/test-exit-code.diff	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/patches/test-exit-code.diff	2011-08-21 21:33:38 UTC (rev 18229)
@@ -1,19 +1,20 @@
 Description: Modify the test suite to return a suitable error code on failure.
 Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: yes
-Last-Update: 2011-02-05
+Forwarded: http://article.gmane.org/gmane.comp.search.snowball/1191
+Last-Update: 2011-08-21
 
 --- a/runtests.py
 +++ b/runtests.py
-@@ -1,5 +1,10 @@
- #!/usr/bin/env python
+@@ -5,6 +5,10 @@
+ py3k = sys.version_info >= (3, 0)
  
- import doctest
--doctest.testfile('docs/quickstart.txt')
-+from sys import exit
- 
-+fails, tests = doctest.testfile('docs/quickstart.txt')
+ if py3k:
+-    doctest.testfile('docs/quickstart_python3.txt')
++    fails, tests = doctest.testfile('docs/quickstart_python3.txt')
+ else:
+-    doctest.testfile('docs/quickstart.txt')
++    fails, tests = doctest.testfile('docs/quickstart.txt')
 +
 +if fails > 0:
 +    exit(1)
-+print 'All %i tests passed' % tests
++print('All %i tests passed' % tests)

Deleted: packages/pystemmer/trunk/debian/python-stemmer-dbg.install
===================================================================
--- packages/pystemmer/trunk/debian/python-stemmer-dbg.install	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/python-stemmer-dbg.install	2011-08-21 21:33:38 UTC (rev 18229)
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/Stemmer_d.so

Copied: packages/pystemmer/trunk/debian/python-stemmer-doc.doc-base (from rev 18224, packages/pystemmer/trunk/debian/doc-base)
===================================================================
--- packages/pystemmer/trunk/debian/python-stemmer-doc.doc-base	                        (rev 0)
+++ packages/pystemmer/trunk/debian/python-stemmer-doc.doc-base	2011-08-21 21:33:38 UTC (rev 18229)
@@ -0,0 +1,9 @@
+Document: pystemmer
+Title: PyStemmer API Documentation
+Author: Richard Boulton
+Abstract: Python bindings for libstemmer - snowball stemming algorithms
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-stemmer-doc/html/api/index.html
+Files: /usr/share/doc/python-stemmer-doc/html/api/*.html

Copied: packages/pystemmer/trunk/debian/python-stemmer-doc.docs (from rev 18224, packages/pystemmer/trunk/debian/docs)
===================================================================
--- packages/pystemmer/trunk/debian/python-stemmer-doc.docs	                        (rev 0)
+++ packages/pystemmer/trunk/debian/python-stemmer-doc.docs	2011-08-21 21:33:38 UTC (rev 18229)
@@ -0,0 +1,3 @@
+README
+docs/quickstart*.txt
+debian/html

Deleted: packages/pystemmer/trunk/debian/python-stemmer.install
===================================================================
--- packages/pystemmer/trunk/debian/python-stemmer.install	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/python-stemmer.install	2011-08-21 21:33:38 UTC (rev 18229)
@@ -1,2 +0,0 @@
-usr/lib/python*/*-packages/Stemmer.so
-usr/lib/python*/*-packages/PyStemmer-*.egg-info

Modified: packages/pystemmer/trunk/debian/rules
===================================================================
--- packages/pystemmer/trunk/debian/rules	2011-08-21 20:46:00 UTC (rev 18228)
+++ packages/pystemmer/trunk/debian/rules	2011-08-21 21:33:38 UTC (rev 18229)
@@ -1,41 +1,68 @@
 #!/usr/bin/make -f
 
+include /usr/share/python/python.mk
+
+PYVERS :=  $(shell pyversions -vr)
+PY3VERS := $(shell py3versions -vr)
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
 
 override_dh_auto_build:
-	# Rebuild from Pyrex source
+	# Rebuild from Cython source
 	rm -f src/*.c
-	dh_auto_build
+	set -e -x; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		python$$py setup.py build; \
+		python$$py-dbg setup.py build; \
+	done
 	mkdir -p debian/html/api
 	epydoc --html -o debian/html/api --name="PyStemmer" \
 	       --url=http://snowball.tartarus.org/ \
 	       build/lib.*-$(shell pyversions -vd)/Stemmer.so
 
 override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf debian/html
+	rm -rf build debian/html
 	rm -f src/*.c
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	set -e; \
-	for ver in $(shell pyversions -vr); do \
-		PYTHONPATH=`ls -d build/lib.*-$$ver` \
-			python$$ver runtests.py; \
-		PYTHONPATH=`ls -d build/lib_d.*-$$ver 2>/dev/null || ls -d build/lib.*-$$ver-pydebug` \
-			python$$ver-dbg runtests.py; \
+	set -e -x; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		PYTHONPATH=$(call py_builddir_sh,$$py) \
+			python$$py runtests.py; \
+		PYTHONPATH=$(call py_builddir_sh,$$py-dbg) \
+			python$$py-dbg runtests.py; \
 	done
 endif
 
+override_dh_auto_install:
+	set -e -x; \
+	for py in $(PYVERS); do \
+		python$$py setup.py install --skip-build --root debian/python-stemmer \
+		                            --install-layout deb; \
+		python$$py-dbg setup.py install --skip-build --root debian/python-stemmer-dbg \
+		                                --install-layout deb; \
+	done
+	set -e -x; \
+	for py in $(PY3VERS); do \
+		python$$py setup.py install --skip-build --root debian/python3-stemmer \
+		                            --install-layout deb; \
+		python$$py-dbg setup.py install --skip-build --root debian/python3-stemmer-dbg \
+		                                --install-layout deb; \
+	done
+
 override_dh_compress:
 	dh_compress -X.js
 
 override_dh_strip:
-	dh_strip --dbg-package=python-stemmer-dbg
+	dh_strip -p python-stemmer -p python-stemmer-dbg --dbg-package=python-stemmer-dbg
+	dh_strip -p python3-stemmer -p python3-stemmer-dbg --dbg-package=python3-stemmer-dbg
 
 override_dh_installdocs:
-	dh_installdocs --link-doc=python-stemmer
+	dh_installdocs -p python-stemmer -p python-stemmer-dbg --link-doc=python-stemmer
+	dh_installdocs -p python3-stemmer -p python3-stemmer-dbg --link-doc=python3-stemmer
+	dh_installdocs -p python-stemmer-doc
 
 get-orig-source:
 	set -e; \




More information about the Python-modules-commits mailing list