aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.NX-development32
-rw-r--r--debian/patches/000_add-NX-redistribution-README.full+lite.patch48
-rw-r--r--debian/patches/series1
3 files changed, 32 insertions, 49 deletions
diff --git a/README.NX-development b/README.NX-development
new file mode 100644
index 000000000..50bc505a6
--- /dev/null
+++ b/README.NX-development
@@ -0,0 +1,32 @@
+NX development by ArcticaProject and X2Go
+-----------------------------------------
+
+This source tree started as a re-distribution of those NX packages needed
+to setup FreeNX and/or X2Go on a Linux server.
+
+The NX re-distribution (3.5.0.x) has been maintained by the X2Go Project:
+http://wiki.x2go.org
+
+Since 2015, the Arctica Project has joined in the NX development. The
+core devs of X2Go and Arctica have agreed on stopping to redistribute
+NX and instead of that: continue the development of NX 3.x as new
+upstream (starting with NX 3.5.99).
+
+Our goal is:
+ - provide _one_ tarball that builds NX projects via a common Makefile
+ - provide _one_ tarball for distribution packagers
+ - provide support for security issues
+ - provide support for latest X11 extensions
+ - improve NX where possible
+
+This source tree is maintained on Github:
+
+ https://github.com/ArcticaProject/nx-libs (3.6.x branch)
+
+
+If you have any questions about this NX development or want to file a
+bug, then please contact the Arctica or the X2Go developers via the
+Github issue tracker.
+
+thanks+light+love, 20150209
+Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
diff --git a/debian/patches/000_add-NX-redistribution-README.full+lite.patch b/debian/patches/000_add-NX-redistribution-README.full+lite.patch
deleted file mode 100644
index 3e1f2e878..000000000
--- a/debian/patches/000_add-NX-redistribution-README.full+lite.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Add README.NX-redistributed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
---- /dev/null
-+++ b/README.NX-redistributed
-@@ -0,0 +1,42 @@
-+NX redistribution by X2Go
-+-------------------------
-+This source tree is a re-distribution of those NX packages needed to
-+setup FreeNX and/or X2Go on a Linux server.
-+
-+The NX re-distribution currently is maintained by the X2Go Project:
-+http://wiki.x2go.org
-+
-+Our goal is:
-+ - provide _one_ tarball that builds NX projects via a common Makefile
-+ - provide _one_ tarball for distribution packagers
-+
-+This re-distribution contains the following tarballs derived from
-+NoMachine (http://www.nomachine.com/sources.php):
-+
-+ nxcomp
-+ nxcompext
-+ nxcompshad
-+ nxproxy
-+ nx-X11
-+ nxagent
-+ nxauth
-+
-+The patches we apply are shipped with this tarball, for further introspection
-+please refer to this folder:
-+
-+ doc/applied-patches
-+
-+This source tree is maintained on the X2Go Git server:
-+Browsing... http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
-+Git-Cloning... git clone git://code.x2go.org/nx-libs.git
-+
-+If you have any questions about this NX redistribution or want to file
-+a bug, then please contact the X2Go developers on
-+
-+ x2go-dev@lists.berlios.de
-+
-+The X2Go-Dev mailing list requires subscription before you can post to it:
-+http://lists.berlios.de/mailman/listinfo/x2go-dev
-+
-+thanks+light+love
-+Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
diff --git a/debian/patches/series b/debian/patches/series
index e6398bc19..4eb064ea0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-000_add-NX-redistribution-README.full+lite.patch
002_nxcompshad_build-against-nx-x11-only.full.patch
003_nxcompshad_gcc43.full.patch
004_nx-X11_fix-nxcompshad-build.full.patch