r2796 - in zope.testing/trunk/debian (6 files)

barry at users.alioth.debian.org barry at users.alioth.debian.org
Sun Jun 22 20:49:33 UTC 2014 

    Date: Sunday, June 22, 2014 @ 20:49:32
  Author: barry
Revision: 2796

* Bumped version to 4.1.3.
* d/compat: Bumped to version 9.
* d/control:
  - Added myself to Uploaders.
  - Updated Build-Depends.
  - Tweaked long descriptions.
  - Bumped Standards-Version to 3.9.5 with no other changes necessary.
* d/rules: 
  - Converted to --buildsystem=pybuild and simplify.
  - Fix override_dh_installchangelogs rule.
* d/python3-zope.testing.install: Added
* d/tests/all-3: Fix path to test_helper.

Added:
  zope.testing/trunk/debian/python3-zope.testing.install
Modified:
  zope.testing/trunk/debian/changelog
  zope.testing/trunk/debian/compat
  zope.testing/trunk/debian/control
  zope.testing/trunk/debian/rules
  zope.testing/trunk/debian/tests/all-3

Modified: zope.testing/trunk/debian/changelog
===================================================================
--- zope.testing/trunk/debian/changelog	2014-06-20 23:07:30 UTC (rev 2795)
+++ zope.testing/trunk/debian/changelog	2014-06-22 20:49:32 UTC (rev 2796)
@@ -1,4 +1,4 @@
-zope.testing (4.1.2-1) UNRELEASED; urgency=low
+zope.testing (4.1.3-1) UNRELEASED; urgency=low
 
   * Team upload.
 
@@ -18,8 +18,22 @@
   [ Arnaud Fontaine ]
   * debian/source/options: ignore .egg-info directory.
 
- -- Gediminas Paulauskas <menesis at pov.lt>  Mon, 15 Jul 2013 22:31:43 +0300
+  [ Barry Warsaw ]
+  * Bumped version to 4.1.3.
+  * d/compat: Bumped to version 9.
+  * d/control:
+    - Added myself to Uploaders.
+    - Updated Build-Depends.
+    - Tweaked long descriptions.
+    - Bumped Standards-Version to 3.9.5 with no other changes necessary.
+  * d/rules: 
+    - Converted to --buildsystem=pybuild and simplify.
+    - Fix override_dh_installchangelogs rule.
+  * d/python3-zope.testing.install: Added
+  * d/tests/all-3: Fix path to test_helper.
 
+ -- Barry Warsaw <barry at debian.org>  Sun, 22 Jun 2014 16:32:04 -0400
+
 zope.testing (3.10.2-1) unstable; urgency=low
 
   * Team upload.

Modified: zope.testing/trunk/debian/compat
===================================================================
--- zope.testing/trunk/debian/compat	2014-06-20 23:07:30 UTC (rev 2795)
+++ zope.testing/trunk/debian/compat	2014-06-22 20:49:32 UTC (rev 2796)
@@ -1 +1 @@
-7
+9

Modified: zope.testing/trunk/debian/control
===================================================================
--- zope.testing/trunk/debian/control	2014-06-20 23:07:30 UTC (rev 2795)
+++ zope.testing/trunk/debian/control	2014-06-22 20:49:32 UTC (rev 2796)
@@ -4,13 +4,19 @@
 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>,
-           Matthias Klose <doko at ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~),
+           Matthias Klose <doko at ubuntu.com>,
+           Barry Warsaw <barry at debian.org>
+Build-Depends: debhelper (>= 9),
+               dh-python,
                python-all (>= 2.6.6-3~),
+               python-setuptools,
+	       python-zope.exceptions,
+               python-zope.interface,
                python3-all,
-               python-setuptools,
                python3-setuptools,
-Standards-Version: 3.9.4
+	       python3-zope.exceptions,
+               python3-zope.interface
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest
@@ -20,15 +26,19 @@
 
 Package: python-zope.testing
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Description: Zope testing helpers
  This package provides a number of testing frameworks. It includes a flexible
- test runner, and supports both doctest and unittest. 
+ test runner, and supports both doctest and unittest.
+ .
+ This is the Python 2 version.
 
 Package: python3-zope.testing
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Provides: ${python3:Provides}
 Description: Zope testing helpers for Python 3
  This package provides a number of testing frameworks. It includes a flexible
- test runner, and supports both doctest and unittest. 
+ test runner, and supports both doctest and unittest.
+ .
+ This is the Python 3 version.

Added: zope.testing/trunk/debian/python3-zope.testing.install
===================================================================
--- zope.testing/trunk/debian/python3-zope.testing.install	                        (rev 0)
+++ zope.testing/trunk/debian/python3-zope.testing.install	2014-06-22 20:49:32 UTC (rev 2796)
@@ -0,0 +1 @@
+debian/test_helper usr/share/python3-zope.testing

Modified: zope.testing/trunk/debian/rules
===================================================================
--- zope.testing/trunk/debian/rules	2014-06-20 23:07:30 UTC (rev 2795)
+++ zope.testing/trunk/debian/rules	2014-06-22 20:49:32 UTC (rev 2796)
@@ -1,41 +1,10 @@
 #!/usr/bin/make -f
 
+export PYBUILD_NAME=zope.testing
+
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-package=python-zope.testing
-package3=python3-zope.testing
-
-override_dh_auto_clean:
-	rm -rf build
-	find -name __pycache__ | xargs -r rm -rf
-	dh_auto_clean
-
-override_dh_auto_build:
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py build; \
-	done
-	for pyvers in $(shell py3versions -sv); do \
-		python$$pyvers setup.py build; \
-	done
-
-override_dh_auto_install:
-	set -x; \
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/$(package); \
-	done
-	set -x; \
-	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
 	dh_installchangelogs CHANGES.rst

Modified: zope.testing/trunk/debian/tests/all-3
===================================================================
--- zope.testing/trunk/debian/tests/all-3	2014-06-20 23:07:30 UTC (rev 2795)
+++ zope.testing/trunk/debian/tests/all-3	2014-06-22 20:49:32 UTC (rev 2796)
@@ -1,3 +1,3 @@
 #!/bin/bash
 testfilter="-s zope.testing"
-. /usr/share/python3-zope.testrunner/test_helper_3
+. /usr/share/python3-zope.testrunner/test_helper

More information about the pkg-zope-developers mailing list