[Python-modules-commits] r22346 - in packages/python-docutils/trunk/debian (9 files)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Thu Jun 28 14:49:39 UTC 2012 

    Date: Thursday, June 28, 2012 @ 14:49:35
  Author: jwilk
Revision: 22346

New upstream release.

Added:
  packages/python-docutils/trunk/debian/patches/test-sys-path.diff
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff
  packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff
  packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff
  packages/python-docutils/trunk/debian/patches/series
  packages/python-docutils/trunk/debian/patches/testall-no-stdout-stderr-redirect.diff
  packages/python-docutils/trunk/debian/rules
Deleted:
  packages/python-docutils/trunk/debian/patches/parsers.rst.directives.misc-encoding.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/changelog	2012-06-28 14:49:35 UTC (rev 22346)
@@ -1,8 +1,13 @@
-python-docutils (0.9-2) UNRELEASED; urgency=low
+python-docutils (0.9.1-2) UNRELEASED; urgency=low
 
+  * New upstream release.
+    + Drop parsers.rst.directives.misc-encoding.diff: applied upstream.
+    + Refresh other patches.
+    + Add patch to fix sys.path for tests (test-sys-path.diff).
+    + Update debian/rules.
   * DEP-8 tests: use $ADTTMP.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 27 Jun 2012 11:00:20 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 28 Jun 2012 16:48:52 +0200
 
 python-docutils (0.9-1) experimental; urgency=low
 

Modified: packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff	2012-06-28 14:49:35 UTC (rev 22346)
@@ -28,9 +28,9 @@
 +Quick-Start on other systems
 +============================
  
- This is for those who want to get up & running quickly.  Read on for
- complete details.
-@@ -287,6 +298,12 @@
+ This is for those who want to get up & running quickly.
+ 
+@@ -283,6 +294,12 @@
  the front-end tools for details on options and arguments.  See
  Docutils Front-End Tools (``docs/user/tools.txt``) for full documentation.
  

Modified: packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff	2012-06-28 14:49:35 UTC (rev 22346)
@@ -7,10 +7,10 @@
 
 --- a/tools/editors/emacs/rst.el
 +++ b/tools/editors/emacs/rst.el
-@@ -3963,7 +3963,7 @@
+@@ -4070,7 +4070,7 @@
      ))
  
- ;; FIXME: Should be `defcustom` or use something like `browse-url`
+ ;; FIXME: Should be `defcustom` or use something like `browse-url`.
 -(defvar rst-slides-program "firefox"
 +(defvar rst-slides-program "sensible-browser"
    "Program used to preview S5 slides.")

Modified: packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff	2012-06-28 14:49:35 UTC (rev 22346)
@@ -61,7 +61,7 @@
                                    r'\usepackage{mathptmx} % Times',
 --- a/docutils/writers/odf_odt/__init__.py
 +++ b/docutils/writers/odf_odt/__init__.py
-@@ -394,13 +394,13 @@
+@@ -397,13 +397,13 @@
  
      default_stylesheet_path = utils.relative_path(
          os.path.join(os.getcwd(), 'dummy'),

Deleted: packages/python-docutils/trunk/debian/patches/parsers.rst.directives.misc-encoding.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/parsers.rst.directives.misc-encoding.diff	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/patches/parsers.rst.directives.misc-encoding.diff	2012-06-28 14:49:35 UTC (rev 22346)
@@ -1,52 +0,0 @@
-Description: fix encoding issues with the include directive
-Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils?view=revision&revision=7433
-Last-Update: 2012-05-11
-
---- a/docutils/parsers/rst/directives/misc.py
-+++ b/docutils/parsers/rst/directives/misc.py
-@@ -73,6 +73,11 @@
-                 error_handler=(self.state.document.settings.\
-                                input_encoding_error_handler),
-                 handle_io_errors=None)
-+        except UnicodeEncodeError, error:
-+            raise self.severe(u'Problems with "%s" directive path:\n'
-+                              'Cannot encode input file path "%s" '
-+                              '(wrong locale?).' %
-+                              (self.name, SafeString(path)))
-         except IOError, error:
-             raise self.severe(u'Problems with "%s" directive path:\n%s.' %
-                       (self.name, ErrorString(error)))
---- a/test/test_parsers/test_rst/test_directives/test_include.py
-+++ b/test/test_parsers/test_rst/test_directives/test_include.py
-@@ -50,6 +50,18 @@
- nonexistent_rel = DocutilsTestSupport.utils.relative_path(
-     os.path.join(DocutilsTestSupport.testroot, 'dummy'), nonexistent)
- 
-+# Different error for path with 8bit chars with locale == C or None:
-+try:
-+    open(u'\u043c\u0438\u0440.txt')
-+except UnicodeEncodeError:
-+    errstr_8bit_path = u"""\
-+Cannot encode input file path "\u043c\u0438\u0440.txt" (wrong locale?).\
-+"""
-+except:
-+    errstr_8bit_path = u"""\
-+InputError: [Errno 2] No such file or directory: '\u043c\u0438\u0440.txt'.\
-+"""
-+
- totest = {}
- 
- totest['include'] = [
-@@ -414,10 +426,10 @@
-     <system_message level="4" line="3" source="test data" type="SEVERE">
-         <paragraph>
-             Problems with "include" directive path:
--            InputError: [Errno 2] No such file or directory: '\u043c\u0438\u0440.txt'.
-+            %s
-         <literal_block xml:space="preserve">
-             .. include:: \u043c\u0438\u0440.txt
--"""],
-+""" % errstr_8bit_path],
- ["""\
- Testing errors in included file:
- 

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/patches/series	2012-06-28 14:49:35 UTC (rev 22346)
@@ -3,7 +3,7 @@
 emacs-sensible-browser.diff
 testall-no-stdout-stderr-redirect.diff
 no-test-skipping.diff
-parsers.rst.directives.misc-encoding.diff
 parallel-2to3.diff
+test-sys-path.diff
 move-data-to-usr-share.diff
 # dep8.diff

Added: packages/python-docutils/trunk/debian/patches/test-sys-path.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/test-sys-path.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/test-sys-path.diff	2012-06-28 14:49:35 UTC (rev 22346)
@@ -0,0 +1,22 @@
+Description: fix sys.path for tests
+ Fix sys.path in the test support module so that is matches paths that are in
+ the Debian package.
+Author: Jakub Wilk <jwilk at debian.org>
+
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -52,12 +52,9 @@
+ os.chdir(testroot)
+ if sys.version_info >= (3,0):
+     sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
++                                                     '..', 'build', 'py3')))
+ else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', 'build', 'py2')))
+ sys.path.insert(0, testroot)
+ 
+ try:

Modified: packages/python-docutils/trunk/debian/patches/testall-no-stdout-stderr-redirect.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/testall-no-stdout-stderr-redirect.diff	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/patches/testall-no-stdout-stderr-redirect.diff	2012-06-28 14:49:35 UTC (rev 22346)
@@ -7,7 +7,7 @@
 
 --- a/test/alltests.py
 +++ b/test/alltests.py
-@@ -64,9 +64,6 @@
+@@ -69,9 +69,6 @@
      sys.stdout.flush()
      return suite
  

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2012-06-28 09:32:39 UTC (rev 22345)
+++ packages/python-docutils/trunk/debian/rules	2012-06-28 14:49:35 UTC (rev 22346)
@@ -20,7 +20,7 @@
 pre_strip_images2 = 's,<img alt="([^"]*)"[^>]*\bsrc="http://[^"]+"[^>]*>,$$1,g;'
 pre_strip_images = $(pre_strip_images1)$(pre_strip_images2)
 
-python_all = pyversions -r $(CURDIR)/debian/control | tr ' ' '\n' | xargs -t -I {} env {}
+python_all = pyversions -r | tr ' ' '\n' | xargs -t -I {} env {}
 python3_all = $(patsubst py%,py3%,$(python_all))
 
 build build-indep: build-stamp
@@ -38,13 +38,13 @@
 	python setup.py build --build-lib=build/py2/
 ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
 	# Run test suite for Python 2.X:
-	cd build/py2/ && $(python_all) ../../test/alltests.py --verbose
+	$(python_all) test/alltests.py --verbose
 endif
 	# Build modules for Python 3.X
 	python3 setup.py build --build-lib=build/py3/
 ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
 	# Run test suite for Python 3.X:
-	cd build/py3/ && $(python3_all) test/alltests.py --verbose
+	$(python3_all) test3/alltests.py --verbose
 endif
 	# Build documentation:
 	PYTHONPATH=. python tools/buildhtml.py \
@@ -66,6 +66,7 @@
 	find docs -name '*.html' -not -name 'quickref.html' -delete
 	rm -rf docutils.egg-info
 	cd test && rm -rf alltests.out record.txt functional/output/*/ functional/output/[a-z]*.*
+	rm -rf test3/
 	dh_clean
 
 install: build
@@ -95,9 +96,9 @@
 		done; \
 	done
 	install tools/buildhtml.py debian/tmp/usr/share/docutils/scripts/python2/rst-buildhtml
+	install tools/buildhtml.py debian/tmp/usr/share/docutils/scripts/python3/rst-buildhtml
 	sed -i -e '1 s,^#!.*,#!/usr/bin/python,' debian/tmp/usr/share/docutils/scripts/python2/rst-buildhtml
-	sed -i -e '1 s,^#!.*,#!/usr/bin/python3,' build/py3/tools/buildhtml.py
-	install build/py3/tools/buildhtml.py debian/tmp/usr/share/docutils/scripts/python3/rst-buildhtml
+	sed -i -e '1 s,^#!.*,#!/usr/bin/python3,' debian/tmp/usr/share/docutils/scripts/python2/rst-buildhtml
 	: # Make the man pages (we want to do this *after* renaming all the
 	: # tools, because their executable name goes into the --help output)
 	mkdir -p debian/tmp/man/

More information about the Python-modules-commits mailing list