[Python-modules-commits] r10803 - in packages/python-docutils (4 files)

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

    Date: Wednesday, December 16, 2009 @ 13:14:48
  Author: jwilk-guest
Revision: 10803

Minor fix for the emacs-temporary-files patch.

Modified:
  packages/python-docutils/branches/0.5-2/debian/changelog
  packages/python-docutils/branches/0.5-2/debian/patches/18_emacs_temporary_files.dpatch
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff

Modified: packages/python-docutils/branches/0.5-2/debian/changelog
===================================================================
--- packages/python-docutils/branches/0.5-2/debian/changelog	2009-12-15 23:14:07 UTC (rev 10802)
+++ packages/python-docutils/branches/0.5-2/debian/changelog	2009-12-16 13:14:48 UTC (rev 10803)
@@ -4,7 +4,7 @@
     reStructuredText (closes: #560755). Thanks to Kumar Appaiah for helping to
     deal with this bug.
 
- -- Jakub Wilk <ubanus at users.sf.net>  Sun, 13 Dec 2009 23:19:10 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Wed, 16 Dec 2009 14:14:14 +0100
 
 python-docutils (0.5-2) unstable; urgency=low
 

Modified: packages/python-docutils/branches/0.5-2/debian/patches/18_emacs_temporary_files.dpatch
===================================================================
--- packages/python-docutils/branches/0.5-2/debian/patches/18_emacs_temporary_files.dpatch	2009-12-15 23:14:07 UTC (rev 10802)
+++ packages/python-docutils/branches/0.5-2/debian/patches/18_emacs_temporary_files.dpatch	2009-12-16 13:14:48 UTC (rev 10803)
@@ -16,7 +16,7 @@
 diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
 --- a/tools/editors/emacs/rst.el
 +++ b/tools/editors/emacs/rst.el
-@@ -3273,13 +3273,81 @@
+@@ -3273,13 +3273,80 @@
       "rst2pseudoxml"
       standard-output)))
  
@@ -81,7 +81,6 @@
 +)
 +
 +(defun rst-remove-temp-dir ()
-+  (require 'dired)
 +  (if rst-temp-dir (rst-delete-file rst-temp-dir))
 +)
 +
@@ -99,7 +98,7 @@
  	 (command (format "rst2pdf.py %s %s && %s %s"
  			  buffer-file-name tmp-filename
  			  rst-pdf-program tmp-filename)))
-@@ -3294,7 +3362,7 @@
+@@ -3294,7 +3361,7 @@
  (defun rst-compile-slides-preview ()
    "Convert the document to an S5 slide presentation and launch a preview program."
    (interactive)

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2009-12-15 23:14:07 UTC (rev 10802)
+++ packages/python-docutils/trunk/debian/changelog	2009-12-16 13:14:48 UTC (rev 10803)
@@ -3,7 +3,7 @@
   * Update patch fixing insecure use of temporary files to be compatible with
     XEmacs 21.
 
- -- Jakub Wilk <ubanus at users.sf.net>  Tue, 15 Dec 2009 13:11:14 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Wed, 16 Dec 2009 14:13:56 +0100
 
 python-docutils (0.6-2) unstable; urgency=high
 

Modified: packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff	2009-12-15 23:14:07 UTC (rev 10802)
+++ packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff	2009-12-16 13:14:48 UTC (rev 10803)
@@ -9,7 +9,7 @@
 ===================================================================
 --- python-docutils-0.6.orig/tools/editors/emacs/rst.el	2009-05-21 11:02:22.000000000 +0200
 +++ python-docutils-0.6/tools/editors/emacs/rst.el	2009-12-15 13:10:49.000000000 +0100
-@@ -3301,13 +3301,81 @@
+@@ -3301,13 +3301,80 @@
       (cadr (assq 'pseudoxml rst-compile-toolsets))
       standard-output)))
  
@@ -74,7 +74,6 @@
 +)
 +
 +(defun rst-remove-temp-dir ()
-+  (require 'dired)
 +  (if rst-temp-dir (rst-delete-file rst-temp-dir))
 +)
 +
@@ -92,7 +91,7 @@
  	 (command (format "%s %s %s && %s %s"
  			  (cadr (assq 'pdf rst-compile-toolsets))
  			  buffer-file-name tmp-filename
-@@ -3323,7 +3391,7 @@
+@@ -3323,7 +3390,7 @@
  (defun rst-compile-slides-preview ()
    "Convert the document to an S5 slide presentation and launch a preview program."
    (interactive)