[Python-modules-commits] [logilab-common] 05/06: handle the rename of pytest to logilab-pytest

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository logilab-common.

commit f07acd83882d1a98d8783028bc070fc52b23f2aa
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Dec 11 19:21:57 2016 -0500

    handle the rename of pytest to logilab-pytest
---
 debian/changelog                      |  3 ++-
 debian/python-logilab-common.manpages |  2 +-
 debian/rules                          | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a3e76d..b26712b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ logilab-common (1.3.0-1) UNRELEASED; urgency=medium
   * New upstream release
   * debian/README.source
     - remove, badly outdated
+  * handle the rename of pytest to logilab-pytest
 
- -- Sandro Tosi <morph at debian.org>  Sun, 11 Dec 2016 18:52:38 -0500
+ -- Sandro Tosi <morph at debian.org>  Sun, 11 Dec 2016 19:21:38 -0500
 
 logilab-common (1.2.2-1) unstable; urgency=medium
 
diff --git a/debian/python-logilab-common.manpages b/debian/python-logilab-common.manpages
index e4a09b5..77c9566 100644
--- a/debian/python-logilab-common.manpages
+++ b/debian/python-logilab-common.manpages
@@ -1 +1 @@
-doc/pytest.1
+doc/logilab-pytest.1
diff --git a/debian/rules b/debian/rules
index 692a3dd..a2b890f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,8 +40,8 @@ ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 
 	# run tests
 	# use the default python version to select the script dir to run the tests
-	-PYTHONPATH=$(CURDIR)/$(LIB)/   $(CURDIR)/$(SCRIPT)/pytest  -t $(CURDIR)/test
-	-PYTHONPATH=$(CURDIR)/$(LIB3)/ $(CURDIR)/$(SCRIPT3)/pytest -t $(CURDIR)/test
+	-PYTHONPATH=$(CURDIR)/$(LIB)/   $(CURDIR)/$(SCRIPT)/logilab-pytest  -t $(CURDIR)/test
+	-PYTHONPATH=$(CURDIR)/$(LIB3)/ $(CURDIR)/$(SCRIPT3)/logilab-pytest -t $(CURDIR)/test
 
 	# remove dummy file
 	rm -f $(CURDIR)/$(LIB)/logilab/__init__.py
@@ -66,8 +66,8 @@ override_dh_auto_install: build
 	NO_SETUPTOOLS=1 python3 setup.py install --no-compile \
 		--root=$(CURDIR)/debian/python3-logilab-common/ \
 		${py_setup_install_args}
-	# move pytest to pytest3 for py3k package
-	mv debian/python3-logilab-common/usr/bin/pytest debian/python3-logilab-common/usr/bin/pytest3
+	# move logilab-pytest to logilab-pytest3 for py3k package
+	mv debian/python3-logilab-common/usr/bin/logilab-pytest debian/python3-logilab-common/usr/bin/logilab-pytest3
 	# remove __pycache__ dirs
 	find $(CURDIR)/debian/python3-logilab-common -type d -name "__pycache__" | xargs rm -rf
 	# remove test directory
@@ -83,9 +83,9 @@ override_dh_installdocs:
 override_dh_installman:
 	dh_installman
 	# install the manpage for the py3k package
-	cp doc/pytest.1 doc/pytest3.1
-	dh_installman -p python3-logilab-common doc/pytest3.1
-	rm doc/pytest3.1
+	cp doc/logilab-pytest.1 doc/logilab-pytest3.1
+	dh_installman -p python3-logilab-common doc/logilab-pytest3.1
+	rm doc/logilab-pytest3.1
 
 override_dh_compress:
 	dh_compress		-X.py -X.ini -X.xml -Xtest/ -Xapidoc/

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