# HG changeset patch # User Rik # Date 1383075117 25200 # Node ID 0a8c35ae5ce142ba87ffbda5e7f526371c3da6d7 # Parent 7e9382588570672e1399b6a7984ffd9de722f475 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. diff -r 7e9382588570 -r 0a8c35ae5ce1 libgui/qterminal/libqterminal/QTerminal.cc --- a/libgui/qterminal/libqterminal/QTerminal.cc Tue Oct 29 11:49:22 2013 -0700 +++ b/libgui/qterminal/libqterminal/QTerminal.cc Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +along with this program. If not, +see . */ diff -r 7e9382588570 -r 0a8c35ae5ce1 libgui/qterminal/libqterminal/QTerminal.h --- a/libgui/qterminal/libqterminal/QTerminal.h Tue Oct 29 11:49:22 2013 -0700 +++ b/libgui/qterminal/libqterminal/QTerminal.h Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +along with this program. If not, +see . */ diff -r 7e9382588570 -r 0a8c35ae5ce1 libgui/qterminal/libqterminal/win32/QTerminalColors.cpp --- a/libgui/qterminal/libqterminal/win32/QTerminalColors.cpp Tue Oct 29 11:49:22 2013 -0700 +++ b/libgui/qterminal/libqterminal/win32/QTerminalColors.cpp Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +along with this program. If not, +see . */ diff -r 7e9382588570 -r 0a8c35ae5ce1 libgui/qterminal/libqterminal/win32/QTerminalColors.h --- a/libgui/qterminal/libqterminal/win32/QTerminalColors.h Tue Oct 29 11:49:22 2013 -0700 +++ b/libgui/qterminal/libqterminal/win32/QTerminalColors.h Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +along with this program. If not, +see . */ diff -r 7e9382588570 -r 0a8c35ae5ce1 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp --- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Tue Oct 29 11:49:22 2013 -0700 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +along with this program. If not, +see . */ diff -r 7e9382588570 -r 0a8c35ae5ce1 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h --- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Tue Oct 29 11:49:22 2013 -0700 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +along with this program. If not, +see . */ diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/linear-algebra/linsolve.m --- a/scripts/linear-algebra/linsolve.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/linear-algebra/linsolve.m Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +## along with Octave; If not, see . ## -*- texinfo -*- ## @deftypefn {Function File} {@var{x} =} linsolve (@var{A}, @var{b}) diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/miscellaneous/getappdata.m --- a/scripts/miscellaneous/getappdata.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/miscellaneous/getappdata.m Tue Oct 29 12:31:57 2013 -0700 @@ -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. diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/miscellaneous/isappdata.m --- a/scripts/miscellaneous/isappdata.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/miscellaneous/isappdata.m Tue Oct 29 12:31:57 2013 -0700 @@ -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. diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/miscellaneous/rmappdata.m --- a/scripts/miscellaneous/rmappdata.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/miscellaneous/rmappdata.m Tue Oct 29 12:31:57 2013 -0700 @@ -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. diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/miscellaneous/setappdata.m --- a/scripts/miscellaneous/setappdata.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/miscellaneous/setappdata.m Tue Oct 29 12:31:57 2013 -0700 @@ -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. diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/plot/util/copyobj.m --- a/scripts/plot/util/copyobj.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/plot/util/copyobj.m Tue Oct 29 12:31:57 2013 -0700 @@ -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. diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/plot/util/hdl2struct.m --- a/scripts/plot/util/hdl2struct.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/plot/util/hdl2struct.m Tue Oct 29 12:31:57 2013 -0700 @@ -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. diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/plot/util/struct2hdl.m --- a/scripts/plot/util/struct2hdl.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/plot/util/struct2hdl.m Tue Oct 29 12:31:57 2013 -0700 @@ -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. diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/polynomial/ppder.m --- a/scripts/polynomial/ppder.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/polynomial/ppder.m Tue Oct 29 12:31:57 2013 -0700 @@ -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 ## . ## -*- texinfo -*- diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/polynomial/ppint.m --- a/scripts/polynomial/ppint.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/polynomial/ppint.m Tue Oct 29 12:31:57 2013 -0700 @@ -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 ## . ## -*- texinfo -*- diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/polynomial/ppjumps.m --- a/scripts/polynomial/ppjumps.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/polynomial/ppjumps.m Tue Oct 29 12:31:57 2013 -0700 @@ -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 ## . ## -*- texinfo -*- diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/sparse/bicg.m --- a/scripts/sparse/bicg.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/sparse/bicg.m Tue Oct 29 12:31:57 2013 -0700 @@ -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 . +## along with Octave; If not, see . ## -*- texinfo -*- ## @deftypefn {Function File} {@var{x} =} bicg (@var{A}, @var{b}, @var{rtol}, @var{maxit}, @var{M1}, @var{M2}, @var{x0}) diff -r 7e9382588570 -r 0a8c35ae5ce1 scripts/strings/untabify.m --- a/scripts/strings/untabify.m Tue Oct 29 11:49:22 2013 -0700 +++ b/scripts/strings/untabify.m Tue Oct 29 12:31:57 2013 -0700 @@ -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.