X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=COPYING.README_FIRST;h=755c63a3c10594e206eae06ac1e280bdd9e90a3c;hb=f32acbe3e3447c3fdb5644c460ff28833a93e4b2;hp=2d76f43e3b1baea6f3549d247bbaed5dd76aee55;hpb=b13649a65b7dfa46ba1ed7fe9e8afa4aaef70f79;p=glabels

diff --git a/COPYING.README_FIRST b/COPYING.README_FIRST
index 2d76f43e..755c63a3 100644
--- a/COPYING.README_FIRST
+++ b/COPYING.README_FIRST
@@ -1,28 +1,38 @@
-   The gLabels official distribution is an aggregate of several components.
-   Each component is licensed as follows
+The gLabels official distribution is an aggregate of several components.
+Each component is licensed as follows
+
+
+GLABELS:
 
    The gLabels application core, and other portions of the official gLabels
    distribution not explicitly licensed otherwise, are licensed under
-   the GNU GENERAL PUBLIC LICENSE (GPL); either version 2 of the License, or
+   the GNU GENERAL PUBLIC LICENSE (GPL); either version 3 of the License, or
    (at your option) any later version -- see the 'COPYING' file in this
    directory for details.
 
-   The libglabels library, located in the "libglabels/" subdirectory, is
-   licensed under the GNU LESSER GENERAL PUBLIC LICENSE (LGPL); either
-   version 2 of the License, or (at your option) any later version -- see
-   the 'COPYING-LIBGLABELS' in this directory for details.
 
-   The gLabels and libglabels documentation, located in the "docs/" and "help/"
-   subdirectories, is licensed under the GNU FREE DOCUMENTATION LICENSE (GFDL)
-   with no Invariant Sections; either version 1.1 or (at your option) any
-   later version -- see 'COPYING-DOCS' in this directory for details.
+LIBGLABELS & LIBGLBARCODE:
+
+   The libglabels and libglbarcode libraries, located in the "libglabels/"
+   and "libglbarcode/" subdirectories respecively, are licensed under the
+   GNU LESSER GENERAL PUBLIC LICENSE (LGPL); either version 3 of the License,
+   or (at your option) any later version -- see the 'COPYING-LIBS' in this
+   directory for details.
+
+
+DOCUMENTATION:
 
-   The "barcode-0.98/" and "iec16022-0.2.1/" subdirectories contain 3rd party
-   libraries, each licensed under the GNU GENERAL PUBLIC LICENSE (GPL); either
-   version 2 of the License, or (at your option) any later version -- see the
-   'LICENSE' or 'COPYING' file in each of these directories for details.
+   The gLabels, libglabels, and libglbarcode documentation, located in the
+   "docs/" and "help/" subdirectories, is licensed under the CreativeCommons
+   Attribution-Share Alike 3.0 Unported license.  See 'COPYING-DOCS' in this
+   directory for details, or visit 'http://creativecommons.org/licenses/by-sa/3.0/'.
 
-   The XML files in the "data/templates/" subdirectory constitute the glabels
-   label database.  This database is a simple collection of facts so it is
-   therefore considered to be public domain and can be used for any purpose.
 
+TEMPLATE DATABASE:
+
+   The XML files in the "templates/" subdirectory constitute the glabels
+   label database.  No copyright is claimed on the facts contained within
+   the database and can be used for any purpose.  However, to clear up any
+   ambiguity, the DTD file that defines the format of these files is
+   licensed using the MIT/X license, see 'COPYING-TEMPLATES' in this
+   directory for details.