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

[laarmen-guest at users.alioth.debian.org]

    Date: Friday, March 1, 2013 @ 17:28:25
  Author: laarmen-guest
Revision: 23625

* Upload new upstream release to experimental (Closes: #699312)
  + Update the patch paths to build only the English documentation
* Fix the permissions for the py.test-3 executable.

Modified:
  packages/pytest/trunk/debian/changelog
  packages/pytest/trunk/debian/patches/remove_google_js
  packages/pytest/trunk/debian/python-pytest-doc.docs
  packages/pytest/trunk/debian/rules

Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog	2013-03-01 11:35:16 UTC (rev 23624)
+++ packages/pytest/trunk/debian/changelog	2013-03-01 17:28:25 UTC (rev 23625)
@@ -1,3 +1,11 @@
+pytest (2.3.4-1~exp1) UNRELEASED; urgency=low
+
+  * Upload new upstream release to experimental (Closes: #699312)
+    + Update the patch paths to build only the English documentation
+  * Fix the permissions for the py.test-3 executable.
+
+ -- Simon Chopin <chopin.simon at gmail.com>  Fri, 01 Mar 2013 18:02:07 +0100
+
 pytest (2.2.4-2) unstable; urgency=low
 
   * Use rt{install, remove} mechanisms from the Python package to replace the

Modified: packages/pytest/trunk/debian/patches/remove_google_js
===================================================================
--- packages/pytest/trunk/debian/patches/remove_google_js	2013-03-01 11:35:16 UTC (rev 23624)
+++ packages/pytest/trunk/debian/patches/remove_google_js	2013-03-01 17:28:25 UTC (rev 23625)
@@ -5,8 +5,8 @@
 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
+--- a/doc/en/_templates/layout.html
++++ b/doc/en/_templates/layout.html
 @@ -2,23 +2,8 @@
  
  {% block relbaritems %}

Modified: packages/pytest/trunk/debian/python-pytest-doc.docs
===================================================================
--- packages/pytest/trunk/debian/python-pytest-doc.docs	2013-03-01 11:35:16 UTC (rev 23624)
+++ packages/pytest/trunk/debian/python-pytest-doc.docs	2013-03-01 17:28:25 UTC (rev 23625)
@@ -1 +1 @@
-doc/_build/html/
+doc/en/_build/html/

Modified: packages/pytest/trunk/debian/rules
===================================================================
--- packages/pytest/trunk/debian/rules	2013-03-01 11:35:16 UTC (rev 23624)
+++ packages/pytest/trunk/debian/rules	2013-03-01 17:28:25 UTC (rev 23625)
@@ -18,13 +18,13 @@
 	for py in $(PYVERS) $(PY3VERS); do \
 		python$$py setup.py build; \
 	done
-	PYTHONPATH=`pwd` make -C doc/ man
-	cp doc/_build/man/pytest.1 debian/py.test.1
+	PYTHONPATH=`pwd` make -C doc/en man
+	cp doc/en/_build/man/pytest.1 debian/py.test.1
 	cp debian/py.test.1 debian/py.test-3.1
 	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
+	PYTHONPATH=`pwd` make -C doc/en/ html
 
 override_dh_compress:
 	dh_compress -X.html
@@ -42,7 +42,7 @@
 								--root debian/python3-pytest \
 								--install-layout=deb
 	rm debian/python3-pytest/usr/bin/*
-	install -m 644 debian/py.test.template debian/python3-pytest/usr/bin/py.test-3
+	install -m 755 debian/py.test.template debian/python3-pytest/usr/bin/py.test-3
 	sed -i 's/#UPSTREAMVERSION#/$(UPSTREAM)/' debian/python3-pytest/usr/bin/py.test-3
 	sed -i 's,#PYSHEBANG#,#!/usr/bin/python3,' debian/python3-pytest/usr/bin/py.test-3
 	dh_install