Thu Aug 6 18:52:39 UTC 2015

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

barry pushed a commit to branch master
in repository tox.

commit 6fe97ccae04d5ad797c0344562a93e20bea624c8
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Thu Aug 6 14:52:31 2015 -0400

    * d/control:
      - Rename python-tox binary package to tox.  This now replaces/breaks
        earlier versions of python-tox.
      - Reintroduce python-tox binary package as a virtual package.
    * d/rules: Remove the hack around for bug #751908, and make the package
      built without failure when multiple versions of Python 3 are supported.
    * d/python-tox.doc-base -> tox.doc-base
    * d/python-tox.docs -> tox.docs
    * d/tox.install: Added to ensure the tox library gets installed correctly.
---
 debian/changelog                             | 14 ++++++++++++++
 debian/control                               | 12 +++++++++++-
 debian/rules                                 |  9 ---------
 debian/{python-tox.doc-base => tox.doc-base} |  8 ++++----
 debian/{python-tox.docs => tox.docs}         |  0
 debian/tox.install                           |  2 ++
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2a4d37..1eb67e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tox (2.1.1-2) UNRELEASED; urgency=medium
+
+  * d/control:
+    - Rename python-tox binary package to tox.  This now replaces/breaks
+      earlier versions of python-tox.
+    - Reintroduce python-tox binary package as a virtual package.
+  * d/rules: Remove the hack around for bug #751908, and make the package
+    built without failure when multiple versions of Python 3 are supported.
+  * d/python-tox.doc-base -> tox.doc-base
+  * d/python-tox.docs -> tox.docs
+  * d/tox.install: Added to ensure the tox library gets installed correctly.
+
+ -- Barry Warsaw <barry at debian.org>  Thu, 06 Aug 2015 10:14:15 -0400
+
 tox (2.1.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 1c44bde..4320025 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=python-modules/packages/tox.git
 X-Python3-Version: >= 3.2
 XS-Testsuite: autopkgtest
 
-Package: python-tox
+Package: tox
 Architecture: all
 Depends: python3,
          python3-pkg-resources,
@@ -33,6 +33,8 @@ Depends: python3,
          ${misc:Depends},
          ${python3:Depends},
          ${sphinxdoc:Depends}
+Replaces: python-tox (<< 2.1.1-2~)
+Breaks: python-tox (<< 2.1.1-2~)
 Description: virtualenv-based automation of test activities
  Tox as is a generic virtualenv management and test command line tool
  you can use for:
@@ -43,3 +45,11 @@ Description: virtualenv-based automation of test activities
     test tool of choice
   * acting as a frontend to Continuous Integration servers, greatly
     reducing boilerplate and merging CI and shell-based testing.
+
+Package: python-tox
+Depends: tox, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package for tox
+ This is a transitional dummy package.  It can safely be removed.
diff --git a/debian/rules b/debian/rules
index c5130f1..c21cd3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,15 +14,6 @@ BUILD_DATE=$(\
 # because upstream always changes the mix.
 override_dh_auto_test:
 
-# pybuild can't yet handle Python 3 packages that don't start with "python3-".
-# See bug #751908 - In the meantime, this override isn't perfect, but it gets
-# close enough.
-override_dh_auto_install:
-	dh_auto_install
-	mv debian/python-tox/usr/lib/python3.? \
-	   debian/python-tox/usr/lib/python3
-	find debian/python-tox -name __pycache__ | xargs rm -rf
-
 override_dh_installdocs:
 	python3 setup.py build_sphinx
 	dh_installdocs build/sphinx/html
diff --git a/debian/python-tox.doc-base b/debian/tox.doc-base
similarity index 66%
rename from debian/python-tox.doc-base
rename to debian/tox.doc-base
index 7011027..de44cf0 100644
--- a/debian/python-tox.doc-base
+++ b/debian/tox.doc-base
@@ -1,4 +1,4 @@
-Document: python-tox
+Document: tox
 Title: tox readme, issues, and workarounds
 Author: Holger Krekel
 Abstract: This manual briefly describes what tox is, and presents some issues
@@ -7,8 +7,8 @@ Abstract: This manual briefly describes what tox is, and presents some issues
 Section: Programming/Python
 
 Format: Text
-Files: /usr/share/doc/python-tox/*.txt
+Files: /usr/share/doc/tox/*.txt
 
 Format: HTML
-Index: /usr/share/doc/python-tox/html/index.html
-Files: /usr/share/doc/python-tox/html/*
+Index: /usr/share/doc/tox/html/index.html
+Files: /usr/share/doc/tox/html/*
diff --git a/debian/python-tox.docs b/debian/tox.docs
similarity index 100%
rename from debian/python-tox.docs
rename to debian/tox.docs
diff --git a/debian/tox.install b/debian/tox.install
new file mode 100644
index 0000000..fc9159c
--- /dev/null
+++ b/debian/tox.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python3.4/dist-packages usr/lib/python3
+debian/tmp/usr/bin

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

