forked from pool/tigervnc
144 lines
6.2 KiB
Diff
144 lines
6.2 KiB
Diff
|
--- o/LICENCE.TXT 2011-08-09 23:16:48.000000000 +0200
|
|||
|
+++ n/LICENCE.TXT 2010-09-08 17:52:33.000000000 +0200
|
|||
|
@@ -1,12 +1,12 @@
|
|||
|
- GNU GENERAL PUBLIC LICENSE
|
|||
|
- Version 2, June 1991
|
|||
|
+ GNU GENERAL PUBLIC LICENSE
|
|||
|
+ Version 2, June 1991
|
|||
|
|
|||
|
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|||
|
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|||
|
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
|||
|
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
Everyone is permitted to copy and distribute verbatim copies
|
|||
|
of this license document, but changing it is not allowed.
|
|||
|
|
|||
|
- Preamble
|
|||
|
+ Preamble
|
|||
|
|
|||
|
The licenses for most software are designed to take away your
|
|||
|
freedom to share and change it. By contrast, the GNU General Public
|
|||
|
@@ -15,7 +15,7 @@
|
|||
|
General Public License applies to most of the Free Software
|
|||
|
Foundation's software and to any other program whose authors commit to
|
|||
|
using it. (Some other Free Software Foundation software is covered by
|
|||
|
-the GNU Library General Public License instead.) You can apply it to
|
|||
|
+the GNU Lesser General Public License instead.) You can apply it to
|
|||
|
your programs, too.
|
|||
|
|
|||
|
When we speak of free software, we are referring to freedom, not
|
|||
|
@@ -55,8 +55,8 @@
|
|||
|
|
|||
|
The precise terms and conditions for copying, distribution and
|
|||
|
modification follow.
|
|||
|
-
|
|||
|
- GNU GENERAL PUBLIC LICENSE
|
|||
|
+
|
|||
|
+ GNU GENERAL PUBLIC LICENSE
|
|||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|||
|
|
|||
|
0. This License applies to any program or other work which contains
|
|||
|
@@ -110,7 +110,7 @@
|
|||
|
License. (Exception: if the Program itself is interactive but
|
|||
|
does not normally print such an announcement, your work based on
|
|||
|
the Program is not required to print an announcement.)
|
|||
|
-
|
|||
|
+
|
|||
|
These requirements apply to the modified work as a whole. If
|
|||
|
identifiable sections of that work are not derived from the Program,
|
|||
|
and can be reasonably considered independent and separate works in
|
|||
|
@@ -168,7 +168,7 @@
|
|||
|
access to copy the source code from the same place counts as
|
|||
|
distribution of the source code, even though third parties are not
|
|||
|
compelled to copy the source along with the object code.
|
|||
|
-
|
|||
|
+
|
|||
|
4. You may not copy, modify, sublicense, or distribute the Program
|
|||
|
except as expressly provided under this License. Any attempt
|
|||
|
otherwise to copy, modify, sublicense or distribute the Program is
|
|||
|
@@ -225,7 +225,7 @@
|
|||
|
|
|||
|
This section is intended to make thoroughly clear what is believed to
|
|||
|
be a consequence of the rest of this License.
|
|||
|
-
|
|||
|
+
|
|||
|
8. If the distribution and/or use of the Program is restricted in
|
|||
|
certain countries either by patents or by copyrighted interfaces, the
|
|||
|
original copyright holder who places the Program under this License
|
|||
|
@@ -255,7 +255,7 @@
|
|||
|
of preserving the free status of all derivatives of our free software and
|
|||
|
of promoting the sharing and reuse of software generally.
|
|||
|
|
|||
|
- NO WARRANTY
|
|||
|
+ NO WARRANTY
|
|||
|
|
|||
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|||
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|||
|
@@ -277,9 +277,9 @@
|
|||
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|||
|
POSSIBILITY OF SUCH DAMAGES.
|
|||
|
|
|||
|
- END OF TERMS AND CONDITIONS
|
|||
|
-
|
|||
|
- Appendix: How to Apply These Terms to Your New Programs
|
|||
|
+ END OF TERMS AND CONDITIONS
|
|||
|
+
|
|||
|
+ How to Apply These Terms to Your New Programs
|
|||
|
|
|||
|
If you develop a new program, and you want it to be of the greatest
|
|||
|
possible use to the public, the best way to achieve this is to make it
|
|||
|
@@ -291,7 +291,7 @@
|
|||
|
the "copyright" line and a pointer to where the full notice is found.
|
|||
|
|
|||
|
<one line to give the program's name and a brief idea of what it does.>
|
|||
|
- Copyright (C) 19yy <name of author>
|
|||
|
+ Copyright (C) <year> <name of author>
|
|||
|
|
|||
|
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
|
|||
|
@@ -303,17 +303,16 @@
|
|||
|
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.
|
|||
|
+ 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.
|
|||
|
|
|||
|
Also add information on how to contact you by electronic and paper mail.
|
|||
|
|
|||
|
If the program is interactive, make it output a short notice like this
|
|||
|
when it starts in an interactive mode:
|
|||
|
|
|||
|
- Gnomovision version 69, Copyright (C) 19yy name of author
|
|||
|
+ Gnomovision version 69, Copyright (C) year name of author
|
|||
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|||
|
This is free software, and you are welcome to redistribute it
|
|||
|
under certain conditions; type `show c' for details.
|
|||
|
@@ -336,5 +335,5 @@
|
|||
|
This General Public License does not permit incorporating your program into
|
|||
|
proprietary programs. If your program is a subroutine library, you may
|
|||
|
consider it more useful to permit linking proprietary applications with the
|
|||
|
-library. If this is what you want to do, use the GNU Library General
|
|||
|
+library. If this is what you want to do, use the GNU Lesser General
|
|||
|
Public License instead of this License.
|
|||
|
--- o/unix/vncserver 2011-08-09 23:16:37.000000000 +0200
|
|||
|
+++ n/unix/vncserver 2012-03-01 22:35:29.692130619 +0100
|
|||
|
@@ -16,10 +16,9 @@
|
|||
|
# 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 software; if not, write to the Free Software
|
|||
|
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|||
|
-# USA.
|
|||
|
+# 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.
|
|||
|
#
|
|||
|
|
|||
|
#
|