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

jinty-guest at users.alioth.debian.org jinty-guest at users.alioth.debian.org
Wed Apr 27 10:37:07 UTC 2011


    Date: Wednesday, April 27, 2011 @ 10:36:58
  Author: jinty-guest
Revision: 2181

Import changes from Ubuntu

Modified:
  zope.testing/trunk/debian/changelog
  zope.testing/trunk/debian/control
  zope.testing/trunk/debian/copyright
  zope.testing/trunk/debian/rules
  zope.testing/trunk/debian/test_helper
  zope.testing/trunk/debian/tests/all

Modified: zope.testing/trunk/debian/changelog
===================================================================
--- zope.testing/trunk/debian/changelog	2011-04-25 13:09:06 UTC (rev 2180)
+++ zope.testing/trunk/debian/changelog	2011-04-27 10:36:58 UTC (rev 2181)
@@ -4,6 +4,24 @@
 
  -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Nov 2010 13:20:24 +0000
 
+zope.testing (3.9.4-0ubuntu2) natty; urgency=low
+
+  * debian/rules: do not mess with scripts, install only
+    /usr/bin/zope-testrunner using default python.
+  * debian/test_helper: adapt to changed name of zope-testrunner, execute it
+    with different python interpreters instead.
+  * debian/tests/all: use our own test_helper.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Fri, 15 Apr 2011 21:26:53 +0300
+
+zope.testing (3.9.4-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+  * debian/rules: Build-Depends on python-all, not its -dev variant.
+  * debian/copyright: update, convert to dep5 format.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Tue, 14 Sep 2010 15:27:42 +0300
+
 zope.testing (3.8.3-4) unstable; urgency=low
 
   * Fix test path on python2.6.
@@ -56,7 +74,7 @@
 zope.testing (3.8.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Standards-Version: 3.8.3, no changed required.
+  * Standards-Version: 3.8.3, no changes required.
   * debian/rules: fixed FTBFS with Python 2.6. (Closes: #543230)
   * debian/control: added conflict with zope3.
 

Modified: zope.testing/trunk/debian/control
===================================================================
--- zope.testing/trunk/debian/control	2011-04-25 13:09:06 UTC (rev 2180)
+++ zope.testing/trunk/debian/control	2011-04-27 10:36:58 UTC (rev 2181)
@@ -3,19 +3,18 @@
 Priority: optional
 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~), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.3.5-11), python-central (>= 0.6.8), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4)
+Standards-Version: 3.8.4
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.testing/trunk
 
 Package: python-zope.testing
 Architecture: all
 Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
-Recommends: ${pydeb:Recommends}
 Provides: ${pydeb:Provides}, ${python:Provides}
 Suggests: ${pydeb:Suggests}
 Conflicts: zope3, python-zodb (<< 2.9)
 XB-Python-Version: ${python:Versions}
-Description: The zope testing framework, including the testrunner script
+Description: Zope testing framework, including the testrunner script
  This package provides a number of testing frameworks. It includes a flexible
  test runner, and supports both doctest and unittest. 

Modified: zope.testing/trunk/debian/copyright
===================================================================
--- zope.testing/trunk/debian/copyright	2011-04-25 13:09:06 UTC (rev 2180)
+++ zope.testing/trunk/debian/copyright	2011-04-27 10:36:58 UTC (rev 2181)
@@ -1,74 +1,52 @@
-This package was debianized by Brian Sutherland <brian at vanguardistas.net>
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: zope.testing
+Maintainer: Zope Foundation and Contributors <zope-dev at zope.org>
+Source: http://pypi.python.org/pypi/zope.testing
 
-It was downloaded from http://pypi.python.org/pypi/zope.testing
-
-Copyright:
-
-Upstream Author: Zope Corporation and Contributers <zope3-dev at zope.org>
-
-Files contain this header:
-
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-
-Zope Public License (ZPL) Version 2.1
--------------------------------------
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
-   accompanying copyright notice, this list of conditions,
-   and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
-   copyright notice, this list of conditions, and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
-
-4. The right to distribute this software or to use it for
-   any purpose does not give you the right to use
-   Servicemarks (sm) or Trademarks (tm) of the copyright
-   holders. Use of them is covered by separate agreement
-   with the copyright holders.
-
-5. If any files are modified, you must cause the modified
-   files to carry prominent notices stating that you changed
-   the files and the date of any change.
-
-Disclaimer
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
-  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGE.
+Files: *
+Copyright: (c) 2001-2008 Zope Foundation and Contributors.
+License: ZPL-2.1
+ Zope Public License (ZPL) Version 2.1
+ .
+ A copyright notice accompanies this license document that identifies the
+ copyright holders.
+ .
+ This license has been certified as open source. It has also been designated as
+ GPL compatible by the Free Software Foundation (FSF).
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions in source code must retain the accompanying copyright
+ notice, this list of conditions, and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the accompanying copyright
+ notice, this list of conditions, and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Names of the copyright holders must not be used to endorse or promote
+ products derived from this software without prior written permission from the
+ copyright holders.
+ .
+ 4. The right to distribute this software or to use it for any purpose does not
+ give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+ copyright
+ holders. Use of them is covered by separate agreement with the copyright
+ holders.
+ .
+ 5. If any files are modified, you must cause the modified files to carry
+ prominent notices stating that you changed the files and the date of any
+ change.
+ .
+ Disclaimer
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: zope.testing/trunk/debian/rules
===================================================================
--- zope.testing/trunk/debian/rules	2011-04-25 13:09:06 UTC (rev 2180)
+++ zope.testing/trunk/debian/rules	2011-04-27 10:36:58 UTC (rev 2181)
@@ -2,16 +2,3 @@
 
 %:
 	dh --with pydeb --with python-central $@
-
-package=python-zope.testing
-
-override_dh_install:
-	dh_install
-	# console scripts
-	for script in debian/$(package)/usr/bin/*; do \
-	  for py in $(shell pyversions -vr debian/control); do \
-	    cat $$script |  sed -e "s,/usr/bin/python,/usr/bin/python$$py,g" > $$script$$py; \
-	    chmod 755 $$script$$py; \
-	  done; \
-      rm $$script; \
-	done;

Modified: zope.testing/trunk/debian/test_helper
===================================================================
--- zope.testing/trunk/debian/test_helper	2011-04-25 13:09:06 UTC (rev 2180)
+++ zope.testing/trunk/debian/test_helper	2011-04-27 10:36:58 UTC (rev 2181)
@@ -4,7 +4,7 @@
 
 if [ -z "${testfilter}" ]; then
    if [ -x /usr/bin/van-pydeb ]; then
-       testfilter="-m $(van-pydeb src_to_py $(dpkg-parsechangelog -c1 -ldebian/changelog | grep 'Source: ' | sed 's/Source: //'))"
+       testfilter="-m $(van-pydeb src_to_py $(grep 'Source: ' debian/control | sed 's/Source: //'))"
    else
        echo "Could not find van-pydeb to guess the python package name. You should have your tests depend on it or you "
        echo "must specify testfilter variable, something like -p package_name, see zope-testrunner --help for details."
@@ -12,9 +12,9 @@
    fi
 fi 
 
-PYVERS=$(pyversions -vr debian/control)
-for version in ${PYVERS}; do
-    py_libdir_sh=$(python${version} -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-    echo Running tests for python${version}: /usr/bin/zope-testrunner${version} -k --test-path ${py_libdir_sh} ${testfilter}
-    /usr/bin/zope-testrunner${version} -k --test-path ${py_libdir_sh} ${testfilter}
+PYVERS=$(pyversions -r debian/control)
+for python in ${PYVERS}; 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}
+    ${python} /usr/bin/zope-testrunner -k --test-path ${py_libdir_sh} ${testfilter}
 done

Modified: zope.testing/trunk/debian/tests/all
===================================================================
--- zope.testing/trunk/debian/tests/all	2011-04-25 13:09:06 UTC (rev 2180)
+++ zope.testing/trunk/debian/tests/all	2011-04-27 10:36:58 UTC (rev 2181)
@@ -1,26 +1,2 @@
 #!/bin/bash
-
-set -e
-
-if [ -z "${testfilter}" ]; then
-   if [ -x /usr/bin/van-pydeb ]; then
-       testfilter="-m $(van-pydeb src_to_py $(dpkg-parsechangelog -c1 -ldebian/changelog | grep 'Source: ' | sed 's/Source: //'))"
-   else
-       echo "Could not find van-pydeb to guess the python package name. You should have your tests depend on it or you "
-       echo "must specify testfilter variable, something like -p package_name, see zope-testrunner --help for details."
-       exit 1
-   fi
-fi 
-
-PYVERS=$(pyversions -vr debian/control)
-for version in ${PYVERS}; do
-    py_libdir_sh=$(python${version} -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-    echo Running tests for python${version}: /usr/bin/zope-testrunner${version} -k --test-path ${py_libdir_sh} ${testfilter}
-    stderr=$(mktemp)
-    /usr/bin/zope-testrunner${version} -k --test-path ${py_libdir_sh} ${testfilter} 2>${stderr}
-    # ignoring 'Not printing coverage data for' - spurious failure on python2.4
-    # last "cat" in pipe below because grep exits with nonzero exit status if
-    # no match.
-    cat ${stderr} | grep -v 'Not printing coverage data for' | grep -v 'A message on stderr.  Please ignore (expected in test output).' | cat >&2
-    rm ${stderr}
-done
+. /usr/share/python-zope.testing/test_helper




More information about the pkg-zope-developers mailing list