[Pkg-octave-commit] [SCM] octave-miscellaneous branch, master, updated. a5032c83166abc9595370e85c2fe694e8ad1e0ec

[Thomas Weber]

The following commit has been merged in the master branch:
commit 497c3871e03655bbf050bc69d518b6510fb38f1c
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sun Nov 22 14:47:21 2009 +0100

    Remove patch cell2csv-str-find (applied upstream)

diff --git a/debian/changelog b/debian/changelog
index 0f9253b..6b6b3ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ octave-miscellaneous (1.0.9-1) UNRELEASED; urgency=low
   * Removed patches (applied upstream): 
     - autoload-num2hex 
     - build-hex2num
+    - cell2csv-str-find
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 07 Jun 2009 21:06:58 +0200
 
diff --git a/debian/patches/cell2csv-str-find b/debian/patches/cell2csv-str-find
deleted file mode 100644
index 3ca2c09..0000000
--- a/debian/patches/cell2csv-str-find
+++ /dev/null
@@ -1,17 +0,0 @@
-The str.find() function returns a size_type.  On 64-bits systems like
-amd64, storing the result of str.find() in an unsigned int variable is
-bound to give problems.  Fix that.
-
- -- Rafael Laboissiere <rafael at debian.org>  Sun, 23 May 2009 11:41:14 +0200
-
---- a/src/cell2csv.cc
-+++ b/src/cell2csv.cc
-@@ -92,7 +92,7 @@
- 	/* Output string value */
- 	std::string str = c(i, j).string_value();
- 	if (str.find(sep) != str.npos) {
--	  unsigned int pos = 0;
-+	  size_t pos = 0;
- 	  while ((pos=str.find(prot, pos)) != str.npos) {
- 	    str.replace(pos, 1, prot+prot);
- 	    pos += 2;
diff --git a/debian/patches/series b/debian/patches/series
index 34ee15b..bc8537f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 special_matrix_lauchli
-cell2csv-str-find

-- 
octave-miscellaneous