[Python-modules-commits] [pytest] 01/05: Include pytest entrypoints

[Sebastian Ramacher]

This is an automated email from the git hooks/post-receive script.

sramacher pushed a commit to branch master
in repository pytest.

commit 74fc6fc7099a67e14dea1fd20f52e9d4028a5d75
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Dec 12 23:31:53 2016 +0100

    Include pytest entrypoints
---
 debian/clean                   |  5 ++---
 debian/control                 |  4 ++++
 debian/pypy-pytest.links       |  2 ++
 debian/pypy-pytest.manpages    |  2 +-
 debian/python-pytest.links     |  2 ++
 debian/python-pytest.manpages  |  2 +-
 debian/python3-pytest.links    |  2 ++
 debian/python3-pytest.manpages |  2 +-
 debian/rules                   | 30 ++++++++++++++----------------
 9 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/debian/clean b/debian/clean
index aeb76e3..0c226cc 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,2 @@
-debian/py.test.1
-debian/py.test-3.1
-debian/pypy.test.1
+debian/*.1
+pytest.egg-info/*
diff --git a/debian/control b/debian/control
index 9f3f62b..ad2f428 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,10 @@ Depends: python-pkg-resources,
          ${misc:Depends},
          ${python:Depends}
 Suggests: python-mock (>= 1.0.1)
+Breaks:
+ python-logilab-common (<< 1.3.0-1)
+Replaces:
+ python-logilab-common (<< 1.3.0-1)
 Description: Simple, powerful testing in Python
  This testing tool has for objective to allow the developers to limit the
  boilerplate code around the tests, promoting the use of built-in
diff --git a/debian/pypy-pytest.links b/debian/pypy-pytest.links
new file mode 100644
index 0000000..9061b5a
--- /dev/null
+++ b/debian/pypy-pytest.links
@@ -0,0 +1,2 @@
+usr/bin/pytest-pypy usr/bin/py.test-pypy
+usr/share/man/man1/pytest-pypy.1 usr/share/man/man1/py.test-pypy.1
diff --git a/debian/pypy-pytest.manpages b/debian/pypy-pytest.manpages
index 70e0269..8d1ddac 100644
--- a/debian/pypy-pytest.manpages
+++ b/debian/pypy-pytest.manpages
@@ -1 +1 @@
-debian/py.test-pypy.1
+debian/pytest-pypy.1
diff --git a/debian/python-pytest.links b/debian/python-pytest.links
new file mode 100644
index 0000000..8f5f4e7
--- /dev/null
+++ b/debian/python-pytest.links
@@ -0,0 +1,2 @@
+usr/bin/pytest usr/bin/py.test
+usr/share/man/man1/pytest.1 usr/share/man/man1/py.test.1
diff --git a/debian/python-pytest.manpages b/debian/python-pytest.manpages
index b0e579a..856270c 100644
--- a/debian/python-pytest.manpages
+++ b/debian/python-pytest.manpages
@@ -1 +1 @@
-debian/py.test.1
+doc/en/_build/man/pytest.1
diff --git a/debian/python3-pytest.links b/debian/python3-pytest.links
new file mode 100644
index 0000000..ecf3641
--- /dev/null
+++ b/debian/python3-pytest.links
@@ -0,0 +1,2 @@
+usr/bin/pytest-3 usr/bin/py.test-3
+usr/share/man/man1/pytest-3.1 usr/share/man/man1/py.test-3.1
diff --git a/debian/python3-pytest.manpages b/debian/python3-pytest.manpages
index 0e87603..f47e4c4 100644
--- a/debian/python3-pytest.manpages
+++ b/debian/python3-pytest.manpages
@@ -1 +1 @@
-debian/py.test-3.1
+debian/pytest-3.1
diff --git a/debian/rules b/debian/rules
index d12e71b..0ca49ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,13 @@ export PYBUILD_NAME=pytest
 override_dh_auto_build:
 	dh_auto_build
 	PYTHONPATH=$(CURDIR) $(MAKE) -C doc/en man html
-	cp doc/en/_build/man/pytest.1 debian/py.test.1
-	cp debian/py.test.1 debian/py.test-3.1
-	cp debian/py.test.1 debian/py.test-pypy.1
-	sed -i 's/PYTEST/PY.TEST/g' debian/py.test.1
-	sed -i 's/PYTEST/PY.TEST-3/g' debian/py.test-3.1
-	sed -i 's/PYTEST/PYPY.TEST/g' debian/py.test-pypy.1
-	sed -i 's/py\.test/py.test-3/g' debian/py.test-3.1
-	sed -i 's/py\.test/pypy.test/g' debian/py.test-pypy.1
+	mkdir -p debian/tmp
+	cp doc/en/_build/man/pytest.1 debian/pytest-3.1
+	cp doc/en/_build/man/pytest.1 debian/pytest-pypy.1
+	sed -i 's/PYTEST/PYTEST-3/g' debian/pytest-3.1
+	sed -i 's/PYTEST/PYTEST-PYPY/g' debian/pytest-pypy.1
+	sed -i 's/pytest/pytest-3/g' debian/pytest-3.1
+	sed -i 's/pytest/pytest-pypy/g' debian/pytest-pypy.1
 
 # 2015-12-16 barry at debian.org: Because pytest does not clean up after itself,
 # use a custom temporary directory (which is easier to clean up manually,
@@ -29,15 +28,14 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	dh_auto_install
-	rm debian/py*-pytest/usr/bin/pytest
-	mv debian/python3-pytest/usr/bin/py.test \
-		debian/python3-pytest/usr/bin/py.test-3
-	mv debian/pypy-pytest/usr/bin/py.test \
-		debian/pypy-pytest/usr/bin/py.test-pypy
-	# mv debian/python3-pytest/usr/bin/pytest \
-	#	debian/python3-pytest/usr/bin/pytest-3
+	rm debian/python-pytest/usr/bin/py.test
+	rm debian/python3-pytest/usr/bin/py.test
+	rm debian/pypy-pytest/usr/bin/py.test
+	mv debian/python3-pytest/usr/bin/pytest \
+		debian/python3-pytest/usr/bin/pytest-3
+	mv debian/pypy-pytest/usr/bin/pytest \
+		debian/pypy-pytest/usr/bin/pytest-pypy
 
 override_dh_auto_clean:
 	rm -rf doc/en/_build
-	rm -rf pytest.egg-info
 	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest.git