New upstream release of python-testtools
Hi Robert & Jelmer,
I would like to upload a new upstream version of python-testtools. I
have worked out some changes in the packaging, which I have attached to
this message.
Do you agree with such NMU?
Can I also upload this package in the python module team SVN repository,
instead of collab-maint BZR (since we agreed on it for python-fixtures,
probably you would like this to be done as well for this package)?
Cheers,
Thomas Goirand (zigo)
diff -u -N -r e/python-testtools-0.9.21/debian/changelog python-testtools-0.9.29/debian/changelog
--- e/python-testtools-0.9.21/debian/changelog 2013-02-15 12:23:09.000000000 +0000
+++ python-testtools-0.9.29/debian/changelog 2013-02-15 12:48:20.000000000 +0000
@@ -1,3 +1,17 @@
+python-testtools (0.9.29-0.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release.
+ * Rewrote debian/copyright using parsable format 1.0.
+ * Now using source format 3.0 (quilt).
+ * Standard-Version is now 3.9.4.
+ * Compat and debhelper are now 9.
+ * X-Python-Version: >= 2.6 instead of 2.5.
+ * Removes embedded version of jquery.js and underscore.js, and recommends
+ corresponding Debian packages.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 15 Feb 2013 12:18:38 +0000
+
python-testtools (0.9.21-1) experimental; urgency=low
* New upstream release.
diff -u -N -r e/python-testtools-0.9.21/debian/compat python-testtools-0.9.29/debian/compat
--- e/python-testtools-0.9.21/debian/compat 2013-02-15 12:23:09.000000000 +0000
+++ python-testtools-0.9.29/debian/compat 2013-02-15 12:20:42.000000000 +0000
@@ -1 +1 @@
-6
+9
diff -u -N -r e/python-testtools-0.9.21/debian/control python-testtools-0.9.29/debian/control
--- e/python-testtools-0.9.21/debian/control 2013-02-15 12:23:09.000000000 +0000
+++ python-testtools-0.9.29/debian/control 2013-02-15 12:40:00.000000000 +0000
@@ -3,18 +3,18 @@
Uploaders: Jelmer Vernooij <jelmer@debian.org>
Section: python
Priority: optional
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
python-all (>= 2.6.6-3~),
python3-all,
python-fixtures,
python-sphinx,
python-twisted
Vcs-Bzr: http://bzr.debian.org/bzr/collab-maint/python-testtools/experimental
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
X-Python3-Version: >= 3.0
-Homepage: https://launchpad.net/testtools
+Homepage: http://pypi.python.org/pypi/testtools
Package: python-testtools
Architecture: all
@@ -23,15 +23,17 @@
python-pkg-resources
Provides: ${python:Provides}
Breaks: python-subunit (<< 0.0.6)
-Recommends: python-fixtures
+Recommends: python-fixtures, libjs-jquery, node-underscore
Suggests: python-twisted
-Description: Extensions to the Python unittest library
+Description: Extensions to the Python unittest library (Python 2.x)
testtools (formerly pyunit3k) is a set of extensions to the Python standard
library's unit testing framework. These extensions have been derived from
years of experience with unit testing in Python and come from many different
sources. It's hoped that these extensions will make their way into the
standard library eventually. Also included are backports from Python trunk of
unittest features that are not otherwise available to existing unittest users.
+ .
+ This package contains the libraries for Python 2.x.
Package: python3-testtools
Architecture: all
@@ -39,10 +41,12 @@
${misc:Depends},
python3-pkg-resources
Provides: ${python:Provides}
-Description: Extensions to the Python unittest library
+Description: Extensions to the Python unittest library (Python 3.x)
testtools (formerly pyunit3k) is a set of extensions to the Python standard
library's unit testing framework. These extensions have been derived from
years of experience with unit testing in Python and come from many different
sources. It's hoped that these extensions will make their way into the
standard library eventually. Also included are backports from Python trunk of
unittest features that are not otherwise available to existing unittest users.
+ .
+ This package contains the libraries for Python 3.x.
diff -u -N -r e/python-testtools-0.9.21/debian/copyright python-testtools-0.9.29/debian/copyright
--- e/python-testtools-0.9.21/debian/copyright 2013-02-15 12:23:09.000000000 +0000
+++ python-testtools-0.9.29/debian/copyright 2013-02-15 11:50:17.000000000 +0000
@@ -1,24 +1,67 @@
-This is python-testtools, packaged for Ubuntu by Elliot Murphy.
-Now packaged for Debian by Robert Collins
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: testtools
+Upstream-Contact: Jonathan M. Lange <jml@mumak.net>
+Source: https://github.com/testing-cabal/testtools
-Homepage is https://launchpad.net/testtools
+Files: debian/*
+Copyright: (c) 2009, Elliot Murphy <elliot.murphy@gmail.com>
+ (c) 2009-2011, Robert Collins <robertc@robertcollins.net>
+ (c) 2012, Jelmer Vernooij <jelmer@debian.org>
+License: MIT
-Copyright (c) 2008 Jonathan M. Lange <jml@mumak.net>
+Files: testtools/run.py
+Copyright: (c) 1999-2003 Steve Purcell
+ (c) 2003-2010 Python Software Foundation
+License: Python-license
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Files: *
+Copyright: (c) Canonical Ltd
+ (c) Twisted Matrix Labs
+ (c) 2008-2013, Jonathan M. Lange <jml@mumak.net>
+ (c) Robert Collins <robertc@robertcollins.net>
+ (c) Andrew Bennetts
+ (c) Benjamin Peterson
+ (c) Jamu Kakar
+ (c) James Westby
+ (c) Martin [gz]
+ (c) Michael Hudson-Doyle
+ (c) Aaron Bentley
+ (c) Christian Kampka
+ (c) Gavin Panella
+ (c) Martin Pool
+License: MIT
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+License: Python-license
+ This module is free software, and you may redistribute it and/or modify
+ it under the same terms as Python itself, so long as this copyright message
+ and disclaimer are retained in their original form.
+ .
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+ .
+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff -u -N -r e/python-testtools-0.9.21/debian/rules python-testtools-0.9.29/debian/rules
--- e/python-testtools-0.9.21/debian/rules 2013-02-15 12:23:09.000000000 +0000
+++ python-testtools-0.9.29/debian/rules 2013-02-15 12:46:08.000000000 +0000
@@ -28,6 +28,19 @@
echo 'raise SyntaxError' > \
$(CURDIR)/debian/python3-testtools/usr/lib/python3/dist-packages/testtools/_compat2x.py
+override_dh_installdocs:
+ dh_installdocs
+ # Replaces embedded copy of Jquery and Underscore javascript libs by
+ # symlinks to available Debian packages.
+ rm $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/jquery.js
+ ln -s ../../../../javascript/jquery/jquery.js $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/jquery.js
+ rm $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/underscore.js
+ ln -s ../../../../../lib/nodejs/underscore.js $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/underscore.js
+
+override_dh_clean:
+ dh_clean
+ rm -rf build testtools.egg-info
+
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
$(MAKE) -C $(CURDIR) check
diff -u -N -r e/python-testtools-0.9.21/debian/source/format python-testtools-0.9.29/debian/source/format
--- e/python-testtools-0.9.21/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ python-testtools-0.9.29/debian/source/format 2013-02-15 12:19:44.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
Reply to: