[msitools: 1/2] Update & clarify copyright




commit e0b4579d2eb86e66dc64bc330e66b511ede0f6e5
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Tue Nov 17 15:50:12 2020 +0400

    Update & clarify copyright
    
    The current meson.build, COPYING, COPYING.LIB and LICENSE details are
    giving unclear informations about licenses used in the project.
    
    Update the LICENSE file, using the machine-readable Debian copyright
    format to list explicitely the licenses being used in the project,
    rename the file "copyright".
    
    Fixes:
    https://gitlab.gnome.org/GNOME/msitools/-/issues/18
    
    Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>

 COPYING     | 340 ----------------------------------------
 COPYING.LIB | 504 ------------------------------------------------------------
 LICENSE     |  19 ---
 copyright   |  87 +++++++++++
 meson.build |   1 -
 5 files changed, 87 insertions(+), 864 deletions(-)
---
diff --git a/copyright b/copyright
new file mode 100644
index 0000000..fe63699
--- /dev/null
+++ b/copyright
@@ -0,0 +1,87 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: msitools
+Source: https://wiki.gnome.org/msitools
+
+Files:     *
+Copyright: 2012-2020 Red Hat, Inc.
+           1999 Patrick Stridvall
+           2002 Alexander Julliard
+           2002-2006 Mike McCormack for CodeWeavers
+           2005 Aric Stewart for CodeWeavers
+           2007 Robert Shearman for CodeWeavers
+           2007-2008 James Hawkins
+           2010 Hans Leidekker for CodeWeavers
+           2011 Berhard Loos
+License:   LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files:     libmsi/tokenize.c
+           tools/sqldelim.*
+Copyright: DISCLAIMED
+License:   DISCLAIMED
+ The author disclaims copyright to this source code.  In place of
+ a legal notice, here is a blessing:
+ .
+    May you do good and not evil.
+    May you find forgiveness for yourself and forgive others.
+    May you share freely, never taking more than you give.
+
+Files:     tools/msidiff.in
+           tools/msidump.in
+           tools/msibuild.c
+           tools/msiinfo.c
+           data/wxi-validate.pl
+Copyright: 2004-2010 Ville Skyttä <ville skytta iki fi>
+           2012-2020 Red Hat, Inc.
+           2010 Hans Leidekker for CodeWeavers
+License:   GPL-2+
+ 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+Files:     build-aux/git-version-gen
+Copyright: 2007-2013 Free Software Foundation, Inc.
+License:   GPL-3+
+ 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,
+ 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 <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/meson.build b/meson.build
index fde7580..edc1835 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,6 @@
 project('msitools',
   'c', 'vala',
   version: run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), 
check: true).stdout().strip(),
-  license: 'LGPL-2+',
   meson_version: '>= 0.52',
 )
 meson.add_dist_script('build-aux/meson-dist', meson.project_version(), meson.source_root())


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]