[Pkg-octave-commit] rev 735 - in trunk/packages/octave/debian: . in patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-09-03 15:22:00 +0000 (Sun, 03 Sep 2006)
New Revision: 735

Added:
   trunk/packages/octave/debian/patches/50_options-order-doc.m.dpatch
Removed:
   trunk/packages/octave/debian/patches/50_info-emacs-info-invocation.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
* debian/patches/50_options-order-doc.m.dpatch: Fix the order of
  the options in the invocation of the info program, such that the
  info-emacs-info and info-emacs-octave-help scripts work again




Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-09-03 14:56:00 UTC (rev 734)
+++ trunk/packages/octave/debian/changelog	2006-09-03 15:22:00 UTC (rev 735)
@@ -3,8 +3,10 @@
   NOT YET RELEASED!
 
   [ Rafael Laboissiere ]
-  * debian/patches/50_info-emacs-info-invocation.dpatch: Fixes parsing of
-    options by the info-emacs-info script (closes: #368843)
+  * debian/patches/50_options-order-doc.m.dpatch: Fix the order of
+    the options in the invocation of the info program, such that the
+    info-emacs-info and info-emacs-octave-help scripts work again
+    (closes: #368843)
 
  --
 

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2006-09-03 14:56:00 UTC (rev 734)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2006-09-03 15:22:00 UTC (rev 735)
@@ -1,3 +1,3 @@
 50_octave-bug-tempfile
 50_clean-mat-files
-50_info-emacs-info-invocation
+50_options-order-doc.m

Deleted: trunk/packages/octave/debian/patches/50_info-emacs-info-invocation.dpatch

Copied: trunk/packages/octave/debian/patches/50_options-order-doc.m.dpatch (from rev 734, trunk/packages/octave/debian/patches/50_info-emacs-info-invocation.dpatch)
===================================================================
--- trunk/packages/octave/debian/patches/50_options-order-doc.m.dpatch	                        (rev 0)
+++ trunk/packages/octave/debian/patches/50_options-order-doc.m.dpatch	2006-09-03 15:22:00 UTC (rev 735)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_options-order-doc.m.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fix the order of the options in the invocation of the info program,
+## DP: such that the info-emacs-info and info-emacs-octave-help scripts
+## DP: work again
+
+ at DPATCH@
+
+--- octave-2.9.8.orig/scripts/miscellaneous/doc.m	2006-09-03 17:04:16.216249600 +0200
++++ octave-2.9.8/scripts/miscellaneous/doc.m	2006-09-03 17:05:35.275230808 +0200
+@@ -73,7 +73,7 @@
+       info_file_name = info_file ();
+     endif
+ 
+-    cmd = sprintf ("\"%s\" --directory \"%s\" --file \"%s\"",
++    cmd = sprintf ("\"%s\" --file \"%s\" --directory \"%s\"",
+ 		   info_program (), info_dir, info_file_name);
+ 
+     if (! isempty (fname))