[Pkg-octave-commit] [octave-gsl] 03/09: Drop patches, no longer needed.
Sébastien Villemot
sebastien at debian.org
Fri Nov 25 10:28:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository octave-gsl.
commit d16c921088789ad346f1bc5063e456a2a13a4031
Author: Sébastien Villemot <sebastien at debian.org>
Date: Fri Nov 25 11:05:30 2016 +0100
Drop patches, no longer needed.
+ d/p/add-bessel-zero-Jnu.patch
+ d/p/avoid-deprecated-split.patch
Gbp-Dch: Full
---
debian/patches/add-bessel-zero-Jnu.patch | 160 ----------------------------
debian/patches/avoid-deprecated-split.patch | 46 --------
debian/patches/series | 2 -
3 files changed, 208 deletions(-)
diff --git a/debian/patches/add-bessel-zero-Jnu.patch b/debian/patches/add-bessel-zero-Jnu.patch
deleted file mode 100644
index 764811b..0000000
--- a/debian/patches/add-bessel-zero-Jnu.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Description: Add binding for the bessel_zero_Jnu function
-Author: Carnë Draug <carandraug+dev at gmail.com>
-Origin: upstream http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=10530
-Last-Update: 2012-05-28
-
---- octave-gsl-1.0.8.orig/INDEX
-+++ octave-gsl-1.0.8/INDEX
-@@ -36,6 +36,7 @@ Special functions
- bessel_yl
- bessel_zero_J0
- bessel_zero_J1
-+ bessel_zero_Jnu
- beta_gsl
- clausen
- conicalP_0
---- octave-gsl-1.0.8.orig/PKG_ADD
-+++ octave-gsl-1.0.8/PKG_ADD
-@@ -30,6 +30,7 @@ autoload ("bessel_Yn", fullfile (filepar
- autoload ("bessel_Ynu", fullfile (fileparts (mfilename ("fullpath")), "gsl_sf.oct"));
- autoload ("bessel_zero_J0", fullfile (fileparts (mfilename ("fullpath")), "gsl_sf.oct"));
- autoload ("bessel_zero_J1", fullfile (fileparts (mfilename ("fullpath")), "gsl_sf.oct"));
-+autoload ("bessel_zero_Jnu", fullfile (fileparts (mfilename ("fullpath")), "gsl_sf.oct"));
- autoload ("beta_gsl", fullfile (fileparts (mfilename ("fullpath")), "gsl_sf.oct"));
- autoload ("Chi", fullfile (fileparts (mfilename ("fullpath")), "gsl_sf.oct"));
- autoload ("Ci", fullfile (fileparts (mfilename ("fullpath")), "gsl_sf.oct"));
---- octave-gsl-1.0.8.orig/src/buildgsl_sf.sh
-+++ octave-gsl-1.0.8/src/buildgsl_sf.sh
-@@ -1183,6 +1183,17 @@ EOF
- ./replace_template.sh int_int_double_to_double.cc.template >> gsl_sf.cc
-
-
-+# (double, int) to double
-+
-+export octave_name=bessel_zero_Jnu
-+export funcname=gsl_sf_bessel_zero_Jnu
-+cat << \EOF > docstring.txt
-+These routines compute the location of the n-th positive zero of the
-+Bessel function J_x().
-+EOF
-+./replace_template.sh double_int_to_double.cc.template >> gsl_sf.cc
-+
-+
- export octave_name=hyperg_U
- export funcname=gsl_sf_hyperg_U
- cat << \EOF > docstring.txt
---- /dev/null
-+++ octave-gsl-1.0.8/src/double_int_to_double.cc.template
-@@ -0,0 +1,112 @@
-+DEFUN_DLD(GSL_OCTAVE_NAME, args, nargout, "\
-+ -*- texinfo -*-\n\
-+ at deftypefn {Loadable Function} {@var{y} =} GSL_OCTAVE_NAME (@var{x}, @var{n})\n\
-+ at deftypefnx {Loadable Function} {[@var{y}, @var{err}] =} GSL_OCTAVE_NAME (@dots{})\n\
-+\n\
-+GSL_FUNC_DOCSTRING
-+\n\
-+ at var{err} contains an estimate of the absolute error in the value @var{y}.\n\
-+\n\
-+This function is from the GNU Scientific Library,\n\
-+see @url{http://www.gnu.org/software/gsl/} for documentation.\n\
-+ at end deftypefn\n\
-+")
-+{
-+ int i;
-+ dim_vector dv;
-+
-+ gsl_set_error_handler (octave_gsl_errorhandler);
-+
-+ if(args.length() != 2) {
-+ print_usage ();
-+ return octave_value();
-+ }
-+ if(!args(0).is_real_type() || !args(1).is_real_type()) {
-+ error("The arguments must be real.");
-+ print_usage ();
-+ return octave_value();
-+ }
-+
-+ // Nice combinatorial explosion here
-+ NDArray x = args(0).array_value();
-+ NDArray n = args(1).array_value();
-+ if(n.length() == x.length()) {
-+ dv = x.dims();
-+ NDArray y(dv);
-+ int len = x.length();
-+ if(nargout < 2) {
-+ for(i = 0; i < len; i++) {
-+ y.xelem(i) = GSL_FUNC_NAME (x.xelem(i),
-+ static_cast<int>(n.xelem(i)));
-+ }
-+ return octave_value(y);
-+ } else {
-+ NDArray err(dv);
-+ gsl_sf_result result;
-+ octave_value_list retval;
-+ for(i = 0; i < len; i++) {
-+ GSL_FUNC_NAME_e (x.xelem(i),
-+ static_cast<int>(n.xelem(i)), &result);
-+ y.xelem(i) = result.val;
-+ err.xelem(i) = result.err;
-+ }
-+ retval(1) = octave_value(err);
-+ retval(0) = octave_value(y);
-+ return retval;
-+ }
-+ } else if(n.length() == 1) {
-+ dv = x.dims();
-+ NDArray y(dv);
-+ int len = x.length();
-+ int nint = static_cast<int>(n.xelem(0));
-+ if(nargout < 2) {
-+ for(i = 0; i < len; i++) {
-+ y.xelem(i) = GSL_FUNC_NAME (x.xelem(i), nint);
-+ }
-+ return octave_value(y);
-+ } else {
-+ NDArray err(dv);
-+ gsl_sf_result result;
-+ octave_value_list retval;
-+ for(i = 0; i < len; i++) {
-+ GSL_FUNC_NAME_e (x.xelem(i), nint, &result);
-+ y.xelem(i) = result.val;
-+ err.xelem(i) = result.err;
-+ }
-+ retval(1) = octave_value(err);
-+ retval(0) = octave_value(y);
-+ return retval;
-+ }
-+ } else if(x.length() == 1) {
-+ dv = n.dims();
-+ NDArray y(dv);
-+ int len = n.length();
-+ double xdouble = x.xelem(0);
-+ if(nargout < 2) {
-+ for(i = 0; i < len; i++) {
-+ y.xelem(i) = GSL_FUNC_NAME (xdouble,
-+ static_cast<int>(n.xelem(i)));
-+ }
-+ return octave_value(y);
-+ } else {
-+ NDArray err(dv);
-+ gsl_sf_result result;
-+ octave_value_list retval;
-+ for(i = 0; i < len; i++) {
-+ GSL_FUNC_NAME_e (xdouble,
-+ static_cast<int>(n.xelem(i)), &result);
-+ y.xelem(i) = result.val;
-+ err.xelem(i) = result.err;
-+ }
-+ retval(1) = octave_value(err);
-+ retval(0) = octave_value(y);
-+ return retval;
-+ }
-+ } else {
-+ error("First and second argument must either have the same size, or one of them must be scalar.");
-+ print_usage ();
-+ }
-+
-+ return octave_value();
-+
-+}
diff --git a/debian/patches/avoid-deprecated-split.patch b/debian/patches/avoid-deprecated-split.patch
deleted file mode 100644
index 390233d..0000000
--- a/debian/patches/avoid-deprecated-split.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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 debian.org
-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
index 10d5010..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-avoid-deprecated-split.patch
-add-bessel-zero-Jnu.patch
--
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-gsl.git
More information about the Pkg-octave-commit
mailing list