[Python-modules-commits] r20737 - in packages/sphinx/trunk/debian (3 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Sun Mar 11 12:04:04 UTC 2012
Date: Sunday, March 11, 2012 @ 12:04:03
Author: jwilk
Revision: 20737
New upstream release.
Modified:
packages/sphinx/trunk/debian/changelog
packages/sphinx/trunk/debian/patches/series
Deleted:
packages/sphinx/trunk/debian/patches/python3_test_syspath.diff
Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog 2012-03-11 11:36:20 UTC (rev 20736)
+++ packages/sphinx/trunk/debian/changelog 2012-03-11 12:04:03 UTC (rev 20737)
@@ -1,8 +1,10 @@
-sphinx (1.1.2+dfsg-6) UNRELEASED; urgency=low
+sphinx (1.1.3+dfsg-1) UNRELEASED; urgency=low
+ * New upstream release.
+ + Drop python3_test_syspath.diff, applied upstream.
* Bump standards version to 3.9.3 (no changes needed).
- -- Jakub Wilk <jwilk at debian.org> Sat, 03 Mar 2012 00:12:43 +0100
+ -- Jakub Wilk <jwilk at debian.org> Sun, 11 Mar 2012 12:59:13 +0100
sphinx (1.1.2+dfsg-5) unstable; urgency=low
Deleted: packages/sphinx/trunk/debian/patches/python3_test_syspath.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/python3_test_syspath.diff 2012-03-11 11:36:20 UTC (rev 20736)
+++ packages/sphinx/trunk/debian/patches/python3_test_syspath.diff 2012-03-11 12:04:03 UTC (rev 20737)
@@ -1,23 +0,0 @@
-Description: Fix Python 3 sys.path for the test runner.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/874/tests-runpy-doesnt-always-set-syspath
-Forwarded: yes
-Last-Update: 2012-02-12
-
---- a/tests/run.py
-+++ b/tests/run.py
-@@ -22,9 +22,11 @@
- copydir_run_2to3(testroot, newroot)
- # switch to the converted dir so nose tests the right tests
- chdir(newroot)
--
--# always test the sphinx package from this directory
--sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
-+ # always test the sphinx package from build/lib/
-+ sys.path.insert(0, path.pardir)
-+else:
-+ # always test the sphinx package from this directory
-+ sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
-
- try:
- import nose
Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series 2012-03-11 11:36:20 UTC (rev 20736)
+++ packages/sphinx/trunk/debian/patches/series 2012-03-11 12:04:03 UTC (rev 20737)
@@ -3,5 +3,4 @@
show_more_stack_frames.diff
initialize_autodoc.diff
sphinxcontrib_namespace.diff
-python3_test_syspath.diff
python3_test_build_dir.diff
More information about the Python-modules-commits
mailing list