[Python-modules-commits] r10690 - in packages/python-docutils/trunk/debian/patches (1 file)

[smcv at users.alioth.debian.org]

    Date: Monday, December 7, 2009 @ 00:05:03
  Author: smcv
Revision: 10690

Update 15_emacs_debian_paths.diff for docutils 0.6

Modified:
  packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff

Modified: packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff	2009-12-07 00:04:19 UTC (rev 10689)
+++ packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff	2009-12-07 00:05:03 UTC (rev 10690)
@@ -1,27 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_emacs_debian_paths.dpatch by Simon McVittie <smcv at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use debianish paths (no .py) in rst.el
-
- at DPATCH@
-
-From 51a633f1d7954f43703f789dcedb9f33e2bd8198 Mon Sep 17 00:00:00 2001
 From: Simon McVittie <smcv at debian.org>
-Date: Thu, 17 Jul 2008 11:24:51 +0100
-Subject: [PATCH] [debian-specific] Use debianish paths (no .py) in rst.el
+Date: Sun, 6 Dec 2009 23:44:30 +0000
+Subject: [PATCH] rst.el: use Debian-style tool names, without the .py extension
 
-Updated to the new rst.el, but with rst2pdf.py -> rst2pdf omitted since
-that isn't part of this package.
+Bug-Debian: http://bugs.debian.org/438667
 ---
  tools/editors/emacs/rst.el |   16 ++++++++--------
  1 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
-index 34be79a..e3729c4 100644
+index 40213d6..a47943a 100644
 --- a/tools/editors/emacs/rst.el
 +++ b/tools/editors/emacs/rst.el
-@@ -3208,11 +3208,11 @@ document with \\[rst-compile]."
+@@ -3201,13 +3201,13 @@ document with \\[rst-compile]."
    :version "21.1")
  
  (defvar rst-compile-toolsets
@@ -29,16 +19,20 @@
 -    (latex . ("rst2latex.py" ".tex" nil))
 -    (newlatex . ("rst2newlatex.py" ".tex" nil))
 -    (pseudoxml . ("rst2pseudoxml.py" ".xml" nil))
--    (xml . ("rst2xml.py" ".xml" nil)))
+-    (xml . ("rst2xml.py" ".xml" nil))
+-    (pdf . ("rst2pdf.py" ".pdf" nil))
+-    (s5 . ("rst2s5.py" ".xml" nil)))
 +  '((html . ("rst2html" ".html" nil))
 +    (latex . ("rst2latex" ".tex" nil))
 +    (newlatex . ("rst2newlatex" ".tex" nil))
 +    (pseudoxml . ("rst2pseudoxml" ".xml" nil))
-+    (xml . ("rst2xml" ".xml" nil)))
++    (xml . ("rst2xml" ".xml" nil))
++    (pdf . ("rst2pdf" ".pdf" nil))
++    (s5 . ("rst2s5" ".xml" nil)))
    "An association list of the toolset to a list of the (command to use,
  extension of produced filename, options to the tool (nil or a
  string)) to be used for converting the document.")
-@@ -3220,7 +3220,7 @@ string)) to be used for converting the document.")
+@@ -3215,7 +3215,7 @@ string)) to be used for converting the document.")
  ;; Note for Python programmers not familiar with association lists: you can set
  ;; values in an alists like this, e.g. :
  ;; (setcdr (assq 'html rst-compile-toolsets)
@@ -47,24 +41,4 @@
  
  
  (defvar rst-compile-primary-toolset 'html
-@@ -3303,7 +3303,7 @@ of the entire buffer, if the region is not selected."
-     (shell-command-on-region
-      (if mark-active (region-beginning) (point-min))
-      (if mark-active (region-end) (point-max))
--     "rst2pseudoxml.py"
-+     "rst2pseudoxml"
-      standard-output)))
- 
- (defvar rst-pdf-program "xpdf"
-@@ -3328,7 +3328,7 @@ of the entire buffer, if the region is not selected."
-   "Convert the document to an S5 slide presentation and launch a preview program."
-   (interactive)
-   (let* ((tmp-filename "/tmp/slides.html")
--	 (command (format "rst2s5.py %s %s && %s %s"
-+	 (command (format "rst2s5 %s %s && %s %s"
- 			  buffer-file-name tmp-filename
- 			  rst-slides-program tmp-filename)))
-     (start-process-shell-command "rst-slides-preview" nil command)
 -- 
-1.5.6.2
-