Mercurial > hg > octave-nkf
changeset 17795:0a8c35ae5ce1
maint: Fix various problems with GPL copyright statements.
* libgui/qterminal/libqterminal/QTerminal.cc,
libgui/qterminal/libqterminal/QTerminal.h,
libgui/qterminal/libqterminal/win32/QTerminalColors.cpp,
libgui/qterminal/libqterminal/win32/QTerminalColors.h,
libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp,
libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h:
Replace "Foobar" with "This program" in GPL statement.
* scripts/linear-algebra/linsolve.m: Replace "This program" with "Octave" in
* GPL statement.
* scripts/miscellaneous/getappdata.m, scripts/miscellaneous/isappdata.m,
scripts/miscellaneous/rmappdata.m, scripts/miscellaneous/setappdata.m:
Add "This file is part of Octave" line. Replace "This program" with "Octave"
in GPL statement. Update GPL version to 3.
* scripts/plot/util/copyobj.m, scripts/plot/util/hdl2struct.m,
scripts/plot/util/struct2hdl.m, scripts/polynomial/ppder.m,
scripts/polynomial/ppint.m, scripts/polynomial/ppjumps.m,
scripts/sparse/bicg.m, scripts/strings/untabify.m:
Replace "This program" with "Octave" in GPL statement.
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.cc +++ b/libgui/qterminal/libqterminal/QTerminal.cc @@ -5,18 +5,19 @@ This file is part of QTerminal. -Foobar is free software: you can redistribute it and/or modify +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. -QTerminal is distributed in the hope that it will be useful, +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 Foobar. If not, see <http://www.gnu.org/licenses/>. +along with this program. If not, +see <http://www.gnu.org/licenses/>. */
--- a/libgui/qterminal/libqterminal/QTerminal.h +++ b/libgui/qterminal/libqterminal/QTerminal.h @@ -5,18 +5,19 @@ This file is part of QTerminal. -Foobar is free software: you can redistribute it and/or modify +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. -QTerminal is distributed in the hope that it will be useful, +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 Foobar. If not, see <http://www.gnu.org/licenses/>. +along with this program. If not, +see <http://www.gnu.org/licenses/>. */
--- a/libgui/qterminal/libqterminal/win32/QTerminalColors.cpp +++ b/libgui/qterminal/libqterminal/win32/QTerminalColors.cpp @@ -4,18 +4,19 @@ This file is part of QConsole. -Foobar is free software: you can redistribute it and/or modify +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. -QConsole is distributed in the hope that it will be useful, +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 Foobar. If not, see <http://www.gnu.org/licenses/>. +along with this program. If not, +see <http://www.gnu.org/licenses/>. */
--- a/libgui/qterminal/libqterminal/win32/QTerminalColors.h +++ b/libgui/qterminal/libqterminal/win32/QTerminalColors.h @@ -4,18 +4,19 @@ This file is part of QConsole. -Foobar is free software: you can redistribute it and/or modify +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. -QConsole is distributed in the hope that it will be useful, +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 Foobar. If not, see <http://www.gnu.org/licenses/>. +along with this program. If not, +see <http://www.gnu.org/licenses/>. */
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @@ -4,18 +4,19 @@ This file is part of QConsole. -Foobar is free software: you can redistribute it and/or modify +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. -QConsole is distributed in the hope that it will be useful, +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 Foobar. If not, see <http://www.gnu.org/licenses/>. +along with this program. If not, +see <http://www.gnu.org/licenses/>. */
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h @@ -4,18 +4,19 @@ This file is part of QConsole. -Foobar is free software: you can redistribute it and/or modify +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. -QConsole is distributed in the hope that it will be useful, +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 Foobar. If not, see <http://www.gnu.org/licenses/>. +along with this program. If not, +see <http://www.gnu.org/licenses/>. */
--- a/scripts/linear-algebra/linsolve.m +++ b/scripts/linear-algebra/linsolve.m @@ -1,17 +1,19 @@ ## Copyright (C) 2013 Nir Krakauer ## -## This program is free software; you can redistribute it and/or modify +## This file is part of Octave. +## +## Octave 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, +## Octave 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/>. +## along with Octave; If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {@var{x} =} linsolve (@var{A}, @var{b})
--- a/scripts/miscellaneous/getappdata.m +++ b/scripts/miscellaneous/getappdata.m @@ -1,11 +1,13 @@ ## Copyright (C) 2010-2013 Ben Abbott ## -## 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 +## This file is part of Octave. +## +## Octave 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, +## Octave 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.
--- a/scripts/miscellaneous/isappdata.m +++ b/scripts/miscellaneous/isappdata.m @@ -1,11 +1,13 @@ ## Copyright (C) 2010-2013 Ben Abbott ## -## 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 +## This file is part of Octave. +## +## Octave 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, +## Octave 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.
--- a/scripts/miscellaneous/rmappdata.m +++ b/scripts/miscellaneous/rmappdata.m @@ -1,11 +1,13 @@ ## Copyright (C) 2010-2013 Ben Abbott ## -## 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 +## This file is part of Octave. +## +## Octave 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, +## Octave 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.
--- a/scripts/miscellaneous/setappdata.m +++ b/scripts/miscellaneous/setappdata.m @@ -1,11 +1,13 @@ ## Copyright (C) 2010-2013 Ben Abbott ## -## 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 +## This file is part of Octave. +## +## Octave 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, +## Octave 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.
--- a/scripts/plot/util/copyobj.m +++ b/scripts/plot/util/copyobj.m @@ -1,11 +1,13 @@ ## Copyright (C) 2012-2013 pdiribarne ## +## This file is part of Octave. +## ## 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, +## Octave 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.
--- a/scripts/plot/util/hdl2struct.m +++ b/scripts/plot/util/hdl2struct.m @@ -1,11 +1,13 @@ ## Copyright (C) 2012-2013 pdiribarne ## -## This program is free software; you can redistribute it and/or modify +## This file is part of Octave. +## +## Octave 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, +## Octave 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.
--- a/scripts/plot/util/struct2hdl.m +++ b/scripts/plot/util/struct2hdl.m @@ -1,11 +1,13 @@ ## Copyright (C) 2012-2013 pdiribarne ## -## This program is free software; you can redistribute it and/or modify +## This file is part of Octave. +## +## Octave 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, +## Octave 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.
--- a/scripts/polynomial/ppder.m +++ b/scripts/polynomial/ppder.m @@ -13,7 +13,7 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this software; see the file COPYING. If not, see +## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*-
--- a/scripts/polynomial/ppint.m +++ b/scripts/polynomial/ppint.m @@ -7,13 +7,13 @@ ## 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, +## Octave 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 software; see the file COPYING. If not, see +## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*-
--- a/scripts/polynomial/ppjumps.m +++ b/scripts/polynomial/ppjumps.m @@ -7,13 +7,13 @@ ## 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, +## Octave 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 software; see the file COPYING. If not, see +## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*-
--- a/scripts/sparse/bicg.m +++ b/scripts/sparse/bicg.m @@ -1,18 +1,20 @@ ## Copyright (C) 2006 Sylvain Pelissier ## Copyright (C) 2012-2013 Carlo de Falco ## -## This program is free software; you can redistribute it and/or modify +## This file is part of Octave. +## +## Octave 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 +## 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, +## Octave 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/>. +## along with Octave; If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {@var{x} =} bicg (@var{A}, @var{b}, @var{rtol}, @var{maxit}, @var{M1}, @var{M2}, @var{x0})
--- a/scripts/strings/untabify.m +++ b/scripts/strings/untabify.m @@ -4,10 +4,10 @@ ## ## Octave 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 +## 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, +## Octave 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.