[Pkg-octave-commit] [octave-strings] 01/02: d/p/remove-strjoin.patch: remove patch, applied upstream.

[Sébastien Villemot]

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

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

commit e9690996a4ed11ae4bd0067a3d3fa676a6508efb
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jul 31 11:19:21 2015 +0200

    d/p/remove-strjoin.patch: remove patch, applied upstream.
---
 debian/patches/remove-strjoin.patch | 64 -------------------------------------
 debian/patches/series               |  1 -
 2 files changed, 65 deletions(-)

diff --git a/debian/patches/remove-strjoin.patch b/debian/patches/remove-strjoin.patch
deleted file mode 100644
index 5617c38..0000000
--- a/debian/patches/remove-strjoin.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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 53aa4c1..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-remove-strjoin.patch

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