[Pkg-octave-commit] [SCM] Debian packaging for octave-gsl branch, master, updated. 45c8205fe5cbd35af312072a6bab3b54f81242fd

Rafael Laboissiere rafael at laboissiere.net
Sat Mar 10 12:48:43 UTC 2012


The following commit has been merged in the master branch:
commit 7117546cefff51ea257341cf185a4064be6bdca2
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat Mar 10 13:45:12 2012 +0100

    Add patch for avoiding the use of the deprecated function split

diff --git a/debian/patches/avoid-deprecated-split.patch b/debian/patches/avoid-deprecated-split.patch
new file mode 100644
index 0000000..8e097b4
--- /dev/null
+++ b/debian/patches/avoid-deprecated-split.patch
@@ -0,0 +1,46 @@
+Description: Do not use the deprecated function split
+ This split function has been deprecated since Octave 3.2 and has been
+ removed from Octave 3.6.  Use char(strsplit()) instead.
+Author: Rafael Laboissiere <rafael at laboissiere.net
+Last-Update: 2012-03-10
+
+--- octave-gsl-1.0.8.orig/inst/test_ellint.m
++++ octave-gsl-1.0.8/inst/test_ellint.m
+@@ -77,7 +77,7 @@ global TEST_FACTOR
+ 			str_p=index(input_line,"gsl_sf_ellint_Kcomp_e");
+ 			if (str_p != 0)
+ 				# Take it apart
+-				string_split=split(input_line,",");
++				string_split=char(strsplit(input_line,","));
+ 				arg1=str2double(substr(string_split(3,:),3));
+ 				arg2=str2double(string_split(4,:));
+ 				arg3=(string_split(5,:));
+@@ -98,7 +98,7 @@ global TEST_FACTOR
+ 			str_p=index(input_line,"gsl_sf_ellint_Ecomp_e");
+ 			if (str_p != 0)
+ 				# Take it apart
+-				string_split=split(input_line,",");
++				string_split=char(strsplit(input_line,","));
+ 				arg1=str2double(substr(string_split(3,:),3));
+ 				arg2=str2double(string_split(4,:));
+ 				arg3=(string_split(5,:));
+--- octave-gsl-1.0.8.orig/inst/test_hyperg.m
++++ octave-gsl-1.0.8/inst/test_hyperg.m
+@@ -82,7 +82,7 @@ global TEST_FACTOR
+ 			str_p=index(input_line,"hyperg_1F1_e");
+ 			if (str_p != 0)
+ 				# Take it apart
+-				string_split=split(input_line,",");
++				string_split=char(strsplit(input_line,","));
+ 				arg1=str2double(substr(string_split(3,:),3));
+ 				arg2=str2double(string_split(4,:));
+ 				arg3=str2double(string_split(5,:));
+@@ -103,7 +103,7 @@ global TEST_FACTOR
+ 			str_p=index(input_line,"hyperg_U_e");
+ 			if (str_p != 0)
+ 				# Take it apart
+-				string_split=split(input_line,",");
++				string_split=char(strsplit(input_line,","));
+ 				arg1=str2double(substr(string_split(3,:),3));
+ 				arg2=str2double(string_split(4,:));
+ 				arg3=str2double(string_split(5,:));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6eba375
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+avoid-deprecated-split.patch

-- 
Debian packaging for octave-gsl



More information about the Pkg-octave-commit mailing list