[Python-modules-commits] r21072 - in packages/pytest/trunk/debian (3 files)

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

    Date: Friday, April 6, 2012 @ 05:29:04
  Author: laarmen-guest
Revision: 21072

  * Rename Python3 script to py.test-3
  * Fix documentation build
  * Remove useless use of cut.

Modified:
  packages/pytest/trunk/debian/control
  packages/pytest/trunk/debian/python3-pytest.manpages
  packages/pytest/trunk/debian/rules

Modified: packages/pytest/trunk/debian/control
===================================================================
--- packages/pytest/trunk/debian/control	2012-04-05 16:15:11 UTC (rev 21071)
+++ packages/pytest/trunk/debian/control	2012-04-06 05:29:04 UTC (rev 21072)
@@ -8,6 +8,7 @@
  python-all (>= 2.6.6-3~),
  python-setuptools,
  python-sphinx,
+ python-py,
  python3-all (>= 3.1.2-6~),
  python3-setuptools
 X-Python-Version: >= 2.4

Modified: packages/pytest/trunk/debian/python3-pytest.manpages
===================================================================
--- packages/pytest/trunk/debian/python3-pytest.manpages	2012-04-05 16:15:11 UTC (rev 21071)
+++ packages/pytest/trunk/debian/python3-pytest.manpages	2012-04-06 05:29:04 UTC (rev 21072)
@@ -1 +1 @@
-debian/py3.test.1
+debian/py.test-3.1

Modified: packages/pytest/trunk/debian/rules
===================================================================
--- packages/pytest/trunk/debian/rules	2012-04-05 16:15:11 UTC (rev 21071)
+++ packages/pytest/trunk/debian/rules	2012-04-06 05:29:04 UTC (rev 21072)
@@ -7,8 +7,8 @@
 PYVERS :=  $(shell pyversions -r)
 PY3VERS := $(shell py3versions -r)
 
-PYDEFAULT :=  $(shell pyversions -d | tail -c +7)
-PY3DEFAULT :=  $(shell py3versions -d | tail -c +7)
+PYDEFAULT :=  $(shell pyversions -vd)
+PY3DEFAULT :=  $(shell py3versions -vd)
 
 ENABLE_TESTS=false
 
@@ -21,12 +21,12 @@
 	for py in $(PYVERS) $(PY3VERS); do \
 		$$py setup.py build; \
 	done
-	make -C doc/ man
+	PYTHONPATH=`pwd` make -C doc/ man
 	cp doc/_build/man/pytest.1 debian/py.test.1
-	cp debian/py.test.1 debian/py3.test.1
+	cp debian/py.test.1 debian/py.test-3.1
 	sed -i 's/PYTEST/PY.TEST/g' debian/py.test.1
-	sed -i 's/PYTEST/PY3.TEST/g' debian/py3.test.1
-	sed -i 's/py\.test/py3.test/g' debian/py3.test.1
+	sed -i 's/PYTEST/PY.TEST-3/g' debian/py.test-3.1
+	sed -i 's/py\.test/py.test-3/g' debian/py.test-3.1
 
 override_dh_install:
 	# Only install for the default versions.
@@ -38,7 +38,7 @@
 									    --root debian/python3-pytest \
 										--install-layout=deb
 	rm debian/python3-pytest/usr/bin/py.test-$(PY3DEFAULT)
-	mv debian/python3-pytest/usr/bin/py.test debian/python3-pytest/usr/bin/py3.test
+	mv debian/python3-pytest/usr/bin/py.test debian/python3-pytest/usr/bin/py.test-3
 	dh_install
 
 override_dh_auto_clean:
@@ -47,7 +47,7 @@
 	dh_auto_clean
 
 override_dh_clean:
-	rm debian/py*.test.1 -f
+	rm debian/py.test.1 debian/py.test-3.1 -f
 	dh_clean
 
 override_dh_auto_test: