[Python-modules-commits] [python-flake8] 01/02: Moved /usr/bin/flake8 to solo package.

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository python-flake8.

commit 57d0998118df57bd1336f3cce8b78bc8352efada
Author: Ondřej Nový <novy at ondrej.org>
Date:   Fri Mar 4 21:49:53 2016 +0100

    Moved /usr/bin/flake8 to solo package.
---
 debian/changelog                                   |  1 +
 debian/control                                     | 19 +++++++++++++++++--
 debian/{python-flake8.manpages => flake8.manpages} |  0
 debian/rules                                       |  5 ++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 985ba2a..b3568ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ python-flake8 (2.5.4-1) UNRELEASED; urgency=medium
   * Added myself as uploader.
   * d/copyright: Cleanup.
   * Removed python-mock from Debian tests dependency - it's not needed.
+  * Moved /usr/bin/flake8 to solo package.
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 01 Mar 2016 18:32:47 +0100
 
diff --git a/debian/control b/debian/control
index b697944..1280eb7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,21 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-flak
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.1
 
+Package: flake8
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-flake8,
+Replaces: python-flake8 (<< 2.5.4-1)
+Breaks: python-flake8 (<< 2.5.4-1)
+Description: code checker using pep8 and pyflakes
+ Flake8 is a wrapper around PyFlakes, pep8, and Ned's McCabe script. Flake8
+ runs all tools by launching the single 'flake8' script, but ignores pep8 and
+ PyFlakes extended options and just uses defaults. It displays the warnings in
+ a per-file, merged output.
+ .
+ This package provides flake8 binary.
+
 Package: python-flake8
 Architecture: all
 Depends: python-pep8 (>= 1.5.7),
@@ -38,7 +53,7 @@ Depends: python-pep8 (>= 1.5.7),
          ${misc:Depends},
          ${python:Depends}
 Suggests: python-mock
-Description: code checker using pep8 and pyflakes
+Description: code checker using pep8 and pyflakes - Python 2.x
  Flake8 is a wrapper around PyFlakes, pep8, and Ned's McCabe script. Flake8
  runs all tools by launching the single 'flake8' script, but ignores pep8 and
  PyFlakes extended options and just uses defaults. It displays the warnings in
@@ -54,7 +69,7 @@ Depends: python3-pep8 (>= 1.5.7),
          python3-mccabe (>= 0.2.1),
          ${misc:Depends},
          ${python3:Depends}
-Description: code checker using pep8 and pyflakes (Python 3)
+Description: code checker using pep8 and pyflakes - Python 3.x
  Flake8 is a wrapper around PyFlakes, pep8, and Ned's McCabe script. Flake8
  runs all tools by launching the single 'flake8' script, but ignores pep8 and
  PyFlakes extended options and just uses defaults. It displays the warnings in
diff --git a/debian/python-flake8.manpages b/debian/flake8.manpages
similarity index 100%
rename from debian/python-flake8.manpages
rename to debian/flake8.manpages
diff --git a/debian/rules b/debian/rules
index 49fc75b..ad35dca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,10 @@ override_dh_auto_install:
 	for py in $(PY3VERS); do \
 		$$py setup.py install  --root=debian/python3-flake8 --install-layout=deb ; \
 	done
-	rm -rf debian/python3-flake8/usr/bin
+
+	rm -rf debian/python-flake8/usr/bin
+	mkdir -p debian/flake8/usr
+	mv $(CURDIR)/debian/python3-flake8/usr/bin $(CURDIR)/debian/flake8/usr/
 
 override_dh_python2:
 	dh_python2 --shebang=/usr/bin/python

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