[Pkg-octave-commit] r2392 - in octave/trunk/debian: in patches

[Thomas Weber]

Author: thomas-guest
Date: 2008-08-23 13:32:49 +0000 (Sat, 23 Aug 2008)
New Revision: 2392

Removed:
   octave/trunk/debian/patches/50_add_syspath.dpatch
Modified:
   octave/trunk/debian/in/00list
Log:
Drop 50_add_syspath.dpatch (applied upstream in 3.0.2)


Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2008-08-23 12:41:41 UTC (rev 2391)
+++ octave/trunk/debian/in/00list	2008-08-23 13:32:49 UTC (rev 2392)
@@ -15,7 +15,6 @@
 :][V_3_0:
 50_octave-bug-tempfile
 50_fix_handle_for_plotyy.dpatch
-50_add_syspath.dpatch
 randn_doc.dpatch
 no_pdf_in_print.dpatch
 dont_set_helvetica.dpatch

Deleted: octave/trunk/debian/patches/50_add_syspath.dpatch
===================================================================
--- octave/trunk/debian/patches/50_add_syspath.dpatch	2008-08-23 12:41:41 UTC (rev 2391)
+++ octave/trunk/debian/patches/50_add_syspath.dpatch	2008-08-23 13:32:49 UTC (rev 2392)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_add_syspath.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Put library path in loadpath (bug fix for #477556)
-## DP: http://www.cae.wisc.edu/pipermail/octave-maintainers/2008-May/007330.html
-
- at DPATCH@
-diff -urNad octave3.0-3.0.1~/src/load-path.cc octave3.0-3.0.1/src/load-path.cc
---- octave3.0-3.0.1~/src/load-path.cc	2008-04-21 18:00:20.000000000 +0200
-+++ octave3.0-3.0.1/src/load-path.cc	2008-05-21 10:20:38.000000000 +0200
-@@ -382,7 +382,7 @@
-     xpath += dir_path::path_sep_str + tpath;
- 
-   if (! sys_path.empty ())
--    xpath += sys_path;
-+    xpath += dir_path::path_sep_str + sys_path;
- 
-   do_set (xpath, false);
- }
-diff -urNad octave3.0-3.0.1~/src/load-path.cc.orig octave3.0-3.0.1/src/load-path.cc.orig