[Python-modules-commits] r21176 - in packages/pytest/trunk/debian (4 files)

Wed Apr 11 01:19:49 UTC 2012

Date: Wednesday, April 11, 2012 @ 01:19:47
  Author: laarmen-guest
Revision: 21176

Appease tumbleweed pedantism :-)

Added:
  packages/pytest/trunk/debian/python-pytest-doc.links
Modified:
  packages/pytest/trunk/debian/copyright
  packages/pytest/trunk/debian/python-pytest-doc.doc-base
  packages/pytest/trunk/debian/rules

Modified: packages/pytest/trunk/debian/copyright
===================================================================

--- packages/pytest/trunk/debian/copyright	2012-04-11 00:45:02 UTC (rev 21175)
+++ packages/pytest/trunk/debian/copyright	2012-04-11 01:19:47 UTC (rev 21176)
@@ -2,6 +2,34 @@
 Upstream-Name: pytest
 Source: http://pytest.org/
 
+Files: *
+Copyright: 2007-2012 Holger Kregel <holger at merlinux.eu>
+           2007-2012 Merlinux GmbH <offive at merlinux.eu>
+License: Expat
+
+Files: debian/*
+Copyright: 2012 Simon Chopin <chopin.simon at gmail.com>
+License: Expat
+
+License: Expat
+ 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.
+
 Files: doc/_static/sphinxdoc.css
 Copyright: 2007-2010 the Sphinx Team
 License: BSD-2-clause
@@ -28,15 +56,6 @@
  (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: 2007-2012 Holger Kregel <holger at merlinux.eu>
-           2007-2012 Merlinux GmbH <offive at merlinux.eu>
-License: Expat
-
-Files: debian/*
-Copyright: 2012 Simon Chopin <chopin.simon at gmail.com>
-License: Expat
-
 Files: distribute_setup.py
 Copyright: 2006-2011 The Fellowship of the Packaging
 License: Python
@@ -89,21 +108,3 @@
  agrees to be bound by the terms and conditions of this License
  Agreement.
 
-License: Expat
- 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.

Modified: packages/pytest/trunk/debian/python-pytest-doc.doc-base
===================================================================
--- packages/pytest/trunk/debian/python-pytest-doc.doc-base	2012-04-11 00:45:02 UTC (rev 21175)
+++ packages/pytest/trunk/debian/python-pytest-doc.doc-base	2012-04-11 01:19:47 UTC (rev 21176)
@@ -7,3 +7,6 @@
 Format: HTML
 Index: /usr/share/doc/python-pytest-doc/html/index.html
 Files: /usr/share/doc/python-pytest-doc/html/*
+
+Format: Text
+Files: /usr/share/doc/python-pytest-doc/rst/*

Added: packages/pytest/trunk/debian/python-pytest-doc.links
===================================================================
--- packages/pytest/trunk/debian/python-pytest-doc.links	                        (rev 0)
+++ packages/pytest/trunk/debian/python-pytest-doc.links	2012-04-11 01:19:47 UTC (rev 21176)
@@ -0,0 +1 @@
+usr/share/doc/python-pytest-doc/html/_sources usr/share/doc/python-pytest-doc/rst

Modified: packages/pytest/trunk/debian/rules
===================================================================
--- packages/pytest/trunk/debian/rules	2012-04-11 00:45:02 UTC (rev 21175)
+++ packages/pytest/trunk/debian/rules	2012-04-11 01:19:47 UTC (rev 21176)
@@ -32,7 +32,7 @@
 override_dh_install:
 	# Only install for the default versions.
 	python$(PYDEFAULT) setup.py install --skip-build --no-compile \
-									    --root debian/python-pytest \
+										--root debian/python-pytest \
 										--install-layout=deb
 	rm debian/python-pytest/usr/bin/py.test-$(PYDEFAULT)
 	install -m 755 debian/py.test.sh debian/python-pytest/usr/bin/py.test-$(PYDEFAULT)
@@ -48,12 +48,12 @@
 	for py in $(PY3VERS) ; do \
 		if [ "$$py" != "$(PY3DEFAULT)" ] ; then \
 			python$$py setup.py install --skip-build --no-compile \
-									    --root debian/python3-pytest \
+										--root debian/python3-pytest \
 										--install-layout=deb \
 										--install-scripts=debian/tmp; \
 		else \
 			python$$py setup.py install --skip-build --no-compile \
-									    --root debian/python3-pytest \
+										--root debian/python3-pytest \
 										--install-layout=deb; \
 		fi; \
 	done


