From 8836dd00ecb2dca5462442a6149872ec84d9efdc Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 22 Dec 2007 04:40:11 +0000 Subject: [PATCH] 2007-12-21 Jim Evins * COPYING.LIBGLABELS: * COPYING.README_FIRST: * README: Updating license information to make more complete and understandable. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@711 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- ...{COPYING.LIBGLABELS => COPYING-LIBGLABELS} | 0 glabels2/COPYING.README_FIRST | 28 +++++++++++++++++++ glabels2/ChangeLog | 7 +++++ glabels2/README | 19 ++----------- 4 files changed, 38 insertions(+), 16 deletions(-) rename glabels2/{COPYING.LIBGLABELS => COPYING-LIBGLABELS} (100%) create mode 100644 glabels2/COPYING.README_FIRST diff --git a/glabels2/COPYING.LIBGLABELS b/glabels2/COPYING-LIBGLABELS similarity index 100% rename from glabels2/COPYING.LIBGLABELS rename to glabels2/COPYING-LIBGLABELS diff --git a/glabels2/COPYING.README_FIRST b/glabels2/COPYING.README_FIRST new file mode 100644 index 00000000..694c9efa --- /dev/null +++ b/glabels2/COPYING.README_FIRST @@ -0,0 +1,28 @@ + The gLabels official distribution is an aggregate of several components. + Each component is licensed as follows + + 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 + (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-LIBGLABESL' 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. + + 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 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. + diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 4cb79205..1177cf67 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,10 @@ +2007-12-21 Jim Evins + + * COPYING.LIBGLABELS: + * COPYING.README_FIRST: + * README: + Updating license information to make more complete and understandable. + 2007-12-16 Jim Evins * configure.in: diff --git a/glabels2/README b/glabels2/README index b4dfa60e..a8c42416 100644 --- a/glabels2/README +++ b/glabels2/README @@ -1,25 +1,12 @@ Copyright ========= - gLabels - a GNOME-based label and business card creation program - Copyright (C) 2001-2007 Jim Evins - 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 - (at your option) any later version. - - 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 this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + gLabels contains components copyrighted by others -- see th 'AUTHORS' file in + this directory. - For more details see the file COPYING. + For license information see the 'COPYING.README_FIRST' file in this directory. -- 2.39.5