diff --git a/ChangeLog b/ChangeLog index 1e5f9081e0..aab3e5b243 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-08-15 Sven Neumann + + * LICENSE: cosmetics. + + * Makefile.am (EXTRA_DIST): include LICENSE. + + * libgimp/Makefile.am (EXTRA_DIST): include COPYING. + 2003-08-14 Helvetix Victorinox * app/composite/make-installer.py: generate smaller tables and diff --git a/LICENSE b/LICENSE index 65faf7f5bf..45576b23dc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,26 +1,27 @@ -* The GIMP application core, and other portions of the -official GIMP distribution not explicitly licensed otherwise, -are licensed under the GNU GENERAL PUBLIC LICENSE -- see -the 'COPYING' file in this directory for details. +* The GIMP application core, and other portions of the official GIMP + distribution not explicitly licensed otherwise, are licensed under + the GNU GENERAL PUBLIC LICENSE -- see the 'COPYING' file in this + directory for details. [ The below explicit exemption, we hope, clears up the GIMP -developers' position concerning an ambiguity with the GNU General -Public License concerning what constitutes a 'mere aggregation' -versus a combined or derived work. The intention is to make -it clear that arbitrarily-licensed programs such as GIMP plug-ins -do not automatically assume the GNU General Public License (GPL) -themselves simply because of their invokation of (or by) procedures -implemented in GPL-licensed code, via libgimp or a similar -interface to methods provided by the pdb: ] + developers' position concerning an ambiguity with the GNU General + Public License concerning what constitutes a 'mere aggregation' + versus a combined or derived work. The intention is to make it + clear that arbitrarily-licensed programs such as GIMP plug-ins do + not automatically assume the GNU General Public License (GPL) + themselves simply because of their invokation of (or by) procedures + implemented in GPL-licensed code, via libgimp or a similar interface + to methods provided by the pdb: ] * If you create a program which invokes (or provides) methods within -(or for) the GPL GIMP application core through the medium of libgimp -or another implementation of the 'procedural database' (pdb) serial -protocol, then the GIMP developers' position is that this is a 'mere -aggregation' of the program invoking the method and the program -implementing the method as per section 2 of the GNU General Public -License. + (or for) the GPL GIMP application core through the medium of libgimp + or another implementation of the 'procedural database' (pdb) serial + protocol, then the GIMP developers' position is that this is a 'mere + aggregation' of the program invoking the method and the program + implementing the method as per section 2 of the GNU General Public + License. -* 'libgimp' is licensed under the GNU LESSER GENERAL PUBLIC LICENSE --- see the 'COPYING' file in the libgimp/ directory for details. +* 'libgimp' and the other GIMP libraries are licensed under the + GNU LESSER GENERAL PUBLIC LICENSE -- see the 'COPYING' file in the + libgimp directory for details. diff --git a/Makefile.am b/Makefile.am index 98441bacd2..0f17665960 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,7 @@ EXTRA_DIST = \ ChangeLog.pre-1-2 \ HACKING \ INSTALL \ + LICENSE \ MAINTAINERS \ NEWS \ PLUGIN_MAINTAINERS \ diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index e733a3a70d..f4f64efabc 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -61,8 +61,9 @@ INCLUDES = \ -I$(includedir) EXTRA_DIST = \ - makefile.msc \ - gimp.def \ + COPYING \ + makefile.msc \ + gimp.def \ gimpui.def lib_LTLIBRARIES = libgimp-1.3.la libgimpui-1.3.la