[Python-apps-commits] r9873 - in packages/tox/trunk/debian (7 files)

[barry at users.alioth.debian.org]

    Date: Friday, July 12, 2013 @ 16:04:18
  Author: barry
Revision: 9873

* New upstream release.  (Closes: #702009)
* d/control: Update maintainer email.
* d/patches/no-download.patch: Refreshed.
* d/patches/pytest-dep-version.patch: Disable instafail dependency
  for now until that package clears NEW.
* d/rules: Remove get-orig-source since upstream now releases a .tar.gz.
* d/python-tox.docs: README.txt was renamed to README.rst.

Added:
  packages/tox/trunk/debian/patches/pytest-dep-version.patch
Modified:
  packages/tox/trunk/debian/changelog
  packages/tox/trunk/debian/control
  packages/tox/trunk/debian/patches/no-download.patch
  packages/tox/trunk/debian/patches/series
  packages/tox/trunk/debian/python-tox.docs
  packages/tox/trunk/debian/rules

Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog	2013-07-11 08:19:36 UTC (rev 9872)
+++ packages/tox/trunk/debian/changelog	2013-07-12 16:04:18 UTC (rev 9873)
@@ -1,8 +1,18 @@
-tox (1.4.3-2) UNRELEASED; urgency=low
+tox (1.5.0-1) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
+  
+  [ Barry Warsaw ]
+  * New upstream release.  (Closes: #702009)
+  * d/control: Update maintainer email.
+  * d/patches/no-download.patch: Refreshed.
+  * d/patches/pytest-dep-version.patch: Disable instafail dependency
+    for now until that package clears NEW.
+  * d/rules: Remove get-orig-source since upstream now releases a .tar.gz.
+  * d/python-tox.docs: README.txt was renamed to README.rst.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:05:53 +0200
+ -- Barry Warsaw <barry at debian.org>  Fri, 12 Jul 2013 10:41:59 -0400
 
 tox (1.4.3-1) unstable; urgency=low
 

Modified: packages/tox/trunk/debian/control
===================================================================
--- packages/tox/trunk/debian/control	2013-07-11 08:19:36 UTC (rev 9872)
+++ packages/tox/trunk/debian/control	2013-07-12 16:04:18 UTC (rev 9873)
@@ -1,7 +1,7 @@
 Source: tox
 Section: python
 Priority: optional
-Maintainer: Barry Warsaw <barry at python.org>
+Maintainer: Barry Warsaw <barry at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Homepage: http://codespeak.net/tox
 Build-Depends: debhelper (>= 8),

Modified: packages/tox/trunk/debian/patches/no-download.patch
===================================================================
--- packages/tox/trunk/debian/patches/no-download.patch	2013-07-11 08:19:36 UTC (rev 9872)
+++ packages/tox/trunk/debian/patches/no-download.patch	2013-07-12 16:04:18 UTC (rev 9873)
@@ -4,16 +4,10 @@
 
 --- a/tox.ini
 +++ b/tox.ini
-@@ -1,8 +1,10 @@
+@@ -1,5 +1,6 @@
  [tox]
  envlist=py27,py26,py25,py32,py33,docs,pypy
 +sitepackages=True
- indexserver =
--    testrun = http://pypi.testrun.org
--    pypi = https://pypi.python.org/simple
-+    testrun = http://missing.example.com
-+    pypi = https://missing.example.com/simple
-+    default = http://missing.example.com
  
  [testenv:X]
  commands=echo {posargs}

Added: packages/tox/trunk/debian/patches/pytest-dep-version.patch
===================================================================
--- packages/tox/trunk/debian/patches/pytest-dep-version.patch	                        (rev 0)
+++ packages/tox/trunk/debian/patches/pytest-dep-version.patch	2013-07-12 16:04:18 UTC (rev 9873)
@@ -0,0 +1,18 @@
+--- a/tox.ini
++++ b/tox.ini
+@@ -6,9 +6,12 @@
+ commands=echo {posargs}
+ 
+ [testenv]
+-commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+-deps=pytest==2.3.4
+-     pytest-instafail
++#commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
++#deps=
++#     pytest-instafail
++
++commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
++deps=
+ 
+ [testenv:py25]
+ setenvs =

Modified: packages/tox/trunk/debian/patches/series
===================================================================
--- packages/tox/trunk/debian/patches/series	2013-07-11 08:19:36 UTC (rev 9872)
+++ packages/tox/trunk/debian/patches/series	2013-07-12 16:04:18 UTC (rev 9873)
@@ -1,2 +1,3 @@
 intersphinx_mapping.patch
 no-download.patch
+pytest-dep-version.patch

Modified: packages/tox/trunk/debian/python-tox.docs
===================================================================
--- packages/tox/trunk/debian/python-tox.docs	2013-07-11 08:19:36 UTC (rev 9872)
+++ packages/tox/trunk/debian/python-tox.docs	2013-07-12 16:04:18 UTC (rev 9873)
@@ -1,2 +1,2 @@
 ISSUES.txt
-README.txt
+README.rst

Modified: packages/tox/trunk/debian/rules
===================================================================
--- packages/tox/trunk/debian/rules	2013-07-11 08:19:36 UTC (rev 9872)
+++ packages/tox/trunk/debian/rules	2013-07-12 16:04:18 UTC (rev 9873)
@@ -42,8 +42,3 @@
 
 override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
 endif
-
-get-orig-source:
-	unset http_proxy; \
-	uscan --noconf --force-download --repack --rename \
-		--download-current-version --verbose