[Python-modules-commits] r12053 - in packages/pystemmer/trunk/debian (7 files)

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

    Date: Monday, March 1, 2010 @ 14:20:55
  Author: stefanor-guest
Revision: 12053

Changes requested in jwilk review:
* Rename python-pystemmer -> python-stemmer
* Test with debug interpretors
* Respect nocheck
* Remove unecessary override of dh_auto_install
* Switch some backtick calls to $(shell)

Added:
  packages/pystemmer/trunk/debian/python-stemmer-dbg.install
    (from rev 12018, packages/pystemmer/trunk/debian/python-pystemmer-dbg.install)
  packages/pystemmer/trunk/debian/python-stemmer.install
    (from rev 12018, packages/pystemmer/trunk/debian/python-pystemmer.install)
Modified:
  packages/pystemmer/trunk/debian/control
  packages/pystemmer/trunk/debian/doc-base
  packages/pystemmer/trunk/debian/rules
Deleted:
  packages/pystemmer/trunk/debian/python-pystemmer-dbg.install
  packages/pystemmer/trunk/debian/python-pystemmer.install

Modified: packages/pystemmer/trunk/debian/control
===================================================================
--- packages/pystemmer/trunk/debian/control	2010-03-01 11:33:27 UTC (rev 12052)
+++ packages/pystemmer/trunk/debian/control	2010-03-01 14:20:55 UTC (rev 12053)
@@ -11,7 +11,7 @@
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pystemmer/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pystemmer/trunk/
 
-Package: python-pystemmer
+Package: python-stemmer
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Description: Python bindings for libstemmer - snowball stemming algorithms
@@ -22,20 +22,20 @@
  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
+ PyStemmer provides algorithms for several (mainly European) languages, by
  wrapping the libstemmer library from the Snowball project in a Python module.
  .
  It also provides access to the classic Porter stemming algorithm for English:
- although this has been superceded by an improved algorithm, the original
+ 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: python-pystemmer-dbg
+Package: python-stemmer-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
- python-pystemmer (= ${binary:Version}), python-dbg
+ python-stemmer (= ${binary:Version}), python-dbg
 Description: Python bindings for libstemmer - snowball stemming algorithms (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
@@ -44,11 +44,11 @@
  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
+ PyStemmer provides algorithms for several (mainly European) languages, by
  wrapping the libstemmer library from the Snowball project in a Python module.
  .
  It also provides access to the classic Porter stemming algorithm for English:
- although this has been superceded by an improved algorithm, the original
+ 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.
  .

Modified: packages/pystemmer/trunk/debian/doc-base
===================================================================
--- packages/pystemmer/trunk/debian/doc-base	2010-03-01 11:33:27 UTC (rev 12052)
+++ packages/pystemmer/trunk/debian/doc-base	2010-03-01 14:20:55 UTC (rev 12053)
@@ -5,5 +5,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-pystemmer/html/api/index.html
-Files: /usr/share/doc/python-pystemmer/html/api/*.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/python-pystemmer-dbg.install
===================================================================
--- packages/pystemmer/trunk/debian/python-pystemmer-dbg.install	2010-03-01 11:33:27 UTC (rev 12052)
+++ packages/pystemmer/trunk/debian/python-pystemmer-dbg.install	2010-03-01 14:20:55 UTC (rev 12053)
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/Stemmer_d.so

Deleted: packages/pystemmer/trunk/debian/python-pystemmer.install
===================================================================
--- packages/pystemmer/trunk/debian/python-pystemmer.install	2010-03-01 11:33:27 UTC (rev 12052)
+++ packages/pystemmer/trunk/debian/python-pystemmer.install	2010-03-01 14:20:55 UTC (rev 12053)
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/Stemmer.so

Copied: packages/pystemmer/trunk/debian/python-stemmer-dbg.install (from rev 12018, packages/pystemmer/trunk/debian/python-pystemmer-dbg.install)
===================================================================
--- packages/pystemmer/trunk/debian/python-stemmer-dbg.install	                        (rev 0)
+++ packages/pystemmer/trunk/debian/python-stemmer-dbg.install	2010-03-01 14:20:55 UTC (rev 12053)
@@ -0,0 +1 @@
+usr/lib/python*/*-packages/Stemmer_d.so

Copied: packages/pystemmer/trunk/debian/python-stemmer.install (from rev 12018, packages/pystemmer/trunk/debian/python-pystemmer.install)
===================================================================
--- packages/pystemmer/trunk/debian/python-stemmer.install	                        (rev 0)
+++ packages/pystemmer/trunk/debian/python-stemmer.install	2010-03-01 14:20:55 UTC (rev 12053)
@@ -0,0 +1 @@
+usr/lib/python*/*-packages/Stemmer.so

Modified: packages/pystemmer/trunk/debian/rules
===================================================================
--- packages/pystemmer/trunk/debian/rules	2010-03-01 11:33:27 UTC (rev 12052)
+++ packages/pystemmer/trunk/debian/rules	2010-03-01 14:20:55 UTC (rev 12053)
@@ -8,23 +8,25 @@
 	mkdir -p debian/html/api
 	epydoc --html -o debian/html/api --name="PyStemmer" \
 	       --url=http://snowball.tartarus.org/ \
-	       build/lib.*-`pyversions -vd`/Stemmer.so
+	       build/lib.*-$(shell pyversions -vd)/Stemmer.so
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf debian/html
 
 override_dh_auto_test:
-	for ver in `pyversions -vr`; do \
-		PYTHONPATH=`dirname build/lib.*-$$ver/Stemmer.so` python$$ver runtests.py; \
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	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; \
 	done
+endif
 
-override_dh_auto_install:
-	dh_auto_install --destdir=debian/tmp
-
 override_dh_compress:
 	dh_compress -X.js
 
 override_dh_strip:
-	dh_strip --dbg-package=python-pystemmer-dbg
+	dh_strip --dbg-package=python-stemmer-dbg
 	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules