r2744 - in zope.testrunner/trunk/debian (9 files)

menesis-guest at users.alioth.debian.org menesis-guest at users.alioth.debian.org
Tue Jul 16 08:52:08 UTC 2013 

    Date: Tuesday, July 16, 2013 @ 08:52:07
  Author: menesis-guest
Revision: 2744

* New upstream release.
* debian/tests/control:
  + Tests require python*-setuptools.
  + Remove python3-subunit from all-3, subunit support does not work.
* debian/*.docs: update for moved files.
* debian/control:
  + Remove python3-zope.fixers from Build-Depends, no longer needed.
  + Remove setuptools from Depends
* debian/rules:
  + Add workaround for dh_python3 not removing setuptools from requires.txt
  + Install upstream changelog
  + Do not remove .egg-info on clean
* debian/source/options: add to ignore changes in .egg-info directory

Added:
  zope.testrunner/trunk/debian/source/options
Modified:
  zope.testrunner/trunk/debian/changelog
  zope.testrunner/trunk/debian/control
  zope.testrunner/trunk/debian/copyright
  zope.testrunner/trunk/debian/python-zope.testrunner.docs
  zope.testrunner/trunk/debian/python3-zope.testrunner.docs
  zope.testrunner/trunk/debian/rules
  zope.testrunner/trunk/debian/test_helper_3
  zope.testrunner/trunk/debian/tests/control

Modified: zope.testrunner/trunk/debian/changelog
===================================================================
--- zope.testrunner/trunk/debian/changelog	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/changelog	2013-07-16 08:52:07 UTC (rev 2744)
@@ -1,3 +1,22 @@
+zope.testrunner (4.4.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/tests/control:
+    + Tests require python*-setuptools.
+    + Remove python3-subunit from all-3, subunit support does not work.
+  * debian/*.docs: update for moved files.
+  * debian/control:
+    + Remove python3-zope.fixers from Build-Depends, no longer needed.
+    + Remove setuptools from Depends
+  * debian/rules:
+    + Add workaround for dh_python3 not removing setuptools from requires.txt
+    + Install upstream changelog
+    + Do not remove .egg-info on clean
+  * debian/source/options: add to ignore changes in .egg-info directory
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Mon, 15 Jul 2013 12:05:24 +0300
+
+
 zope.testrunner (4.0.3-4) unstable; urgency=low
 
   * Team upload.

Modified: zope.testrunner/trunk/debian/control
===================================================================
--- zope.testrunner/trunk/debian/control	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/control	2013-07-16 08:52:07 UTC (rev 2744)
@@ -8,7 +8,6 @@
                python3-all,
                python-setuptools,
                python3-setuptools,
-               python3-zope.fixers
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.4
 X-Python3-Version: >= 3.1
@@ -19,7 +18,7 @@
 
 Package: python3-zope.testrunner
 Architecture: all
-Depends: python3-zope, python3-setuptools, ${python3:Depends}, ${misc:Depends}, python3-zope.exceptions (>= 4.0.1~)
+Depends: python3-zope, ${python3:Depends}, ${misc:Depends}, python3-zope.exceptions (>= 4.0.1~)
 Provides: ${python3:Provides}
 Description: Flexible test runner with layer support for Python 3
  The testrunner module is used to run automated tests defined using the
@@ -31,7 +30,7 @@
 
 Package: python-zope.testrunner
 Architecture: all
-Depends: python-zope, python-setuptools, ${python:Depends}, ${misc:Depends}
+Depends: python-zope, ${python:Depends}, ${misc:Depends}
 Replaces: python-zope.testing (<< 3.10.0)
 Breaks: python-zope.testing (<< 3.10.0)
 Provides: ${python:Provides}

Modified: zope.testrunner/trunk/debian/copyright
===================================================================
--- zope.testrunner/trunk/debian/copyright	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/copyright	2013-07-16 08:52:07 UTC (rev 2744)
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright: (c) 2001-2008 Zope Foundation and Contributors.
-License: ZPL-2.1
+License: Zope-2.1
  Zope Public License (ZPL) Version 2.1
  .
  A copyright notice accompanies this license document that identifies the

Modified: zope.testrunner/trunk/debian/python-zope.testrunner.docs
===================================================================
--- zope.testrunner/trunk/debian/python-zope.testrunner.docs	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/python-zope.testrunner.docs	2013-07-16 08:52:07 UTC (rev 2744)
@@ -1,19 +1,19 @@
-README.txt
-src/zope/testrunner/testrunner.txt
-src/zope/testrunner/testrunner-simple.txt
-src/zope/testrunner/testrunner-layers-api.txt
-src/zope/testrunner/testrunner-layers.txt
-src/zope/testrunner/testrunner-arguments.txt
-src/zope/testrunner/testrunner-verbose.txt
-src/zope/testrunner/testrunner-test-selection.txt
-src/zope/testrunner/testrunner-progress.txt
-src/zope/testrunner/testrunner-errors.txt
-src/zope/testrunner/testrunner-debugging.txt
-src/zope/testrunner/testrunner-layers-ntd.txt
-src/zope/testrunner/testrunner-coverage.txt
-src/zope/testrunner/testrunner-profiling.txt
-src/zope/testrunner/testrunner-wo-source.txt
-src/zope/testrunner/testrunner-repeat.txt
-src/zope/testrunner/testrunner-gc.txt
-src/zope/testrunner/testrunner-leaks.txt
-src/zope/testrunner/testrunner-knit.txt
+README.rst
+src/zope/testrunner/tests/testrunner.txt
+src/zope/testrunner/tests/testrunner-simple.txt
+src/zope/testrunner/tests/testrunner-layers-api.txt
+src/zope/testrunner/tests/testrunner-layers.txt
+src/zope/testrunner/tests/testrunner-arguments.txt
+src/zope/testrunner/tests/testrunner-verbose.txt
+src/zope/testrunner/tests/testrunner-test-selection.txt
+src/zope/testrunner/tests/testrunner-progress.txt
+src/zope/testrunner/tests/testrunner-errors.txt
+src/zope/testrunner/tests/testrunner-debugging.txt
+src/zope/testrunner/tests/testrunner-layers-ntd.txt
+src/zope/testrunner/tests/testrunner-coverage.txt
+src/zope/testrunner/tests/testrunner-profiling.txt
+src/zope/testrunner/tests/testrunner-wo-source.txt
+src/zope/testrunner/tests/testrunner-repeat.txt
+src/zope/testrunner/tests/testrunner-gc.txt
+src/zope/testrunner/tests/testrunner-leaks.txt
+src/zope/testrunner/tests/testrunner-knit.txt

Modified: zope.testrunner/trunk/debian/python3-zope.testrunner.docs
===================================================================
--- zope.testrunner/trunk/debian/python3-zope.testrunner.docs	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/python3-zope.testrunner.docs	2013-07-16 08:52:07 UTC (rev 2744)
@@ -1,19 +1,19 @@
-README.txt
-src/zope/testrunner/testrunner.txt
-src/zope/testrunner/testrunner-simple.txt
-src/zope/testrunner/testrunner-layers-api.txt
-src/zope/testrunner/testrunner-layers.txt
-src/zope/testrunner/testrunner-arguments.txt
-src/zope/testrunner/testrunner-verbose.txt
-src/zope/testrunner/testrunner-test-selection.txt
-src/zope/testrunner/testrunner-progress.txt
-src/zope/testrunner/testrunner-errors.txt
-src/zope/testrunner/testrunner-debugging.txt
-src/zope/testrunner/testrunner-layers-ntd.txt
-src/zope/testrunner/testrunner-coverage.txt
-src/zope/testrunner/testrunner-profiling.txt
-src/zope/testrunner/testrunner-wo-source.txt
-src/zope/testrunner/testrunner-repeat.txt
-src/zope/testrunner/testrunner-gc.txt
-src/zope/testrunner/testrunner-leaks.txt
-src/zope/testrunner/testrunner-knit.txt
+README.rst
+src/zope/testrunner/tests/testrunner.txt
+src/zope/testrunner/tests/testrunner-simple.txt
+src/zope/testrunner/tests/testrunner-layers-api.txt
+src/zope/testrunner/tests/testrunner-layers.txt
+src/zope/testrunner/tests/testrunner-arguments.txt
+src/zope/testrunner/tests/testrunner-verbose.txt
+src/zope/testrunner/tests/testrunner-test-selection.txt
+src/zope/testrunner/tests/testrunner-progress.txt
+src/zope/testrunner/tests/testrunner-errors.txt
+src/zope/testrunner/tests/testrunner-debugging.txt
+src/zope/testrunner/tests/testrunner-layers-ntd.txt
+src/zope/testrunner/tests/testrunner-coverage.txt
+src/zope/testrunner/tests/testrunner-profiling.txt
+src/zope/testrunner/tests/testrunner-wo-source.txt
+src/zope/testrunner/tests/testrunner-repeat.txt
+src/zope/testrunner/tests/testrunner-gc.txt
+src/zope/testrunner/tests/testrunner-leaks.txt
+src/zope/testrunner/tests/testrunner-knit.txt

Modified: zope.testrunner/trunk/debian/rules
===================================================================
--- zope.testrunner/trunk/debian/rules	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/rules	2013-07-16 08:52:07 UTC (rev 2744)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 --with python3 $@
+	dh $@ --with python2 --with python3
 
 PACKAGE=python-zope.testrunner
 PACKAGE_PYTHON3=python3-zope.testrunner
@@ -10,15 +10,13 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-
-	rm -f src/zope.testrunner.egg-info/*
-
+	
 	# Specific to python3
 	rm -rf build
 
 override_dh_auto_build:
 	dh_auto_build -p$(PACKAGE)
-
+	
 	set -ex; \
 	for python in $(PYTHON3); do \
 		$$python setup.py build; \
@@ -26,12 +24,21 @@
 
 override_dh_auto_install:
 	dh_auto_install -p$(PACKAGE) --destdir=$(CURDIR)/debian/$(PACKAGE)
-
+	
 	set -ex; \
 	for python in $(PYTHON3); do \
 		$$python setup.py install --install-layout=deb \
 			--root=$(CURDIR)/debian/$(PACKAGE_PYTHON3); \
 	done
-
+	
 	mv $(CURDIR)/debian/$(PACKAGE_PYTHON3)/usr/bin/zope-testrunner \
 		$(CURDIR)/debian/$(PACKAGE_PYTHON3)/usr/bin/zope-testrunner3
+
+override_dh_gencontrol:
+	dh_gencontrol
+	
+	# Workaround for dh_python3 not removing python-setuptools from requires.txt
+	find debian/$(PACKAGE_PYTHON3) -name requires.txt -exec sed -i '/^setuptools$$/d' {} \;
+
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.rst

Added: zope.testrunner/trunk/debian/source/options
===================================================================
--- zope.testrunner/trunk/debian/source/options	                        (rev 0)
+++ zope.testrunner/trunk/debian/source/options	2013-07-16 08:52:07 UTC (rev 2744)
@@ -0,0 +1,5 @@
+# Ignore changes on .egg-info directory to prevent issue while building
+# twice as dpkg-source do not ignore the automatic patch anymore. Deleting
+# the files does not work as it was generated through sdist target using
+# SVN, thus some files might be missing (such as zcml or txt files).
+extend-diff-ignore = "\.egg-info"

Modified: zope.testrunner/trunk/debian/test_helper_3
===================================================================
--- zope.testrunner/trunk/debian/test_helper_3	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/test_helper_3	2013-07-16 08:52:07 UTC (rev 2744)
@@ -15,6 +15,6 @@
 PY3VERS=$(py3versions -r debian/control)
 for python in ${PY3VERS}; do
     py_libdir_sh=$(${python} -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-    echo Running tests for ${python}: /usr/bin/zope-testrunner -k --test-path ${py_libdir_sh} ${testfilter}
+    echo Running tests for ${python}: /usr/bin/zope-testrunner3 -k --test-path ${py_libdir_sh} ${testfilter}
     ${python} /usr/bin/zope-testrunner3 -k --test-path ${py_libdir_sh} ${testfilter}
 done

Modified: zope.testrunner/trunk/debian/tests/control
===================================================================
--- zope.testrunner/trunk/debian/tests/control	2013-07-16 08:39:24 UTC (rev 2743)
+++ zope.testrunner/trunk/debian/tests/control	2013-07-16 08:52:07 UTC (rev 2744)
@@ -1,5 +1,5 @@
 Tests: all
-Depends: python-all, python-zope.testing, python-zope.testrunner, python-subunit
+Depends: python-all, python-zope.testing, python-zope.testrunner, python-subunit, python-setuptools
 
 Tests: all-3
-Depends: python3-all, python3-zope.testing, python3-zope.testrunner, python-subunit
+Depends: python3-all, python3-zope.testing, python3-zope.testrunner, python3-setuptools

More information about the pkg-zope-developers mailing list