[Olena-patches] 3986: Update the shipped GNU General Public License (GPL) text.

* COPYING: Update from http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. --- COPYING | 15 +++++++-------- ChangeLog | 7 +++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/COPYING b/COPYING index 8f0f085..d511905 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991, 2006 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. 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, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/ChangeLog b/ChangeLog index 8fba8f2..46faf65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Update the shipped GNU General Public License (GPL) text. + + * COPYING: Update from + http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + +2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> Add tentative support for GDCM in the configuration system. -- 1.6.1.2