r2861 - in zope.exceptions/trunk/debian (8 files)

Wed Jul 2 22:36:45 UTC 2014

Date: Wednesday, July 2, 2014 @ 22:36:44
  Author: barry
Revision: 2861

* Team upload.
* New upstream release.
* d/control:
  - Added myself to Uploaders.
  - Updated Build-Depends.
  - Bumped Standards-Version with no other changes necessary.
  - Removed python-zope and python3-zope virtual dependencies.
  - wrap-and-sort
* d/compat: Bumped to version 9.
* d/rules: Convert to --buildsystem=pybuild
* d/tests: Just make sure imports work.
* d/copyright:
  - Fixed Format header.
  - Added Files-Excluded header to prune pre-built docs/_build directory

Modified:
  zope.exceptions/trunk/debian/changelog
  zope.exceptions/trunk/debian/compat
  zope.exceptions/trunk/debian/control
  zope.exceptions/trunk/debian/copyright
  zope.exceptions/trunk/debian/rules
  zope.exceptions/trunk/debian/tests/all
  zope.exceptions/trunk/debian/tests/all-3
  zope.exceptions/trunk/debian/tests/control

Modified: zope.exceptions/trunk/debian/changelog
===================================================================

--- zope.exceptions/trunk/debian/changelog	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/changelog	2014-07-02 22:36:44 UTC (rev 2861)
@@ -1,9 +1,27 @@
-zope.exceptions (4.0.6-2) UNRELEASED; urgency=low
+zope.exceptions (4.0.7-1) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Gediminas Paulauskas ]
   * debian/rules: remove setuptools from requires.txt of python3 egg.
 
- -- Gediminas Paulauskas <menesis at pov.lt>  Tue, 16 Jul 2013 00:12:45 +0300
+  [ Barry Warsaw ]
+  * New upstream release.
+  * d/control:
+    - Added myself to Uploaders.
+    - Updated Build-Depends.
+    - Bumped Standards-Version with no other changes necessary.
+    - Removed python-zope and python3-zope virtual dependencies.
+    - wrap-and-sort
+  * d/compat: Bumped to version 9.
+  * d/rules: Convert to --buildsystem=pybuild
+  * d/tests: Just make sure imports work.
+  * d/copyright:
+    - Fixed Format header.
+    - Added Files-Excluded header to prune pre-built docs/_build directory
 
+ -- Barry Warsaw <barry at debian.org>  Wed, 02 Jul 2014 18:17:09 -0400
+
 zope.exceptions (4.0.6-1) unstable; urgency=low
 
   * Team upload.

Modified: zope.exceptions/trunk/debian/compat
===================================================================
--- zope.exceptions/trunk/debian/compat	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/compat	2014-07-02 22:36:44 UTC (rev 2861)
@@ -1 +1 @@
-7
+9

Modified: zope.exceptions/trunk/debian/control
===================================================================
--- zope.exceptions/trunk/debian/control	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/control	2014-07-02 22:36:44 UTC (rev 2861)
@@ -3,13 +3,19 @@
 Priority: extra
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>,
-           Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+           Fabio Tranchitella <kobold at debian.org>,
+           Barry Warsaw <barry at debian.org>
+Build-Depends: debhelper (>= 9),
+               dh-python,
                python-all (>= 2.6.6-3~),
+               python-setuptools,
+               python-zope.interface,
+               python-zope.testrunner,
                python3-all,
-               python-setuptools,
-               python3-setuptools
-Standards-Version: 3.9.4
+               python3-setuptools,
+               python3-zope.interface,
+               python3-zope.testrunner,
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 XS-Testsuite: autopkgtest
@@ -19,14 +25,14 @@
 
 Package: python-zope.exceptions
 Architecture: all
-Depends: python-zope, ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Description: Zope exceptions for Python
  This package contains exception interfaces and implementations which are so
  general purpose that they don't belong in Zope application-specific packages.
 
 Package: python3-zope.exceptions
 Architecture: all
-Depends: python3-zope, ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Description: Zope exceptions for Python 3
  This package contains exception interfaces and implementations which are so
  general purpose that they don't belong in Zope application-specific packages.

Modified: zope.exceptions/trunk/debian/copyright
===================================================================
--- zope.exceptions/trunk/debian/copyright	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/copyright	2014-07-02 22:36:44 UTC (rev 2861)
@@ -2,6 +2,7 @@
 Upstream-Name: zope.exceptions
 Upstream-Contact: Zope Foundation and Contributors <zope-dev at zope.org>
 Source: http://pypi.python.org/pypi/zope.exceptions
+Files-Excluded: docs/_build/*
 
 Files: *
 Copyright: (c) 2001, 2002, 2012 Zope Foundation and Contributors.

Modified: zope.exceptions/trunk/debian/rules
===================================================================
--- zope.exceptions/trunk/debian/rules	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/rules	2014-07-02 22:36:44 UTC (rev 2861)
@@ -1,38 +1,13 @@
 #!/usr/bin/make -f
 
 
-%:
-	dh $@ --with python2,python3
+export PYBUILD_NAME=zope.exceptions
 
-package=python-zope.exceptions
-package3=python3-zope.exceptions
 
-override_dh_auto_build:
-	set -ex; for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py build; \
-	done
-	set -ex; for pyvers in $(shell py3versions -sv); do \
-		python$$pyvers setup.py build; \
-	done
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-override_dh_auto_install:
-	set -ex; \
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/$(package); \
-	done
-	set -ex; \
-	for pyvers in $(shell py3versions -vs); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/$(package3); \
-	done
 
-override_dh_gencontrol:
-	dh_gencontrol
-	
-	# Workaround for dh_python3 not removing python-setuptools from requires.txt
-	find debian/$(package3) -name requires.txt -exec sed -i '/^setuptools$$/d' {} \;
-
 override_dh_installchangelogs:
-	dh_installchangelogs -p$(package) CHANGES.rst
-	dh_installchangelogs -p$(package3) CHANGES.rst
+	dh_installchangelogs -ppython-zope.exceptions CHANGES.rst
+	dh_installchangelogs -ppython3-zope.exceptions CHANGES.rst

Modified: zope.exceptions/trunk/debian/tests/all
===================================================================
--- zope.exceptions/trunk/debian/tests/all	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/tests/all	2014-07-02 22:36:44 UTC (rev 2861)
@@ -1,3 +1,4 @@
-#!/bin/bash
-testfilter="-s zope.exceptions"
-. /usr/share/python-zope.testrunner/test_helper
+#!/usr/bin/python
+
+import zope.exceptions
+print zope.exceptions

Modified: zope.exceptions/trunk/debian/tests/all-3
===================================================================
--- zope.exceptions/trunk/debian/tests/all-3	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/tests/all-3	2014-07-02 22:36:44 UTC (rev 2861)
@@ -1,3 +1,4 @@
-#!/bin/bash
-testfilter="-s zope.exceptions"
-. /usr/share/python3-zope.testrunner/test_helper_3
+#!/usr/bin/python3
+
+import zope.exceptions
+print(zope.exceptions)

Modified: zope.exceptions/trunk/debian/tests/control
===================================================================
--- zope.exceptions/trunk/debian/tests/control	2014-07-01 17:21:05 UTC (rev 2860)
+++ zope.exceptions/trunk/debian/tests/control	2014-07-02 22:36:44 UTC (rev 2861)
@@ -1,5 +1,2 @@
-Tests: all-3
-Depends: python3-all, python3-zope.exceptions, python3-zope.testrunner
-
-Tests: all
-Depends: python-all, python-zope.exceptions, python-zope.testrunner
+Tests: all all-3
+Depends: @


