Commit 4537ad4c authored by Mihai Moldovan's avatar Mihai Moldovan

Refresh:

- 0016_nx-X11_install-location.debian.patch - 9900-dxpc-license-history.full+lite.patch
parent c2b050e3
...@@ -25,6 +25,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low ...@@ -25,6 +25,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
environment. environment.
* debian/x2goagent.install: * debian/x2goagent.install:
- Add new x2goagent.options file. - Add new x2goagent.options file.
* Refresh:
- 0016_nx-X11_install-location.debian.patch
- 9900-dxpc-license-history.full+lite.patch
[ Mike Gabriel ] [ Mike Gabriel ]
* debian/libxinerama1.postinst.in: * debian/libxinerama1.postinst.in:
......
...@@ -6,7 +6,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> ...@@ -6,7 +6,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-12-31 Last-Update: 2012-12-31
--- a/nx-X11/config/cf/Imake.tmpl --- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl
@@ -829,7 +829,7 @@ @@ -832,7 +832,7 @@ TCLIBDIR = TclLibDir
#define AlternateUsrLibDir YES #define AlternateUsrLibDir YES
#endif #endif
#else #else
......
...@@ -21,9 +21,6 @@ Subject: [PATCH 3/3] Document retroactive re-licensing of the original DXPC ...@@ -21,9 +21,6 @@ Subject: [PATCH 3/3] Document retroactive re-licensing of the original DXPC
create mode 100644 doc/DXPC_re-licensed::debbug_784565.mbox create mode 100644 doc/DXPC_re-licensed::debbug_784565.mbox
create mode 100644 nxcomp/README.on-retroactive-DXPC-license create mode 100644 nxcomp/README.on-retroactive-DXPC-license
diff --git a/doc/DXPC_re-licensed::debbug_784565.mbox b/doc/DXPC_re-licensed::debbug_784565.mbox
new file mode 100644
index 0000000..be81324
--- /dev/null --- /dev/null
+++ b/doc/DXPC_re-licensed::debbug_784565.mbox +++ b/doc/DXPC_re-licensed::debbug_784565.mbox
@@ -0,0 +1,3769 @@ @@ -0,0 +1,3769 @@
...@@ -3796,8 +3793,6 @@ index 0000000..be81324 ...@@ -3796,8 +3793,6 @@ index 0000000..be81324
+ +
+ +
+ +
diff --git a/nxcomp/LICENSE b/nxcomp/LICENSE
index 2b32034..02ab0e2 100644
--- a/nxcomp/LICENSE --- a/nxcomp/LICENSE
+++ b/nxcomp/LICENSE +++ b/nxcomp/LICENSE
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
...@@ -3807,7 +3802,7 @@ index 2b32034..02ab0e2 100644 ...@@ -3807,7 +3802,7 @@ index 2b32034..02ab0e2 100644
NXCOMP library and NX extensions to X are copyright of NoMachine. NXCOMP library and NX extensions to X are copyright of NoMachine.
Redistribution and use of this software is allowed according to the Redistribution and use of this software is allowed according to the
@@ -18,6 +19,8 @@ along with this program; if not, you can request a copy to NoMachine @@ -18,6 +19,8 @@ along with this program; if not, you can
or write to the Free Software Foundation, Inc., 59 Temple Place, Suite or write to the Free Software Foundation, Inc., 59 Temple Place, Suite
330, Boston, MA 02111-1307 USA 330, Boston, MA 02111-1307 USA
...@@ -3816,7 +3811,7 @@ index 2b32034..02ab0e2 100644 ...@@ -3816,7 +3811,7 @@ index 2b32034..02ab0e2 100644
Parts of this software are derived from DXPC project. These copyright Parts of this software are derived from DXPC project. These copyright
notices apply to original DXPC code: notices apply to original DXPC code:
@@ -29,9 +32,59 @@ THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED @@ -29,9 +32,59 @@ THIS SOFTWARE IS PROVIDED ``AS IS'' AND
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
...@@ -3826,8 +3821,8 @@ index 2b32034..02ab0e2 100644 ...@@ -3826,8 +3821,8 @@ index 2b32034..02ab0e2 100644
Copyright (c) 1999 Kevin Vigor and Brian Pane Copyright (c) 1999 Kevin Vigor and Brian Pane
-Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane -Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane
+<crossed-out>Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane</crossed-out> +<crossed-out>Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane</crossed-out>
+
+All rights reserved. All rights reserved.
+ +
+============================================================================== +==============================================================================
+ +
...@@ -3844,7 +3839,7 @@ index 2b32034..02ab0e2 100644 ...@@ -3844,7 +3839,7 @@ index 2b32034..02ab0e2 100644
+crossed-out his name in the above copyright notice and moved him to the +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 +top list of copyright holders associated with the GPL-2 re-licensing done
+by NoMachine. +by NoMachine.
+
+Thus, the version of DXPC where NXCOMP got forked from (most likely some +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 +DXPC version between release 3.7.0 and release 3.8.0) can be considered
+as BSD-2-clause, as quoted below: +as BSD-2-clause, as quoted below:
...@@ -3852,7 +3847,7 @@ index 2b32034..02ab0e2 100644 ...@@ -3852,7 +3847,7 @@ index 2b32034..02ab0e2 100644
+Copyright (c) 1995,1996 Brian Pane +Copyright (c) 1995,1996 Brian Pane
+Copyright (c) 1996,1997 Zachary Vonler and Brian Pane +Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+Copyright (c) 1999-2002 Kevin Vigor and Brian Pane +Copyright (c) 1999-2002 Kevin Vigor and Brian Pane
All rights reserved. +All rights reserved.
+ +
+Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are met:
...@@ -3878,8 +3873,6 @@ index 2b32034..02ab0e2 100644 ...@@ -3878,8 +3873,6 @@ index 2b32034..02ab0e2 100644
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE. +DAMAGE.
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 0095eaa..5d53524 100644
--- a/nxcomp/Misc.cpp --- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp +++ b/nxcomp/Misc.cpp
@@ -384,9 +384,9 @@ static const char CopyrightInfo[] = @@ -384,9 +384,9 @@ static const char CopyrightInfo[] =
...@@ -3895,9 +3888,6 @@ index 0095eaa..5d53524 100644 ...@@ -3895,9 +3888,6 @@ index 0095eaa..5d53524 100644
\n\ \n\
Check http://www.nomachine.com/licensing.html for applicability.\n\ Check http://www.nomachine.com/licensing.html for applicability.\n\
\n\ \n\
diff --git a/nxcomp/README.on-retroactive-DXPC-license b/nxcomp/README.on-retroactive-DXPC-license
new file mode 100644
index 0000000..d7fc8c5
--- /dev/null --- /dev/null
+++ b/nxcomp/README.on-retroactive-DXPC-license +++ b/nxcomp/README.on-retroactive-DXPC-license
@@ -0,0 +1,269 @@ @@ -0,0 +1,269 @@
...@@ -4170,6 +4160,3 @@ index 0000000..d7fc8c5 ...@@ -4170,6 +4160,3 @@ index 0000000..d7fc8c5
+I can confirm that Gian Fillippo never contributed directly to DXPC. +I can confirm that Gian Fillippo never contributed directly to DXPC.
+You'll note his name does not appear in the DXPC README, and never has. +You'll note his name does not appear in the DXPC README, and never has.
+""" +"""
--
2.1.4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment