[Pkg-octave-commit] [octave-strings] 01/06: Remove strjoin.m, which is now in Octave core

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-strings.

commit c6ef0a1529efc98269a78a4e0838d5f3578fb438
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Thu Sep 18 17:00:37 2014 -0300

    Remove strjoin.m, which is now in Octave core
    
    Closes: 741033
---
 debian/copyright                    |  4 ---
 debian/patches/remove-strjoin.patch | 64 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 513679c..02a5a27 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,6 @@ Upstream-Name: Strings package for Octave
 Upstream-Contact: The Octave Community <octave-maintainers at octave.org>
 Source: http://octave.sourceforge.net/strings/
 
-Files: inst/base64decode.m inst/editdistance.m inst/strjoin.m
-Copyright: 2006-2007 Muthiah Annamalai <muthiah.annamalai at uta.edu>
-License: GPL-3+
-
 Files: inst/cstrcmp.m
 Copyright: 2012 Carnë Draug <carandraug+dev at gmail.com>
 License: GPL-3+
diff --git a/debian/patches/remove-strjoin.patch b/debian/patches/remove-strjoin.patch
new file mode 100644
index 0000000..5617c38
--- /dev/null
+++ b/debian/patches/remove-strjoin.patch
@@ -0,0 +1,64 @@
+Description: Remove function strjoin after being added to Octave core
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Origin: http://sourceforge.net/p/octave/strings/ci/b269a39405892d0fd3b2bf88e3f22421402a8a46/
+Bug-Debian: http://bugs.debian.org/741033
+Forwarded: not-needed
+Last-Update: 2014-09-18
+
+--- octave-strings-1.1.0.orig/inst/strjoin.m
++++ /dev/null
+@@ -1,54 +0,0 @@
+-## Copyright (C) 2007 Muthiah Annamalai <muthiah.annamalai at uta.edu>
+-##
+-## This program is free software; you can redistribute it and/or modify it under
+-## the terms of the GNU General Public License as published by the Free Software
+-## Foundation; either version 3 of the License, or (at your option) any later
+-## version.
+-##
+-## This program is distributed in the hope that it will be useful, but WITHOUT
+-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+-## details.
+-##
+-## You should have received a copy of the GNU General Public License along with
+-## this program; if not, see <http://www.gnu.org/licenses/>.
+-
+-## -*- texinfo -*-
+-## @deftypefn {Function File} {@var{rval} =} strjoin (@var{prefixstr}, @var{stringcell})
+-## @deftypefnx {Function File} {@var{rval} =} strjoin (@var{prefixstr}, @var{varargs})
+-## Joins the strings in @var{stringcell} with the @var{prefixstr} like the list-join
+-## function in Python; the second version allows usage with variable number of arguments.
+-## Note that, if using cell-array as a second argument, only 2 arguments are accepted.
+-## Also note that, both the arguments are strings or containers of strings (cells).
+-##
+-## @example
+-## @group
+-##           strjoin(' loves-> ','marie','amy','beth') 
+-##           ##returns 'marie loves-> amy loves-> beth'
+-##
+-##           strjoin('*',@{'Octave','Scilab','Lush','Yorick'@})
+-##           ##returns 'Octave*Scilab*Lush*Yorick'
+-## @end group
+-## @end example
+-## @seealso {strcmp}
+-## @end deftypefn
+-
+-function rval = strjoin (spacer, varargin)
+-  if (nargin < 2) || (nargin > 2  && iscell(varargin{1}) )
+-    print_usage();
+-  end
+-
+-  if iscell(varargin{1})
+-    varargin=varargin{1};
+-  end
+-
+-  rval="";
+-  L=length(varargin);
+-  for idx=1:(L-1)
+-    rval=strcat(rval,sprintf('%s%s',varargin{idx},spacer));
+-  end
+-  rval=strcat(rval,varargin{L});
+-endfunction
+-
+-%!assert(strjoin("-","hello"),"hello")
+-%!assert(strjoin('*',{'Octave','Scilab','Lush','Yorick'}),'Octave*Scilab*Lush*Yorick')
diff --git a/debian/patches/series b/debian/patches/series
index 0ed9383..412d1cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 autoload-yes.patch
+remove-strjoin.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-strings.git