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

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-03 10:12:10 +0000 (Thu, 03 Nov 2005)
New Revision: 303

Added:
   trunk/packages/octave/debian/patches/50_inferior-octave-resync-dirs.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.1-00list
Log:
Debian release octave2.1_2.1.71-7









Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-02 08:23:32 UTC (rev 302)
+++ trunk/packages/octave/debian/changelog	2005-11-03 10:12:10 UTC (rev 303)
@@ -1,31 +1,13 @@
-octave2.9 (2.9.3-1) experimental; urgency=low
+octave2.1 (2.1.71-7) unstable; urgency=low
 
-   NOT YET RELEASED
-
-   +++ Changes by Colin Ingram
-
-  * New Upstream Release
-  * debian/rules: adjusted to build from octave2.9 source directory
-  * debian/patches/50_no-check-nested-functions.dpatch removed
-  * debian/patches/50_mkoctfile.1-no-negative.dpatch added
-
    +++ Changes by Rafael Laboissiere
 
-  * The patches applied by dpatch are now done selectively according to
-    the version of Octave.  For that, the debian/patches/00list file is
-    now generated when running "./debian/rules maintainer-scripts" from
-    the files debian/in/$(PACKAGE)-00list.
-  * debian/rules (maintainer-scripts): Generate file
-    debian/patches/00list
-  * debian/in/octave2.1-00list, debian/in/octave2.9-00list: New files.
-  * debian/patches/50_no-check-nested-functions-2.1.dpatch: New patch,
-    which is actually the same used in the last version of the package
-    octave2.1.
-  * debian/patches/50_no-check-nested-functions-2.9.dpatch: New patch,
-    only for octave2.9, which is equivalent to the one used for
-    octave2.1.
+  * debian/patches/50_no-check-nested-functions-2.1.dpatch: Added patch
+    applied to the upstream CVS sources to avoid detrimental effects of
+    cd() commands in ~/.octavrc when running octave-inferior-mode in
+    (X)Emacs (closes: #324471).
 
- -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Sun, 30 Oct 2005 19:54:29 +0100
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Thu,  3 Nov 2005 10:19:22 +0100
 
 octave2.1 (2.1.71-6) unstable; urgency=low
 

Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list	2005-11-02 08:23:32 UTC (rev 302)
+++ trunk/packages/octave/debian/in/octave2.1-00list	2005-11-03 10:12:10 UTC (rev 303)
@@ -1 +1,2 @@
 50_no-check-nested-functions-2.1
+50_inferior-octave-resync-dirs

Added: trunk/packages/octave/debian/patches/50_inferior-octave-resync-dirs.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_inferior-octave-resync-dirs.dpatch	2005-11-02 08:23:32 UTC (rev 302)
+++ trunk/packages/octave/debian/patches/50_inferior-octave-resync-dirs.dpatch	2005-11-03 10:12:10 UTC (rev 303)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_inferior-octave-resync-dirs.dpatch
+##                             by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid detrimental effects on inferior-octave-mode if there is a
+## DP: cd() command in ~/.octaverc
+
+ at DPATCH@
+
+--- octave2.1-2.1.71.orig/emacs/octave-inf.el
++++ octave2.1-2.1.71/emacs/octave-inf.el
+@@ -234,7 +234,10 @@
+
+     ;; And finally, everything is back to normal.
+     (set-process-filter proc 'inferior-octave-output-filter)
+-    (run-hooks 'inferior-octave-startup-hook)))
++    (run-hooks 'inferior-octave-startup-hook)
++    ;; just in case, to be sure a cd in the startup file
++    ;; won't have detrimental effects
++    (inferior-octave-resync-dirs)))
+
+ 
+ (defun inferior-octave-complete ()


Property changes on: trunk/packages/octave/debian/patches/50_inferior-octave-resync-dirs.dpatch
___________________________________________________________________
Name: svn:executable
   + *