[Python-modules-commits] [pep8] 05/07: * Let the pep8 binary use python3 (Closes: #807409) * Build a python-pep8 package. * Don't depend on setuptools, pkg-resources is good enough.

[Sylvestre Ledru]

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

sylvestre pushed a commit to branch master
in repository pep8.

commit 75f5ba23d85578e08b89f8846075d02e212928a8
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Mar 2 13:14:37 2016 +0100

    * Let the pep8 binary use python3 (Closes: #807409)
    * Build a python-pep8 package.
    * Don't depend on setuptools, pkg-resources is good enough.
---
 debian/changelog |  5 +++++
 debian/control   | 15 ++++++++++++---
 debian/rules     |  9 +++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42cf9aa..a183f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ pep8 (1.7.0-0.2) unstable; urgency=medium
   * Package moved under the Python team umbrella
   * Package moved under git maintenance (Closes: #816489)
 
+  [ Matthias Klose ]
+  * Let the pep8 binary use python3 (Closes: #807409)
+  * Build a python-pep8 package.
+  * Don't depend on setuptools, pkg-resources is good enough.
+ 
  -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 02 Mar 2016 13:08:38 +0100
 
 pep8 (1.6.2-0.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 788fde3..26b61a9 100644
--- a/debian/control
+++ b/debian/control
@@ -11,15 +11,24 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pep8.git
 
 Package: pep8
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-setuptools
-Description: Python PEP 8 code style checker - python2
+Depends: ${misc:Depends}, ${python3:Depends}, python3-pep8
+Description: Python PEP 8 code style checker
+ Features a plugin architecture allowing for adding new checks is easily.
+ Parseable output listing line numbers of the error location.  Consists of
+ just one Python file, and requires only stdlib.
+
+Package: python-pep8
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources
+Replaces: pep8 (<< 1.6.2-0.1)
+Description: Python PEP 8 code style checker - python
  Features a plugin architecture allowing for adding new checks is easily.
  Parseable output listing line numbers of the error location.  Consists of
  just one Python file, and requires only stdlib.
 
 Package: python3-pep8
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-setuptools
+Depends: ${misc:Depends}, ${python3:Depends}, python3-pkg-resources
 Description: Python PEP 8 code style checker - python3
  Features a plugin architecture allowing for adding new checks is easily.
  Parseable output listing line numbers of the error location.  Consists of
diff --git a/debian/rules b/debian/rules
index 0a52927..edefd99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,11 +17,16 @@ PYTHON3S:=$(shell py3versions -vr)
 override_dh_auto_install:
 	set -e && for pyvers in $(PYTHONS); do \
 		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/pep8; \
+			--root $(CURDIR)/debian/python-pep8; \
 	done
 
 	set -e && for pyvers in $(PYTHON3S); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python3-pep8; \
 	done
-	rm -r $(CURDIR)/debian/python3-pep8/usr/bin
+	rm -rf debian/python-pep8/usr/bin
+	mkdir -p debian/pep8/usr
+	mv debian/python3-pep8/usr/bin debian/pep8/usr/.
+
+override_dh_python3:
+	dh_python3 --shebang=/usr/bin/python3

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