[Python-modules-commits] r21128 - in packages/pytest/trunk/debian (10 files)
laarmen-guest at users.alioth.debian.org
laarmen-guest at users.alioth.debian.org
Sun Apr 8 22:48:08 UTC 2012
Date: Sunday, April 8, 2012 @ 22:48:06
Author: laarmen-guest
Revision: 21128
Build the doc in pytest-doc package.
Added:
packages/pytest/trunk/debian/patches/
packages/pytest/trunk/debian/patches/remove_google_js
packages/pytest/trunk/debian/patches/series
packages/pytest/trunk/debian/pytest-doc.docs
packages/pytest/trunk/debian/python-pytest.docs
packages/pytest/trunk/debian/python3-pytest.docs
Modified:
packages/pytest/trunk/debian/changelog
packages/pytest/trunk/debian/control
packages/pytest/trunk/debian/rules
Deleted:
packages/pytest/trunk/debian/docs
Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog 2012-04-08 21:40:23 UTC (rev 21127)
+++ packages/pytest/trunk/debian/changelog 2012-04-08 22:48:06 UTC (rev 21128)
@@ -1,6 +1,6 @@
-pytest (2.2.3-1) unstable; urgency=low
+pytest (2.2.3-1) UNRELEASED; urgency=low
* Initial release (Closes: #664071)
* Disable the test suite for the bootstrap.
- -- Simon Chopin <chopin.simon at gmail.com> Wed, 21 Mar 2012 19:37:07 +0100
+ -- Simon Chopin <chopin.simon at gmail.com> Mon, 09 Apr 2012 00:41:54 +0200
Modified: packages/pytest/trunk/debian/control
===================================================================
--- packages/pytest/trunk/debian/control 2012-04-08 21:40:23 UTC (rev 21127)
+++ packages/pytest/trunk/debian/control 2012-04-08 22:48:06 UTC (rev 21128)
@@ -3,14 +3,13 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Simon Chopin <chopin.simon at gmail.com>
-Build-Depends:
- debhelper (>= 8),
- python-all (>= 2.6.6-3~),
- python-py,
- python-setuptools,
- python-sphinx,
- python3-all (>= 3.1.2-6~),
- python3-setuptools
+Build-Depends: debhelper (>= 8),
+ python-all (>= 2.6.6-3~),
+ python-py,
+ python-setuptools,
+ python-sphinx,
+ python3-all (>= 3.1.2-6~),
+ python3-setuptools
X-Python-Version: >= 2.4
X-Python3-Version: >= 3.0
Standards-Version: 3.9.3
@@ -20,11 +19,10 @@
Package: python-pytest
Architecture: all
-Depends:
- python-pkg-resources,
- python-py (>= 1.4),
- ${misc:Depends},
- ${python:Depends}
+Depends: python-pkg-resources,
+ python-py (>= 1.4),
+ ${misc:Depends},
+ ${python:Depends}
Breaks: python-py (<< 1.4)
Replaces: python-py (<< 1.4)
Description: Simple, powerful testing in Python
@@ -34,14 +32,24 @@
Package: python3-pytest
Architecture: all
-Depends:
- python3-pkg-resources,
- python3-py (>= 1.4),
- ${misc:Depends},
- ${python3:Depends}
+Depends: python3-pkg-resources,
+ python3-py (>= 1.4),
+ ${misc:Depends},
+ ${python3:Depends}
Description: Simple, powerful testing in Python3
This testing tool has for objective to allow the developers to limit the
boilerplate code around the tests, promoting the use of built-in
mechanisms such as the `assert` keyword.
.
This package provides the Python 3 module and the py3.test script.
+
+Package: pytest-doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Recommends: python-pytest | python3-pytest
+Description: Simple, powerful testing in Python - Documentation
+ This testing tool has for objective to allow the developers to limit the
+ boilerplate code around the tests, promoting the use of built-in
+ mechanisms such as the `assert` keyword.
+ .
+ This package contains the documentation for pytest.
Deleted: packages/pytest/trunk/debian/docs
===================================================================
--- packages/pytest/trunk/debian/docs 2012-04-08 21:40:23 UTC (rev 21127)
+++ packages/pytest/trunk/debian/docs 2012-04-08 22:48:06 UTC (rev 21128)
@@ -1 +0,0 @@
-README.txt
Added: packages/pytest/trunk/debian/patches/remove_google_js
===================================================================
--- packages/pytest/trunk/debian/patches/remove_google_js (rev 0)
+++ packages/pytest/trunk/debian/patches/remove_google_js 2012-04-08 22:48:06 UTC (rev 21128)
@@ -0,0 +1,33 @@
+Description: Remove Google Analytics and Google+ javascript.
+It is not relevant for an offline and private installation.
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: not-needed
+Last-Update: 2012-04-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -2,23 +2,8 @@
+
+ {% block relbaritems %}
+ {{ super() }}
+-<g:plusone></g:plusone>
+ {% endblock %}
+
+ {% block footer %}
+ {{ super() }}
+-<script type="text/javascript">
+-
+- var _gaq = _gaq || [];
+- _gaq.push(['_setAccount', 'UA-7597274-13']);
+- _gaq.push(['_trackPageview']);
+-
+- (function() {
+- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+- })();
+-
+-</script>
+-<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+ {% endblock %}
Added: packages/pytest/trunk/debian/patches/series
===================================================================
--- packages/pytest/trunk/debian/patches/series (rev 0)
+++ packages/pytest/trunk/debian/patches/series 2012-04-08 22:48:06 UTC (rev 21128)
@@ -0,0 +1 @@
+remove_google_js
Added: packages/pytest/trunk/debian/pytest-doc.docs
===================================================================
--- packages/pytest/trunk/debian/pytest-doc.docs (rev 0)
+++ packages/pytest/trunk/debian/pytest-doc.docs 2012-04-08 22:48:06 UTC (rev 21128)
@@ -0,0 +1 @@
+doc/_build/html/
Added: packages/pytest/trunk/debian/python-pytest.docs
===================================================================
--- packages/pytest/trunk/debian/python-pytest.docs (rev 0)
+++ packages/pytest/trunk/debian/python-pytest.docs 2012-04-08 22:48:06 UTC (rev 21128)
@@ -0,0 +1 @@
+README.txt
Added: packages/pytest/trunk/debian/python3-pytest.docs
===================================================================
--- packages/pytest/trunk/debian/python3-pytest.docs (rev 0)
+++ packages/pytest/trunk/debian/python3-pytest.docs 2012-04-08 22:48:06 UTC (rev 21128)
@@ -0,0 +1 @@
+README.txt
Modified: packages/pytest/trunk/debian/rules
===================================================================
--- packages/pytest/trunk/debian/rules 2012-04-08 21:40:23 UTC (rev 21127)
+++ packages/pytest/trunk/debian/rules 2012-04-08 22:48:06 UTC (rev 21128)
@@ -13,7 +13,7 @@
UPSTREAM = $(shell dpkg-parsechangelog | grep Version | sed 's/Version: \(.*\)-.*/\1/' )
%:
- dh $@ --with python2,python3
+ dh $@ --with python2,python3,sphinxdoc
override_dh_auto_build:
# Build for all versions.
@@ -27,6 +27,7 @@
sed -i 's/PYTEST/PY.TEST/g' debian/py.test.1
sed -i 's/PYTEST/PY.TEST-3/g' debian/py.test-3.1
sed -i 's/py\.test/py.test-3/g' debian/py.test-3.1
+ PYTHONPATH=`pwd` make -C doc/ html
override_dh_install:
# Only install for the default versions.
More information about the Python-modules-commits
mailing list