From 902dc519d96be582088e5fe0644cefac7ecc0133 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:58:11 +0100 Subject: Move COPYING.full+lite as COPYING to / Adapted packaging scripts: debian/roll-tarballs.sh nx-libs.spec --- COPYING | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/COPYING.full+lite | 55 ------------------------------------------------ debian/roll-tarballs.sh | 1 - nx-libs.spec | 11 ++++++---- 4 files changed, 62 insertions(+), 60 deletions(-) create mode 100644 COPYING delete mode 100644 debian/COPYING.full+lite diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..a2b32ef06 --- /dev/null +++ b/COPYING @@ -0,0 +1,55 @@ +The software components were originally downloaded from http://www.nomachine.com/sources.php + +The software has been improved via various patches by the X2Go project. +The patches reside in the subfolder doc/applied-patches/ of this source tree. + +Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org/. +Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. + + 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 Street, Fifth Floor, Boston, MA 02110-1301 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 + +The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. diff --git a/debian/COPYING.full+lite b/debian/COPYING.full+lite deleted file mode 100644 index a2b32ef06..000000000 --- a/debian/COPYING.full+lite +++ /dev/null @@ -1,55 +0,0 @@ -The software components were originally downloaded from http://www.nomachine.com/sources.php - -The software has been improved via various patches by the X2Go project. -The patches reside in the subfolder doc/applied-patches/ of this source tree. - -Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org/. -Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. - - 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 Street, Fifth Floor, Boston, MA 02110-1301 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 - -The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index fcb83679c..c7cac5f08 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -96,7 +96,6 @@ else echo ${file##*/} >> doc/applied-patches/series done fi -cp -v debian/COPYING.full+lite COPYING # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then diff --git a/nx-libs.spec b/nx-libs.spec index 5c1064f33..f4084d9f2 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -768,7 +768,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files %defattr(-,root,root) -%doc nx-X11/{COPYING,LICENSE,README} +%doc COPYING +%doc nx-X11/README %dir %{_libdir}/nx %dir %{_libdir}/nx/X11 %dir %{_datadir}/nx @@ -913,7 +914,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libXcomp3 %defattr(-,root,root) -%doc nxcomp/{COPYING,LICENSE,README} +%doc COPYING +%doc nxcomp/README %_libdir/libXcomp.so.3* %files -n libXcompext-devel @@ -924,7 +926,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libXcompext3 %defattr(-,root,root) -%doc nxcompext/{COPYING,LICENSE,README} +%doc COPYING +%doc nxcompext/README %_libdir/libXcompext.so.3* %files -n libXcompshad-devel @@ -944,7 +947,7 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libXcompshad3 %defattr(-,root,root) -%doc nxcompshad/{COPYING,LICENSE} +%doc COPYING %_libdir/libXcompshad.so.3* %files devel -- cgit v1.2.3