Conflicts (resolved by Mike Gabriel after cherry-pick from 3.6.x branch):
	debian/rules

This reverts commit 4436e979.

Was needed and was tested on Ubuntu 14.04.

This reverts commit 1e5c83e8.

Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/folder lists in text files named debian/CODE-REDUCTION_*.

debian/rules: Correctly link config files (etc/rgb, etc/nxagent.keyboard, etc/x2goagent.keyboard) before dh_auto_build.

  * Debian/Ubuntu packaging:
    + Fully rework the way nx-libs gets packaged for Debian/Ubuntu.
    + Split up libnx-x11 into individual packages.
    + Provide dbg:packages for each bin:package containing binaries.
    + Use Makefile logic to install files into DESTDIR.
    + Provide dev:packages for each lib:package individually.
    + Provide nx-x11proto-*-dev packages for all libnx-* libraries.
    + Install _all_ library files (*.so*) to /usr/lib/<triplet>/, so
      no extra settings of LD_LIBRARY_PATH is necessary.

More source tree size reduction by analyzing what exactly of the Mesa source code in nx-X11/extras/ is used and what not.

* Drop more unused folders from tarball release / before .deb package build:
    - nx-X11/programs/Xserver/miext/shadow/
    - nx-X11/programs/Xserver/XpConfig/
    - nx-X11/programs/Xserver/Xprint/

Drop nx-X11/programs/Xserver/hw/xfree86 except of four files symlinked to other locations in the source tree at build time.

Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in roll-tarball.sh and in debian/rules alike.

Fix removal of unused code (that part of the code that we know of so far). (The debian/rules file is a Makefile and Makefiles don't understand shell globbing with curly braces).

debian/rules: Backup nxcomp/VERSION file from NoMachine before replacing it with a symlink to debian/VERSION. Recreate the original file when cleaning up.

debian/libnx-x11.postinst: Don't use dpkg-architecture (bin:package dpkg-dev) in postinst script. Instead prep a libnx-x11.postinst script at build time. (Fixes: #621).

Add 400_nxcomp-version.full+lite.patch. Allow 4-digit version comparison during NX session handshake. (Fixes: #610).

Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199).

Continue Reinhard's work on top-level install/uninstall. Esp. integrate debian/post-nx-build.sh into main Makefile. Make value of CONFIGURE variable traversable through the Makefile tree.

No longer add them as quilt patch, as they are much easier to edit this
way. This, of course, requires adjustments to the roll-tarballs.sh script

instead, clean stale configure files programatically from the clean rule
in debian/rules.

Instead, place the makefile into debian/Makefile.nx-libs. This makes the
makefile easier to edit.

This change makes debian/rules a bit easier to read

It seems that there is a race condition in the implementation of the
nx-x11 makefiles somewhere. On machines with many cores and high levels
of parallel workers (for me, 32 cores and -j20), nxcompext gets built
before libNX_X11 is ready:

+ ln -s ../../lib/X11/libNX_X11.so .
/usr/bin/ld: cannot find -lNX_X11
collect2: error: ld returned 1 exit status
make[9]: *** [libXcompext.so.3.5.0] Fehler 1
make[9]: Leaving directory `/srv/scratch/tartler/nx-libs/nxcompext'

Until those makefiles get fixed, better disable parallel operation

this package contains debugging information for all code that is built
from this source package.