Merge branch 'sunweaver-pr/drop-x2goagent' into 3.6.x

Attributes GH PR #145: https://github.com/ArcticaProject/nx-libs/pull/145
Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  -- Wed, 29 Jun 2016 11:22:30 +0200

21 files changed, 46 insertions, 245 deletions

diff --git a/Makefile b/Makefile
index c9a52ac02..e2077ed5b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,12 @@ RM_FILE=rm -f
 RM_DIR=rmdir -p --ignore-fail-on-non-empty
 
 ETCDIR_NX   ?= /etc/nxagent
-ETCDIR_X2GO ?= /etc/x2go
 PREFIX      ?= /usr/local
 BINDIR      ?= $(PREFIX)/bin
 LIBDIR      ?= $(PREFIX)/lib
 USRLIBDIR   ?= $(LIBDIR)
 INCLUDEDIR  ?= $(PREFIX)/include
 NXLIBDIR    ?= $(PREFIX)/lib/nx
-X2GOLIBDIR  ?= $(PREFIX)/lib/x2go
-X2GODATADIR  ?= $(PREFIX)/share/x2go
 CONFIGURE   ?= ./configure
 
 NX_VERSION_MAJOR=$(shell ./version.sh 1)
@@ -98,30 +95,22 @@ install-lite:
 	gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
 
 install-full:
-	for f in nxagent nxauth x2goagent; do \
+	for f in nxagent nxauth; do \
 	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
 	for d in nxcompext nxcompshad; do \
 	   $(MAKE) -C $$d install; done
 
-	$(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
-	cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf $(NXLIBDIR)/bin/nxagent x2goagent
-
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
-	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx
 	$(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx
 
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go/versions
-	$(INSTALL_FILE) VERSION.x2goagent $(DESTDIR)$(PREFIX)/share/x2go/versions
-
 	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
 	$(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin
 	$(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
-	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nx-X11/programs/nxauth/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/
 	mv -f $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.1
@@ -156,23 +145,14 @@ install-full:
 	    done; \
 
 	$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX)
-	$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)
 	$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/
-	$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_X2GO)/
-	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR_X2GO)/
 	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR_NX)/
 	$(INSTALL_FILE) etc/nxagent.keyboard $(DESTDIR)$(ETCDIR_NX)/
-	$(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR_X2GO)/
-
-	# x2goagent.features file for X2Go
-	$(INSTALL_DIR) $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
-	$(INSTALL_FILE) x2goagent.features $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
-
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go
-	$(INSTALL_SYMLINK) $(ETCDIR_X2GO)/rgb $(DESTDIR)$(PREFIX)/share/x2go/rgb
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx
 	$(INSTALL_SYMLINK) $(ETCDIR_NX)/rgb $(DESTDIR)$(PREFIX)/share/nx/rgb
+	$(INSTALL_FILE) VERSION $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxagent
+	$(INSTALL_FILE) VERSION $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxproxy
 
 uninstall:
 	$(MAKE) uninstall-lite
@@ -188,17 +168,15 @@ uninstall-lite:
 	$(RM_FILE) $(DESTDIR)$(NXLIBDIR)/bin/nxproxy
 	$(RM_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
 	$(RM_FILE) $(DESTDIR)$(PREFIX)/share/man/man1/*.1
+	$(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxproxy
+	$(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/
 
 uninstall-full:
-	for f in nxagent nxauth x2goagent; do \
+	for f in nxagent nxauth; do \
 	    $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done
 
-	$(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
-	$(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
-
-	# x2goagent.features file for X2Go
-	$(RM_FILE) $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/x2goagent.features
-	$(RM_DIR)  $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
+	$(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxagent
+	$(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/
 
 	if test -d nx-X11; then \
 	    if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
diff --git a/VERSION.x2goagent b/VERSION.x2goagent
deleted file mode 120000
index 974cf28e0..000000000
--- a/VERSION.x2goagent
+++ /dev/null
@@ -1 +0,0 @@
-VERSION
\ No newline at end of file
diff --git a/bin/x2goagent b/bin/x2goagent
deleted file mode 100644
index 09011efbe..000000000
--- a/bin/x2goagent
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# 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 3 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, see http://www.gnu.org/licenses/.
-
-NXAPP=x2goagent
-NX_LIBS=/usr/lib/nx
-NX_LOCAL_LIBS=/usr/local/lib/nx
-
-# make sure nxagent starts properly with pam_tmpdir.so being in use
-NX_TEMP=${NX_TEMP:-/tmp}
-export NX_TEMP
-
-test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-
-exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
diff --git a/debian/README.source b/debian/README.source
index 800a55d8a..a43fa1de5 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,12 +1,12 @@
 UPSTREAM SOURCES
 ----------------
-The current upstream source for this package is NoMachine.
-http://www.nomachine.com/sources.php
+The current upstream source for this package is the Arctica Project.
+https://github.com/ArcticaProject/nx-libs
 
 
 PACKAGE SOURCE TREE
 -------------------
-This package pulls in 7 source tarballs from NoMachine:
+This package originally pulled in 7 source tarballs from NoMachine:
 
   nx-X11
   nxagent
@@ -16,26 +16,5 @@ This package pulls in 7 source tarballs from NoMachine:
   nxcompext
   nxproxy
 
-Intensive tests with X2Go/FreeNX on Debian squeeze+ systems showed an extreme
-instability of nxagent when the named sources had been built separately against the
-distribution's Xorg & co. libraries.
 
-The recommended build method by NoMachine is placing the above projects into one
-big source tree and build them in one go. When this build method is chosen,
-the instability issues of nxagent (and x2goagent) disappear.
-
-Unfortunately, so far we could not track down the exact problem of building the
-above sources in separate packages.
-
-
-PATCH SYSTEM
-------------
-This package uses quilt to manage all modifications to the upstream source.
-Changes are stored in the source package as diffs in debian/patches and
-applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
-
-
-X2Go Packaging Team / Mike Gabriel (20111231)
\ No newline at end of file
+Arctica Project / Mike Gabriel (2016-06-22)
\ No newline at end of file
diff --git a/debian/control b/debian/control
index a621bddd7..2344dd37f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,10 @@
 Source: nx-libs
 Section: x11
 Priority: extra
-Maintainer: X2Go Developers <x2go-dev@lists.berlios.de>
+Maintainer: Artica Project <devs@lists.arctica-project.org>
 Uploaders:
- Reinhard Tartler <siretart@tauware.de>,
  Mike Gabriel <mike.gabriel@das-netzwerkteam.de>,
- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>,
+ Mihai Moldovan <ionic@ionic.de>
 Build-Depends:
  debhelper (>= 7.0.50~),
  libpng-dev,
@@ -30,9 +29,9 @@ Build-Depends:
  expat,
  libpixman-1-dev (>= 0.13.2),
 Standards-Version: 3.9.6
-Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
-Vcs-Git: git://code.x2go.org/nx-libs.git
-Vcs-Browser: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
+Homepage: https://github.com/ArcticaProject/nx-libs/
+Vcs-Git: https://github.com/ArcticaProject/nx-libs/
+Vcs-Browser: https://github.com/ArcticaProject/nx-libs/
 
 Package: nx-x11-common
 Architecture: all
@@ -40,8 +39,8 @@ Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11 (<< 2:3.5.0.29-0x2go2~),
-        nxagent (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11 (<< 2:3.5.0.29-1~),
+        nxagent (<< 2:3.5.0.29-1~),
 Description: nx-X11 (common files)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -55,7 +54,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11-dev (<< 2:3.5.0.29-1~),
 Description: nx-X11 core wire protocol and auxiliary headers
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -89,7 +88,7 @@ Depends:
  ${misc:Depends},
  nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), 
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11 (<< 2:3.5.0.29-1~),
 Replaces: nxlibs,
 Description: nx-X11 client-side library
  NX is a software suite which implements very efficient
@@ -125,7 +124,7 @@ Depends:
  libnx-x11-6 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Replaces: nx-x11-dbg,
 Description: nx-X11 client-side library (debug package)
  NX is a software suite which implements very efficient
@@ -144,7 +143,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11 (<< 2:3.5.0.29-1~),
 Description: nx-X11 authorisation library
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -163,7 +162,7 @@ Depends:
  libnx-xau6 (= ${binary:Version}),
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11-dev (<< 2:3.5.0.29-1~),
 Description: nx-X11 authorisation library (development headers)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -184,7 +183,7 @@ Depends:
  libnx-xau6 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: nx-X11 authorisation library (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -239,7 +238,7 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11-dev (<< 2:3.5.0.29-1~),
 Description: nx-X11 Composite extension wire protocol
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -402,7 +401,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11 (<< 2:3.5.0.29-1~),
 Description: nx-X11 miscellaneous extension library
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -424,7 +423,7 @@ Depends:
  nx-x11proto-xext-dev (= ${binary:Version}),
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11-dev (<< 2:3.5.0.29-1~),
 Description: nx-X11 miscellaneous extension library (development headers)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -443,7 +442,7 @@ Depends:
  libnx-xext6 (= ${binary:Version}),
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11-dev (<< 2:3.5.0.29-1~),
         libnx-xext-dev (<< 2:3.5.99.0~),
 Description: nx-X11 miscellaneous extension wire protocol
  NX is a software suite which implements very efficient
@@ -463,7 +462,7 @@ Depends:
  libnx-xext6 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: nx-X11 miscellaneous extension library (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -516,7 +515,7 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+        libnx-x11-dev (<< 2:3.5.0.29-1~),
 Description: nx-X11 'xfixes' extension wire protocol
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -604,7 +603,7 @@ Depends:
  libnx-xinerama1 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: nx-X11 Xinerama extension library (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -661,7 +660,7 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: nx-X11 pixmap library (debug package, dummy package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -919,7 +918,7 @@ Multi-Arch: foreign
 Depends:
  nxagent (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: NX agent (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -934,28 +933,6 @@ Description: NX agent (debug package)
  helpful backtraces. You can safely remove it if you do not intend to
  debug NX packages on this system.
 
-Package: x2goagent
-Architecture: all
-Depends:
- nxagent (>= ${source:Version}), nxagent (<< ${source:Version}.1),
- ${misc:Depends},
-Suggests:
- x2goserver
-Description: X2Go agent
- X2Go is a software suite that uses NX technology for remote desktop
- computing.
- .
- NX technology implements a very efficient compression of the X11 protocol.
- This increases performance when using X applications over a network,
- especially a slow one.
- .
- X2Go agent functionality has been completely incorporated into NX agent's
- code base. If the nxagent binary is executed under the name of `x2goagent',
- the X2Go functionalities get activated.
- .
- The x2goagent package is a wrapper that activates X2Go branding in nxagent.
- Please refer to the nxagent package's description for more information on NX.
-
 Package: nxproxy
 Architecture: any
 Breaks: qvd-nxproxy
@@ -980,7 +957,7 @@ Depends:
  ${misc:Depends},
 Suggests:
  libxcomp3-dbg,
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: NX proxy (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -1012,7 +989,7 @@ Multi-Arch: foreign
 Depends:
  nxauth (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: NX auth (debug package) 
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -1070,7 +1047,7 @@ Depends:
  libxcomp3 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: nx-X11 compression library (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -1125,7 +1102,7 @@ Depends:
  libxcompext3 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: nx-X11 protocol compression extensions library (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -1179,7 +1156,7 @@ Depends:
  libxcompshad3 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
 Description: nx-X11 shadowing library (debug package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
diff --git a/debian/nxagent.install b/debian/nxagent.install
index eaaa847e9..123971a7c 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,6 +1,7 @@
 etc/nxagent/keystrokes.cfg
 etc/nxagent/rgb
 usr/share/nx/rgb
+usr/share/nx/VERSION.nxagent
 usr/share/man/man1/nxagent.1*
 usr/lib/nx/bin/nxagent
 usr/bin/nxagent
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
index 5a55a9825..ab7c97d58 100644
--- a/debian/nxproxy.install
+++ b/debian/nxproxy.install
@@ -1,3 +1,4 @@
 usr/lib/nx/bin/nxproxy
 usr/bin/nxproxy
 usr/share/man/man1/nxproxy.1*
+usr/share/nx/VERSION.nxproxy
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 52c2090f0..24f7b07b0 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -100,14 +100,13 @@ if [ "x$MODE" = "xfull" ]; then
         echo "${file##*/}" >> "doc/applied-patches/series"
     done
 else
-    rm -f  "bin/"{nxagent,nxauth,x2goagent}
+    rm -f  "bin/"{nxagent,nxauth}
     rm -Rf "nxcompshad"*
     rm -Rf "nxcompext"*
     rm -Rf "nx-X11"*
     rm -Rf "etc"*
     rm -Rf "doc/nx-X11_vs_XOrg69_patches"*
     rm -f  "README.keystrokes"
-    rm -f  "VERSION.x2goagent"
     cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file
     do
         cp -v "debian/patches/$file" "doc/applied-patches/"
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000000000..4ca027c1b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.*\/.*?([\d\.-]+)\.tar\.gz/nx-libs-$1.tar.gz/ \
+https://github.com/ArcticaProject/nx-libs/tags .*/archive/.*?([\d\.]+).tar.gz
diff --git a/debian/watch.nx-X11 b/debian/watch.nx-X11
deleted file mode 100644
index dfe41c643..000000000
--- a/debian/watch.nx-X11
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
-  http://[^"]*/nx-X11-([\d\.-]*)\.tar\.gz
diff --git a/debian/watch.nxagent b/debian/watch.nxagent
deleted file mode 100644
index 7f22764b3..000000000
--- a/debian/watch.nxagent
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
-  http://[^"]*/nxagent-([\d\.-]*)\.tar\.gz
diff --git a/debian/watch.nxauth b/debian/watch.nxauth
deleted file mode 100644
index b505077c0..000000000
--- a/debian/watch.nxauth
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
-  http://[^"]*/nxauth-([\d\.-]*)\.tar\.gz
diff --git a/debian/watch.nxcomp b/debian/watch.nxcomp
deleted file mode 100644
index 75f24916b..000000000
--- a/debian/watch.nxcomp
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
-  http://[^"]*/nxcomp-([\d\.-]*)\.tar\.gz
diff --git a/debian/watch.nxcompext b/debian/watch.nxcompext
deleted file mode 100644
index 67883630e..000000000
--- a/debian/watch.nxcompext
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
-  http://[^"]*/nxcompext-([\d\.-]*)\.tar\.gz
diff --git a/debian/watch.nxcompshad b/debian/watch.nxcompshad
deleted file mode 100644
index 43e2e528a..000000000
--- a/debian/watch.nxcompshad
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
-  http://[^"]*/nxcompshad-([\d\.-]*)\.tar\.gz
diff --git a/debian/watch.nxproxy b/debian/watch.nxproxy
deleted file mode 100644
index bbf27fd2f..000000000
--- a/debian/watch.nxproxy
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
-  http://[^"]*/nxproxy-([\d\.-]*)\.tar\.gz
diff --git a/debian/x2goagent.dirs b/debian/x2goagent.dirs
deleted file mode 100644
index 548ecdfc7..000000000
--- a/debian/x2goagent.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/pixmaps
-usr/share/x2go
diff --git a/debian/x2goagent.install b/debian/x2goagent.install
deleted file mode 100644
index 0603507ef..000000000
--- a/debian/x2goagent.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/bin/x2goagent
-usr/lib/x2go/bin/x2goagent
-usr/share/pixmaps/x2go.xpm
-usr/share/x2go/rgb
-usr/share/man/man1/x2goagent.1*
-etc/x2go/rgb
-usr/share/x2go/versions/VERSION.x2goagent
-usr/share/x2go/x2gofeature.d/x2goagent.features
-etc/x2go/keystrokes.cfg
-etc/x2go/x2goagent.keyboard
diff --git a/etc/x2goagent.keyboard b/etc/x2goagent.keyboard
deleted file mode 100644
index afe283260..000000000
--- a/etc/x2goagent.keyboard
+++ /dev/null
@@ -1 +0,0 @@
-rules=xfree86
diff --git a/nx-libs.spec b/nx-libs.spec
index cf0a25228..770f1870a 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -11,7 +11,7 @@ License:        GPL-2.0+
 %else
 License:        GPLv2+
 %endif
-URL:            http://x2go.org/
+URL:            http://github.com/ArcticaProject/nx-libs/
 Source0:        %{name}-%{version}.tar.gz
 
 BuildRequires:  autoconf >= 2.13
@@ -419,21 +419,6 @@ applications over a network, especially a slow one.
 This package provides the NX proxy (client) binary.
 
 
-%package -n x2goagent
-Group:          Applications/System
-Summary:        X2Go Agent
-Requires:       nxagent
-
-%description -n x2goagent
-X2Go Agent functionality has been completely incorporated into
-nxagent's code base. If the nxagent binary is executed under the name
-of "x2goagent", the X2Go functionalities get activated.
-
-The x2goagent package is a wrapper that activates X2Go branding in
-nxagent. Please refer to the nxagent package's description for more
-information on NX.
-
-
 %prep
 %setup -q
 # remove build cruft that is in Git (also taken from roll-tarball.sh)
@@ -446,7 +431,6 @@ sed -i -e 's#-O3#%{optflags}#' nx-X11/config/cf/host.def
 # We're installing binaries into %%{_libdir}/nx/bin rather than %%{_libexedir}/nx
 # because upstream expects libraries and binaries in the same directory
 sed -i -e 's,/lib/nx,/%{_lib}/nx,' Makefile nx-X11/config/cf/X11.tmpl
-sed -i -e 's,/lib/x2go,/%{_lib}/x2go,' Makefile
 sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/*
 # Fix FSF address
 find -name LICENSE | xargs sed -i \
@@ -484,10 +468,6 @@ make install \
 # Remove static libs (they don't exist on SLES, so using -f here)
 rm -f %{buildroot}%{_libdir}/*.a
 
-# Make sure x2goagent is linked relative and on 64-bit
-mkdir -p %{buildroot}%{_libdir}/x2go/bin
-ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent
-
 # Fix permissions on shared libraries
 chmod 755  %{buildroot}%{_libdir}/lib*.so*
 
@@ -704,21 +684,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 %dir %{_libdir}/nx/bin
 %{_libdir}/nx/bin/nxproxy
 
-%files -n x2goagent
-%defattr(-,root,root)
-#%%{_sysconfdir}/x2go is owned by x2goserver, which this requires
-%dir %{_sysconfdir}/x2go
-%dir %{_libdir}/x2go
-%dir %{_libdir}/x2go/bin
-%config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg
-%config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard
-%config(noreplace) %{_sysconfdir}/x2go/rgb
-%{_bindir}/x2goagent
-%{_libdir}/x2go/bin/x2goagent
-%{_datadir}/pixmaps/x2go.xpm
-%{_datadir}/x2go/
-%{_datadir}/man/man1/x2goagent.1*
-
 
 %changelog
 * Thu Jan 29 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 3.5.99.0
diff --git a/x2goagent.features b/x2goagent.features
deleted file mode 100644
index 12d62e01c..000000000
--- a/x2goagent.features
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# 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 St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# silently bail out if X2Go Server is not installed
-if ! which x2gopath 1>/dev/null; then
-    exit 0
-fi
-
-X2GO_LIB_PATH="$(x2gopath libexec)";
-
-$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-
-X2GO_FEATURE=$1
-
-# check for X2Go Agent features
-case "$X2GO_FEATURE" in
-
-    "X2GOAGENT_RANDRXINERAMA") echo "ok"; exit 0;;
-    *) exit -1;;
-
-esac