[Python-modules-commits] r26630 - in packages/python-webob/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, December 1, 2013 @ 19:59:30
  Author: piotr
Revision: 26630

* python-webob Breaks: python-pylons < 1.0.1 (closes: #721866)
* Switch to buildsystem=pybuild, add dh-python to Build-Depends
* Update debian/watch file
* Bump Standards-Version to 3.9.5 (no changes needed)

Modified:
  packages/python-webob/trunk/debian/changelog
  packages/python-webob/trunk/debian/control
  packages/python-webob/trunk/debian/rules
  packages/python-webob/trunk/debian/watch
Deleted:
  packages/python-webob/trunk/debian/python-webob.install
  packages/python-webob/trunk/debian/python3-webob.install

Modified: packages/python-webob/trunk/debian/changelog
===================================================================
--- packages/python-webob/trunk/debian/changelog	2013-12-01 19:39:07 UTC (rev 26629)
+++ packages/python-webob/trunk/debian/changelog	2013-12-01 19:59:30 UTC (rev 26630)
@@ -1,9 +1,16 @@
-python-webob (1.2.3-5) UNRELEASED; urgency=low
+python-webob (1.2.3-5) unstable; urgency=low
 
+  [ Barry Warsaw ]
   * Remove Christoph Hass from Uploaders as per his request.
 
- -- Barry Warsaw <barry at debian.org>  Mon, 29 Jul 2013 14:28:02 -0400
+  [ Piotr Ożarowski ]
+  * python-webob Breaks: python-pylons < 1.0.1 (closes: #721866)
+  * Switch to buildsystem=pybuild, add dh-python to Build-Depends
+  * Update debian/watch file
+  * Bump Standards-Version to 3.9.5 (no changes needed)
 
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 01 Dec 2013 20:46:55 +0100
+
 python-webob (1.2.3-4) unstable; urgency=low
 
   * Team upload.

Modified: packages/python-webob/trunk/debian/control
===================================================================
--- packages/python-webob/trunk/debian/control	2013-12-01 19:39:07 UTC (rev 26629)
+++ packages/python-webob/trunk/debian/control	2013-12-01 19:59:30 UTC (rev 26630)
@@ -5,7 +5,7 @@
 Uploaders: Piotr Ożarowski <piotr at debian.org>,
            Soren Hansen <soren at ubuntu.com>,
            Barry Warsaw <barry at debian.org>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), dh-python
 Build-Depends-Indep: python-all (>= 2.6.6-3),
                      python-nose,
                      python-setuptools (>= 0.6b3-1~),
@@ -13,7 +13,7 @@
                      python3-all,
                      python3-nose,
                      python3-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://webob.org/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-webob/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-webob/trunk/
@@ -24,6 +24,7 @@
 Architecture: all
 Depends: python, ${misc:Depends}, ${python:Depends}
 Suggests: python-webob-doc
+Breaks: python-pylons (<< 1.0.1)
 Description: Python module providing WSGI request and response objects (Python 2)
  WebOb provides wrappers around the WSGI request environment, and an object to
  help create WSGI responses.

Deleted: packages/python-webob/trunk/debian/python-webob.install
===================================================================
--- packages/python-webob/trunk/debian/python-webob.install	2013-12-01 19:39:07 UTC (rev 26629)
+++ packages/python-webob/trunk/debian/python-webob.install	2013-12-01 19:59:30 UTC (rev 26630)
@@ -1 +0,0 @@
-usr/lib/python2*

Deleted: packages/python-webob/trunk/debian/python3-webob.install
===================================================================
--- packages/python-webob/trunk/debian/python3-webob.install	2013-12-01 19:39:07 UTC (rev 26629)
+++ packages/python-webob/trunk/debian/python3-webob.install	2013-12-01 19:59:30 UTC (rev 26630)
@@ -1 +0,0 @@
-usr/lib/python3

Modified: packages/python-webob/trunk/debian/rules
===================================================================
--- packages/python-webob/trunk/debian/rules	2013-12-01 19:39:07 UTC (rev 26629)
+++ packages/python-webob/trunk/debian/rules	2013-12-01 19:59:30 UTC (rev 26630)
@@ -1,38 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export PYBUILD_NAME=webob
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
-
-# Prevent setuptools/distribute from accessing the internet.
-export http_proxy = http://127.0.9.1:9
-
 %:
-	dh $@ --with python2,python3,sphinxdoc
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
-	# The tests require connections to localhost.
-	http_proxy= python$* setup.py test -vv
+override_dh_auto_test:
+	# enable network, tests.test_in_wsgiref.test_request_reading needs it 
+	http_proxy='' dh_auto_test
 
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-endif
-
-build-python%:
-	python$* setup.py build
-
-override_dh_auto_build: $(PYTHON3:%=build-python%)
-	dh_auto_build
-
-install-python%:
-	python$* setup.py install --root=$(CURDIR)/debian/tmp \
-		 --install-layout=deb
-
-override_dh_auto_install: $(PYTHON3:%=install-python%)
-	dh_auto_install
-
 override_dh_installchangelogs:
 	dh_installchangelogs -k docs/news.txt
 

Modified: packages/python-webob/trunk/debian/watch
===================================================================
--- packages/python-webob/trunk/debian/watch	2013-12-01 19:39:07 UTC (rev 26629)
+++ packages/python-webob/trunk/debian/watch	2013-12-01 19:59:30 UTC (rev 26630)
@@ -1,2 +1,3 @@
 version=3
-http://pypi.python.org/packages/source/W/WebOb/Webob-(.*)\.tar.gz
+opts=uversionmangle=s/(rc|b|c|a)/~$1/ \
+http://pypi.python.org/packages/source/W/WebOb/WebOb-(.*)\.(?:tar.(?:gz|bz2)|zip)