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

[Thomas Weber]

Author: thomas-guest
Date: 2008-08-23 12:41:41 +0000 (Sat, 23 Aug 2008)
New Revision: 2391

Removed:
   octave/trunk/debian/patches/50_include-cstring-mxarray.dpatch
Modified:
   octave/trunk/debian/in/00list
Log:
Remove 50_include-cstring-mxarray.dpatch for both 3.0 and 3.1
The change was already in 3.1.51, but stupid dpatch didn't complain about the hunk


Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2008-08-23 11:58:56 UTC (rev 2390)
+++ octave/trunk/debian/in/00list	2008-08-23 12:41:41 UTC (rev 2391)
@@ -14,7 +14,6 @@
 50_build-octave-faq
 :][V_3_0:
 50_octave-bug-tempfile
-50_include-cstring-mxarray
 50_fix_handle_for_plotyy.dpatch
 50_add_syspath.dpatch
 randn_doc.dpatch
@@ -22,7 +21,6 @@
 dont_set_helvetica.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
-50_include-cstring-mxarray
 no_pdf_in_print.dpatch
 dont_set_helvetica-3.1.dpatch
 :]

Deleted: octave/trunk/debian/patches/50_include-cstring-mxarray.dpatch
===================================================================
--- octave/trunk/debian/patches/50_include-cstring-mxarray.dpatch	2008-08-23 11:58:56 UTC (rev 2390)
+++ octave/trunk/debian/patches/50_include-cstring-mxarray.dpatch	2008-08-23 12:41:41 UTC (rev 2391)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_include-cstring-mxarray.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Compile successfully with GCC 4.3
-
- at DPATCH@
-
-# HG changeset patch
-# User jwe
-# Date 1201224095 0
-# Node ID 33577b0d4df210f9dc907c6e825747c2c6d337fb
-# Parent  a7a987b229b7b0e16b2ae8748e147c2caffa815d
-[project @ 2008-01-25 01:21:35 by jwe]
-
-diff -r a7a987b229b7 -r 33577b0d4df2 src/ChangeLog
---- a/src/ChangeLog	Thu Jan 24 08:31:36 2008 +0000
-+++ b/src/ChangeLog	Fri Jan 25 01:21:35 2008 +0000
-@@ -1,1 +1,5 @@ 2008-01-22  John W. Eaton  <jwe at octave.o
-+2008-01-24  Pascal Dupuis  <Pascal.Dupuis at worldonline.be>
-+
-+	* mxarray.h.in: Include <cstring>.
-+
- 2007-12-21  John W. Eaton  <jwe at octave.org>
-
- 	Version 3.0.0 released.
-diff -r a7a987b229b7 -r 33577b0d4df2 src/mxarray.h.in
---- a/src/mxarray.h.in	Thu Jan 24 08:31:36 2008 +0000
-+++ b/src/mxarray.h.in	Fri Jan 25 01:21:35 2008 +0000
-@@ -89,6 +89,8 @@ typedef @OCTAVE_IDX_TYPE@ mwIndex;
- typedef @OCTAVE_IDX_TYPE@ mwIndex;
- 
- #if ! defined (MXARRAY_TYPEDEFS_ONLY)
-+
-+#include <cstring>
- 
- class octave_value;
-