From d38ccd197413f6fad830c314d904904368d3770d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 10:33:08 +0200 Subject: LICENSE files: Have a main LICENSE file and one for nxcomp in the project's base folder. Drop other LICENSE files added by NoMachine scattered all over the code tree. --- LICENSE | 26 +++++++++ LICENSE.nxcomp | 90 ++++++++++++++++++++++++++++++ nx-X11/LICENSE | 26 --------- nx-X11/programs/Xserver/hw/nxagent/LICENSE | 26 --------- nxcomp/LICENSE | 90 ------------------------------ nxcompext/LICENSE | 21 ------- nxcompshad/LICENSE | 22 -------- nxproxy/LICENSE | 36 ------------ 8 files changed, 116 insertions(+), 221 deletions(-) create mode 100644 LICENSE create mode 100644 LICENSE.nxcomp delete mode 100644 nx-X11/LICENSE delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/LICENSE delete mode 100644 nxcomp/LICENSE delete mode 100644 nxcompext/LICENSE delete mode 100644 nxcompshad/LICENSE delete mode 100644 nxproxy/LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..32cb52b45 --- /dev/null +++ b/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. + +NX-X11 and NX extensions to X are copyright of NoMachine. + +Redistribution and use of this software is allowed according to the +following terms: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License Version 2, and +not any other version, as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- +BILITY 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, you can request a copy to NoMachine +or write to the Free Software Foundation, Inc., 59 Temple Place, +Suite 330, Boston, MA 02111-1307 USA + +Parts of this software are derived from XFree86 and X.org projects. +Other copyrights and the MIT/X11 license applies to different sources. +Please check the applicable copyrights in each file or subdirectory. + +All rights reserved. diff --git a/LICENSE.nxcomp b/LICENSE.nxcomp new file mode 100644 index 000000000..02ab0e272 --- /dev/null +++ b/LICENSE.nxcomp @@ -0,0 +1,90 @@ +Copyright (c) 2001,2010 NoMachine - http://www.nomachine.com/. +Copyright (c) 2000,2003 Gian Filippo Pinzari + +NXCOMP library and NX extensions to X are copyright of NoMachine. +Redistribution and use of this software is allowed according to the +following terms: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License Version 2, and +not any other version, as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- +BILITY 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, you can request a copy to NoMachine +or write to the Free Software Foundation, Inc., 59 Temple Place, Suite +330, Boston, MA 02111-1307 USA + +============================================================================== + +Parts of this software are derived from DXPC project. These copyright +notices apply to original DXPC code: + +Redistribution and use in source and binary forms are permitted provi- +ded that the above copyright notice and this paragraph are duplicated +in all such forms. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +Copyright (c) 1995,1996,2000,2006 Brian Pane +Copyright (c) 1996,1997 Zachary Vonler and Brian Pane +Copyright (c) 1999 Kevin Vigor and Brian Pane +Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane + +All rights reserved. + +============================================================================== + +Update 2015-05-21 on the nature of the original DXPC license: The +original DXPC code used to be available under a license which failed to +explicitly grant the permission to modify, but was later retroactively +re-licensed under the 2-clause BSD license (see +README.on-retroactive-DXPC-license for the copyright owners' statements; +see for more details). + +In the course of discussion, it also became evident that Gian Filippo +Pinzari never participated in any of the official DXPC releases, but +rather worked on the forked code on the NoMachine side. Thus, we +crossed-out his name in the above copyright notice and moved him to the +top list of copyright holders associated with the GPL-2 re-licensing done +by NoMachine. + +Thus, the version of DXPC where NXCOMP got forked from (most likely some +DXPC version between release 3.7.0 and release 3.8.0) can be considered +as BSD-2-clause, as quoted below: + +Copyright (c) 1995,1996 Brian Pane +Copyright (c) 1996,1997 Zachary Vonler and Brian Pane +Copyright (c) 1999-2002 Kevin Vigor and Brian Pane +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/nx-X11/LICENSE b/nx-X11/LICENSE deleted file mode 100644 index 32cb52b45..000000000 --- a/nx-X11/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. - -NX-X11 and NX extensions to X are copyright of NoMachine. - -Redistribution and use of this software is allowed according to the -following terms: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2, and -not any other version, as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- -BILITY 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, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA - -Parts of this software are derived from XFree86 and X.org projects. -Other copyrights and the MIT/X11 license applies to different sources. -Please check the applicable copyrights in each file or subdirectory. - -All rights reserved. diff --git a/nx-X11/programs/Xserver/hw/nxagent/LICENSE b/nx-X11/programs/Xserver/hw/nxagent/LICENSE deleted file mode 100644 index 8446e6f55..000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. - -NXAGENT and NX extensions to X are copyright of NoMachine. - -Redistribution and use of this software is allowed according to the -following terms: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2, and -not any other version, as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- -BILITY 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, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA - -Parts of this software are derived from XFree86 and X.org projects. -Other copyrights and the MIT/X11 license applies to different sources. -Please check the applicable copyrights in each file or subdirectory. - -All rights reserved. diff --git a/nxcomp/LICENSE b/nxcomp/LICENSE deleted file mode 100644 index 02ab0e272..000000000 --- a/nxcomp/LICENSE +++ /dev/null @@ -1,90 +0,0 @@ -Copyright (c) 2001,2010 NoMachine - http://www.nomachine.com/. -Copyright (c) 2000,2003 Gian Filippo Pinzari - -NXCOMP library and NX extensions to X are copyright of NoMachine. -Redistribution and use of this software is allowed according to the -following terms: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2, and -not any other version, as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- -BILITY 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, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, Suite -330, Boston, MA 02111-1307 USA - -============================================================================== - -Parts of this software are derived from DXPC project. These copyright -notices apply to original DXPC code: - -Redistribution and use in source and binary forms are permitted provi- -ded that the above copyright notice and this paragraph are duplicated -in all such forms. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - -Copyright (c) 1995,1996,2000,2006 Brian Pane -Copyright (c) 1996,1997 Zachary Vonler and Brian Pane -Copyright (c) 1999 Kevin Vigor and Brian Pane -Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane - -All rights reserved. - -============================================================================== - -Update 2015-05-21 on the nature of the original DXPC license: The -original DXPC code used to be available under a license which failed to -explicitly grant the permission to modify, but was later retroactively -re-licensed under the 2-clause BSD license (see -README.on-retroactive-DXPC-license for the copyright owners' statements; -see for more details). - -In the course of discussion, it also became evident that Gian Filippo -Pinzari never participated in any of the official DXPC releases, but -rather worked on the forked code on the NoMachine side. Thus, we -crossed-out his name in the above copyright notice and moved him to the -top list of copyright holders associated with the GPL-2 re-licensing done -by NoMachine. - -Thus, the version of DXPC where NXCOMP got forked from (most likely some -DXPC version between release 3.7.0 and release 3.8.0) can be considered -as BSD-2-clause, as quoted below: - -Copyright (c) 1995,1996 Brian Pane -Copyright (c) 1996,1997 Zachary Vonler and Brian Pane -Copyright (c) 1999-2002 Kevin Vigor and Brian Pane -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. diff --git a/nxcompext/LICENSE b/nxcompext/LICENSE deleted file mode 100644 index 12eb6576c..000000000 --- a/nxcompext/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/. - -NXCOMPEXT library and NX extensions to X are copyright of NoMachine. -Redistribution and use of this software is allowed according to the -following terms: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2, and -not any other version, as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- -BILITY 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, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA - -All rights reserved. diff --git a/nxcompshad/LICENSE b/nxcompshad/LICENSE deleted file mode 100644 index 2c7f95a2d..000000000 --- a/nxcompshad/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. - -NXCOMPSHAD and NX extensions to X are copyright of NoMachine. - -Redistribution and use of this software is allowed according to the -following terms: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2, and -not any other version, as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- -BILITY 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, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA - -All rights reserved. diff --git a/nxproxy/LICENSE b/nxproxy/LICENSE deleted file mode 100644 index 64522ca4c..000000000 --- a/nxproxy/LICENSE +++ /dev/null @@ -1,36 +0,0 @@ -Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. - -NXPROXY and NX extensions to this software are copyright of NoMachine. -Redistribution and use of this software is allowed according to the -following terms: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2, and -not any other version, as published by the Free Software Foundation. - -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 - -Parts of this software are derived from DXPC project. These copyright -notices apply to original DXPC code: - -Redistribution and use in source and binary forms are permitted provided -that the above copyright notice and this paragraph are duplicated in all -such forms. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - -Copyright (c) 1995,1996 Brian Pane -Copyright (c) 1996,1997 Zachary Vonler and Brian Pane -Copyright (c) 1999 Kevin Vigor and Brian Pane -Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane - -All rights reserved. -- cgit v1.2.3