Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[9909] trunk/octave-forge/main/strings
|
From: <car...@us...> - 2012-03-15 22:19:20
|
Revision: 9909
http://octave.svn.sourceforge.net/octave/?rev=9909&view=rev
Author: carandraug
Date: 2012-03-15 22:19:13 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
strings: update licenses to GPLv3+ or move them to top of file
Modified Paths:
--------------
trunk/octave-forge/main/strings/inst/base64decode.m
trunk/octave-forge/main/strings/inst/base64encode.m
trunk/octave-forge/main/strings/inst/cstrcmp.m
trunk/octave-forge/main/strings/inst/editdistance.m
trunk/octave-forge/main/strings/inst/strjoin.m
trunk/octave-forge/main/strings/inst/strsort.m
trunk/octave-forge/main/strings/src/pcregexp.cc
Modified: trunk/octave-forge/main/strings/inst/base64decode.m
===================================================================
--- trunk/octave-forge/main/strings/inst/base64decode.m 2012-03-15 21:34:38 UTC (rev 9908)
+++ trunk/octave-forge/main/strings/inst/base64decode.m 2012-03-15 22:19:13 UTC (rev 9909)
@@ -1,20 +1,17 @@
## Copyright (C) 2007 Muthiah Annamalai <mut...@ut...>
##
-## 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 2 of the License, or
-## (at your option) any later version.
+## 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.
+## 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/>.
-##
-## This code was adapted from, Paul Kienzle <pki...@us...>
-##
+## 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}= {} base64decode(@var{code})
Modified: trunk/octave-forge/main/strings/inst/base64encode.m
===================================================================
--- trunk/octave-forge/main/strings/inst/base64encode.m 2012-03-15 21:34:38 UTC (rev 9908)
+++ trunk/octave-forge/main/strings/inst/base64encode.m 2012-03-15 22:19:13 UTC (rev 9909)
@@ -1,3 +1,6 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
## -*- texinfo -*-
## @deftypefn @var{Y} = {Function File} {} base64encode(@var{X})
## @deftypefnx @var{Y} = {Function File} {} base64encode(@var{X}, @var{do_reshape})
@@ -14,11 +17,7 @@
## @end example
## @end deftypefn
## @seealso{base64decode}
-##
-## This program is in the public domain
-## Author: Paul Kienzle <pki...@us...>
-##
function Y = base64encode(X,do_reshape)
if (nargin < 1)
Modified: trunk/octave-forge/main/strings/inst/cstrcmp.m
===================================================================
--- trunk/octave-forge/main/strings/inst/cstrcmp.m 2012-03-15 21:34:38 UTC (rev 9908)
+++ trunk/octave-forge/main/strings/inst/cstrcmp.m 2012-03-15 22:19:13 UTC (rev 9909)
@@ -1,18 +1,17 @@
## Copyright (C) 2007 Muthiah Annamalai <mut...@ut...>
-##
-## 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 2 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.
+## 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.
##
-## You should have received a copy of the GNU General Public License
-## along with this program; If not, see <http://www.gnu.org/licenses/>.
+## 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}= {} cstrcmp(@var{string1},@var{string2})
@@ -31,9 +30,7 @@
## @end example
## @end deftypefn
## @seealso {strcmp}
-##
-
function rval=cstrcmp(s1,s2)
if nargin < 2
print_usage();
Modified: trunk/octave-forge/main/strings/inst/editdistance.m
===================================================================
--- trunk/octave-forge/main/strings/inst/editdistance.m 2012-03-15 21:34:38 UTC (rev 9908)
+++ trunk/octave-forge/main/strings/inst/editdistance.m 2012-03-15 22:19:13 UTC (rev 9909)
@@ -1,18 +1,17 @@
## Copyright (C) 2006 Muthiah Annamalai <mut...@ut...>
-##
-## 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 2 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.
+## 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.
##
-## You should have received a copy of the GNU General Public License
-## along with this program; If not, see <http://www.gnu.org/licenses/>.
+## 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{dist},@var{L}] = {} editdistance(@var{string1},@var{string2},@var{weights})
Modified: trunk/octave-forge/main/strings/inst/strjoin.m
===================================================================
--- trunk/octave-forge/main/strings/inst/strjoin.m 2012-03-15 21:34:38 UTC (rev 9908)
+++ trunk/octave-forge/main/strings/inst/strjoin.m 2012-03-15 22:19:13 UTC (rev 9909)
@@ -1,18 +1,17 @@
## Copyright (C) 2007 Muthiah Annamalai <mut...@ut...>
-##
-## 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 2 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.
+## 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.
##
-## You should have received a copy of the GNU General Public License
-## along with this program; If not, see <http://www.gnu.org/licenses/>.
+## 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})
Modified: trunk/octave-forge/main/strings/inst/strsort.m
===================================================================
--- trunk/octave-forge/main/strings/inst/strsort.m 2012-03-15 21:34:38 UTC (rev 9908)
+++ trunk/octave-forge/main/strings/inst/strsort.m 2012-03-15 22:19:13 UTC (rev 9909)
@@ -1,9 +1,9 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
# ... = strsort(...)
# Overloads the sort function to operate on strings.
-# Author: Paul Kienzle
-# This program is public domain
-
# PKG_ADD dispatch ("sort", "strsort", "string")
function [sorted,idx] = strsort(string,varargin)
if nargout == 2
Modified: trunk/octave-forge/main/strings/src/pcregexp.cc
===================================================================
--- trunk/octave-forge/main/strings/src/pcregexp.cc 2012-03-15 21:34:38 UTC (rev 9908)
+++ trunk/octave-forge/main/strings/src/pcregexp.cc 2012-03-15 22:19:13 UTC (rev 9909)
@@ -1,27 +1,26 @@
-/* Copyright (C) 2004 Stefan van der Walt <st...@su...>
+// Copyright (C) 2004 Stefan van der Walt <st...@su...>
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1 Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+// 2 Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ''AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
#include <octave/oct.h>
#include <pcre.h>
#include <iostream>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
