aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-27 13:56:36 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 11:35:59 +0100
commitb3d32ec569b8cd7efcb7a332d896eecd9681af02 (patch)
tree3c7e1d87ee226804e85e359dfe31bcdf67b0a198 /debian
parenta3087eec9b048d308ae704f7a0540eaa416d4813 (diff)
downloadnx-libs-b3d32ec569b8cd7efcb7a332d896eecd9681af02.tar.gz
nx-libs-b3d32ec569b8cd7efcb7a332d896eecd9681af02.tar.bz2
nx-libs-b3d32ec569b8cd7efcb7a332d896eecd9681af02.zip
Fully rework the way nx-libs gets packaged for Debian/Ubuntu.
* 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.
Diffstat (limited to 'debian')
-rw-r--r--debian/Makefile.nx-libs33
-rw-r--r--debian/changelog31
-rw-r--r--debian/control1108
-rw-r--r--debian/libnx-x11-6.docs (renamed from debian/libnx-x11.docs)0
-rw-r--r--debian/libnx-x11-6.install.in1
-rw-r--r--debian/libnx-x11-dev.install.in15
-rw-r--r--debian/libnx-x11.dirs3
-rw-r--r--debian/libnx-x11.install2
-rw-r--r--debian/libnx-x11.links2
-rw-r--r--debian/libnx-x11.lintian-overrides4
-rw-r--r--debian/libnx-xau-dev.install.in2
-rw-r--r--debian/libnx-xau6.docs1
-rw-r--r--debian/libnx-xau6.install.in1
-rw-r--r--debian/libnx-xcomposite-dev.install.in2
-rw-r--r--debian/libnx-xcomposite1.docs1
-rw-r--r--debian/libnx-xcomposite1.install.in1
-rw-r--r--debian/libnx-xdamage-dev.install.in2
-rw-r--r--debian/libnx-xdamage1.docs1
-rw-r--r--debian/libnx-xdamage1.install.in1
-rw-r--r--debian/libnx-xdmcp-dev.install.in2
-rw-r--r--debian/libnx-xdmcp6.docs1
-rw-r--r--debian/libnx-xdmcp6.install.in1
-rw-r--r--debian/libnx-xext-dev.install.in34
-rw-r--r--debian/libnx-xext6.docs1
-rw-r--r--debian/libnx-xext6.install.in1
-rw-r--r--debian/libnx-xfixes-dev.install.in2
-rw-r--r--debian/libnx-xfixes3.docs1
-rw-r--r--debian/libnx-xfixes3.install.in1
-rw-r--r--debian/libnx-xinerama-dev.install.in3
-rw-r--r--debian/libnx-xinerama1.dirs1
-rw-r--r--debian/libnx-xinerama1.docs1
-rw-r--r--debian/libnx-xinerama1.install.in1
-rwxr-xr-xdebian/libnx-xinerama1.postinst.in (renamed from debian/libnx-x11.postinst.in)0
-rwxr-xr-xdebian/libnx-xinerama1.prerm (renamed from debian/libnx-x11.prerm)0
-rw-r--r--debian/libnx-xpm-dev.install.in2
-rw-r--r--debian/libnx-xpm4.docs1
-rw-r--r--debian/libnx-xpm4.install.in1
-rw-r--r--debian/libnx-xrandr-dev.install.in2
-rw-r--r--debian/libnx-xrandr2.docs1
-rw-r--r--debian/libnx-xrandr2.install.in1
-rw-r--r--debian/libnx-xrender-dev.install.in2
-rw-r--r--debian/libnx-xrender1.docs1
-rw-r--r--debian/libnx-xrender1.install.in1
-rw-r--r--debian/libnx-xtst-dev.install.in2
-rw-r--r--debian/libnx-xtst6.docs1
-rw-r--r--debian/libnx-xtst6.install.in1
-rw-r--r--debian/libxcomp-dev.install4
-rw-r--r--debian/libxcomp-dev.install.in9
-rw-r--r--debian/libxcomp-dev.lintian-overrides3
-rw-r--r--debian/libxcomp3.install2
-rw-r--r--debian/libxcomp3.install.in1
-rw-r--r--debian/libxcomp3.links3
-rw-r--r--debian/libxcomp3.lintian-overrides2
-rw-r--r--debian/libxcompext-dev.install2
-rw-r--r--debian/libxcompext-dev.install.in3
-rw-r--r--debian/libxcompext-dev.lintian-overrides3
-rw-r--r--debian/libxcompext3.install1
-rw-r--r--debian/libxcompext3.install.in1
-rw-r--r--debian/libxcompext3.links3
-rw-r--r--debian/libxcompext3.lintian-overrides2
-rw-r--r--debian/libxcompshad-dev.install4
-rw-r--r--debian/libxcompshad-dev.install.in12
-rw-r--r--debian/libxcompshad-dev.lintian-overrides3
-rw-r--r--debian/libxcompshad3.install1
-rw-r--r--debian/libxcompshad3.install.in1
-rw-r--r--debian/libxcompshad3.links3
-rw-r--r--debian/libxcompshad3.lintian-overrides2
-rw-r--r--debian/nx-x11-common.install2
-rw-r--r--debian/nx-x11proto-composite-dev.install.in2
-rw-r--r--debian/nx-x11proto-core-dev.install.in23
-rw-r--r--debian/nx-x11proto-damage-dev.install.in2
-rw-r--r--debian/nx-x11proto-randr-dev.install.in2
-rw-r--r--debian/nx-x11proto-render-dev.install.in3
-rw-r--r--debian/nx-x11proto-xext-dev.install.in4
-rw-r--r--debian/nx-x11proto-xfixes-dev.install.in3
-rw-r--r--debian/nx-x11proto-xinerama-dev.install.in1
-rw-r--r--debian/nxagent.install6
-rw-r--r--debian/nxagent.lintian-overrides2
-rw-r--r--debian/nxauth.lintian-overrides2
-rw-r--r--debian/nxproxy.install1
-rw-r--r--debian/nxproxy.lintian-overrides2
-rw-r--r--debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch18
-rw-r--r--debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch14
-rw-r--r--debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch18
-rw-r--r--debian/patches/031_nx-X11_parallel-make.full.patch129
-rw-r--r--debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch280
-rwxr-xr-xdebian/roll-tarballs.sh218
-rwxr-xr-xdebian/rules85
-rw-r--r--debian/source.lintian-overrides4
-rw-r--r--debian/wrappers/nxagent3
-rw-r--r--debian/wrappers/nxauth3
-rw-r--r--debian/wrappers/nxproxy3
-rw-r--r--debian/wrappers/x2goagent3
-rw-r--r--debian/x2goagent.keyboard1
-rw-r--r--debian/x2goagent.lintian-overrides1
95 files changed, 1590 insertions, 587 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 8e023aa64..97b2b6ea6 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -8,13 +8,16 @@ COPY_SYMLINK=cp -a
RM_FILE=rm -f
RM_DIR=rmdir -p --ignore-fail-on-non-empty
-ETCDIR_NX ?= /etc/nxagent
+ETCDIR_NX ?= /etc/nxagent
ETCDIR_X2GO ?= /etc/x2go
-PREFIX ?= /usr/local
-BINDIR=$(PREFIX)/bin
-NXLIBDIR=$(PREFIX)/lib/nx
-X2GOLIBDIR=$(PREFIX)/lib/x2go
-CONFIGURE ?= ./configure
+PREFIX ?= /usr/local
+BINDIR ?= $(PREFIX)/bin
+LIBDIR ?= $(PREFIX)/lib
+USRLIBDIR ?= $(LIBDIR)
+INCLUDEDIR ?= $(PREFIX)/include
+NXLIBDIR ?= $(PREFIX)/lib/nx
+X2GOLIBDIR ?= $(PREFIX)/lib/x2go
+CONFIGURE ?= ./configure
SHELL:=/bin/bash
@@ -105,14 +108,14 @@ install-full:
cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \
done;
- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11
- $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/
+ $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)
+ $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(USRLIBDIR)/
. replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
while read dirname; do \
- $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"; \
+ $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"; \
$(INSTALL_FILE) $${dirname}/*.h \
- "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"/ || true; \
+ "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"/ || true; \
done; \
# Provide means for Xinerama support in NX/X2Go sessions. This
@@ -120,11 +123,11 @@ install-full:
# (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
# (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama
- $(INSTALL_SYMLINK) ../libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1
+ $(INSTALL_SYMLINK) $(DESTDIR)/$(USRLIBDIR)/libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1
- $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps
$(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \
- $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps/
+ $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps/
$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX)
$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)
@@ -153,7 +156,7 @@ uninstall-full:
if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
if test -f nx-X11/Makefile; then \
- if test -d $(PREFIX)/lib/nx; then rm -rf $(PREFIX)/lib/nx; fi; \
- if test -d $(PREFIX)/include/nx; then rm -rf $(PREFIX)/include/nx; fi; \
+ if test -d $(NXLIBDIR); then rm -rf $(NXLIBDIR); fi; \
+ if test -d $(INCLUDEDIR)/nx; then rm -rf $(INCLUDEDIR)/nx; fi; \
fi; \
fi
diff --git a/debian/changelog b/debian/changelog
index f60dc9c14..1b7bb6b4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium
+nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
[ Paul Szabo ]
* DISABLED:401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch.
@@ -11,13 +11,6 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium
without.
* Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header
referring to keystrokes.cfg (plural), not keystroke.cfg.
- * debian/rules:
- + Backup nxcomp/VERSION file from NoMachine before replacing it with
- a symlink to debian/VERSION. Recreate the original file when cleaning
- up.
- + 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).
* Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in
roll-tarball.sh and in debian/rules alike.
* Stop shipping unused / very old xterm code.
@@ -29,12 +22,26 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium
- nx-X11/programs/Xserver/miext/shadow/
- nx-X11/programs/Xserver/XpConfig/
- nx-X11/programs/Xserver/Xprint/
- * debian/control:
- + Turn libnx-*-dev packages into dummy packages. Shipping development files
- for nx-X11 makes no sense. No other programme build against nx-X11's
- header files except nxagent itself.
* Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore.
+ * 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.
+
+ * debian/rules:
+ + Backup nxcomp/VERSION file from NoMachine before replacing it with
+ a symlink to debian/VERSION. Recreate the original file when cleaning
+ up.
+ + 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).
+
[ Horst Schirmeier ]
* Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that
prevented the /etc/nxagent/keystrokes.cfg file from being parsed. (Fixes:
diff --git a/debian/control b/debian/control
index 44b99f3bd..fe3277bab 100644
--- a/debian/control
+++ b/debian/control
@@ -25,19 +25,70 @@ Build-Conflicts:
x11proto-randr-dev,
x11proto-record-dev,
x11proto-xinerama-dev,
-Standards-Version: 3.9.3
+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
+Package: nx-x11-common
+Architecture: all
+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~),
+Description: nx-X11 (common files)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides all architecture-independent files for nx-X11.
+
+Package: nx-x11proto-core-dev
+Section: libdevel
+Architecture: any
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the core nx-X11 protocol, and also provides a number of utility headers,
+ used to abstract OS-specific functions.
+
Package: libnx-x11
Architecture: any
+Multi-Arch: same
Depends:
${shlibs:Depends},
${misc:Depends},
-Breaks: nxlibs (<= 3.5.1)
-Replaces: nxlibs
-Description: nx-X11
+ libnx-x11-6 (>= ${source:Version}), libnx-x11-6 (<< ${source:Version}.1),
+Description: nx-X11 client-side library (transitional dummy package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package is a transitional dummy package and can be safely removed
+ (inducing transition of libnx-x11 to libnx-x11-6).
+
+Package: libnx-x11-6
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs: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~),
+Replaces: nxlibs,
+Description: nx-X11 client-side library
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
@@ -46,21 +97,891 @@ Description: nx-X11
nxagent.
Package: libnx-x11-dev
+Provides: libnx-x11-6-dev
Section: libdevel
Architecture: any
-Breaks: nxlibs-dev (<=3.5.1)
-Replaces: nxlibs-dev
+Breaks: nxlibs-dev (<=3.5.1),
+Replaces: nxlibs-dev,
Depends:
- libnx-x11 (= ${binary:Version}),
+ libnx-x11-6 (= ${binary:Version}),
${misc:Depends},
-Description: Library headers for nx-X11 (dummy package)
+Description: nx-X11 client-side library (development headers)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
- This package can be safely removed. Since 3.5.0.29 of nx-libs we
- have stopped shipping development headers with nx-X11. No software
- should ever link against the nx-X11 library.
+ This package provides the development headers for the core nx-X11
+ libraries customized for nxagent.
+
+Package: libnx-x11-6-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-x11-6 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Replaces: nx-x11-dbg,
+Description: nx-X11 client-side library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package contains debug symbols for the core nx-X11 libraries
+ customized for nxagent.
+
+Package: libnx-xau6
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 authorisation library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides the main interface to the nx-X11 authorisation handling,
+ which controls authorisation for X connections, both client-side and
+ server-side.
+
+Package: libnx-xau-dev
+Provides: libnx-xau6-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xau6 (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ This package provides the main interface to the nx-X11 authorisation handling,
+ which controls authorisation for X connections, both client-side and
+ server-side.
+ .
+ This package contains the development headers for this library.
+
+Package: libnx-xau6-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xau6 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ This package provides the main interface to the nx-X11 authorisation handling,
+ which controls authorisation for X connections, both client-side and
+ server-side.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xcomposite1
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Composite extension library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xcomposite provides an X Window System client interface to the Composite
+ extension to the X protocol
+ .
+ The Composite extension allows clients called compositing managers to control
+ the final drawing of the screen. Rendering is done into an off-screen buffer.
+
+Package: libnx-xcomposite-dev
+Provides: libnx-xcomposite1-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xcomposite1 (= ${binary:Version}),
+ nx-x11proto-composite-dev (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Composite extension library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xcomposite provides an X Window System client interface to the Composite
+ extension to the X protocol
+ .
+ The Composite extension allows clients called compositing managers to control
+ the final drawing of the screen. Rendering is done into an off-screen buffer.
+ .
+ This package contains the development headers for this library.
+
+Package: nx-x11proto-composite-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the Composite extension in nx-X11, used to let arbitrary client
+ programs control drawing of the final image.
+
+Package: libnx-xcomposite1-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xcomposite1 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Composite extension library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xcomposite provides an X Window System client interface to the Composite
+ extension to the X protocol
+ .
+ The Composite extension allows clients called compositing managers to control
+ the final drawing of the screen. Rendering is done into an off-screen buffer.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xdamage1
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 damaged region extension library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xdamage provides an X Window System client interface to the DAMAGE
+ extension to the X protocol.
+ .
+ The Damage extension provides for notification of when on-screen regions have
+ been 'damaged' (altered)
+
+Package: libnx-xdamage-dev
+Provides: libnx-xdamage1-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xdamage1 (= ${binary:Version}),
+ nx-x11proto-damage-dev (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 damaged region extension library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xdamage provides an X Window System client interface to the DAMAGE
+ extension to the X protocol.
+ .
+ The Damage extension provides for notification of when on-screen regions have
+ been 'damaged' (altered)
+ .
+ This package contains the development headers for this library.
+
+Package: nx-x11proto-damage-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Damage extension wire protocol
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the Damage extension in nx-X11, used to notify clients of changes
+ made to particular areas.
+
+Package: libnx-xdamage1-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xdamage1 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 damaged region extension library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xdamage provides an X Window System client interface to the DAMAGE
+ extension to the X protocol.
+ .
+ The Damage extension provides for notification of when on-screen regions have
+ been 'damaged' (altered)
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xdmcp6
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Display Manager Control Protocol library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ nx-X11 Display Manager Control Protocol library
+ .
+ This package provides the main interface to the nx-X11 display manager control
+ protocol library, which allows for remote logins to display managers.
+
+Package: libnx-xdmcp-dev
+Provides: libnx-xdmcp6-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xdmcp6 (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Display Manager Control Protocol library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ nx-X11 Display Manager Control Protocol library
+ .
+ This package provides the main interface to the nx-X11 display manager control
+ protocol library, which allows for remote logins to display managers.
+ .
+ This package contains the development headers for this library.
+
+Package: libnx-xdmcp6-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xdmcp6 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Display Manager Control Protocol library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ nx-X11 Display Manager Control Protocol library
+ .
+ This package provides the main interface to the nx-X11 display manager control
+ protocol library, which allows for remote logins to display managers.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xext6
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 miscellaneous extension library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xext provides an X Window System client interface to several
+ extensions to the X protocol.
+ .
+ libnx_Xext also provides a small set of utility functions to aid authors
+ of client APIs for X protocol extensions.
+
+Package: libnx-xext-dev
+Provides: libnx-xext6-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xext6 (= ${binary:Version}),
+ nx-x11proto-xext-dev (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xext provides an X Window System client interface to several
+ extensions to the X protocol.
+ .
+ This package contains the development headers for this library.
+
+Package: nx-x11proto-xext-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xext6 (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 miscellaneous extension wire protocol
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for various extensions, the client-side libraries of which are provided
+ in the Xext library.
+
+Package: libnx-xext6-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xext6 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xext provides an X Window System client interface to several
+ extensions to the X protocol.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xfixes3
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 miscellaneous 'fixes' extension library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xfixes provides an X Window System client interface to the
+ 'XFIXES' extension to the X protocol.
+ .
+ It provides support for Region types, and some cursor functions.
+
+Package: libnx-xfixes-dev
+Provides: libnx-xfixes3-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xfixes3 (= ${binary:Version}),
+ nx-x11proto-xfixes-dev (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 miscellaneous 'fixes' extension library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xfixes provides an X Window System client interface to the
+ 'XFIXES' extension to the X protocol.
+ .
+ It provides support for Region types, and some cursor functions.
+ .
+ This package contains the development headers for this library.
+
+Package: nx-x11proto-xfixes-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the XFIXES extension.
+
+Package: libnx-xfixes3-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xfixes3 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 miscellaneous 'fixes' extension library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xfixes provides an X Window System client interface to the
+ 'XFIXES' extension to the X protocol.
+ .
+ It provides support for Region types, and some cursor functions.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xinerama1
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Xinerama extension library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xinerama provides an X Window System client interface to the XINERAMA
+ extension to the X protocol.
+ .
+ The Xinerama (also known as panoramiX) extension allows for multiple screens
+ attached to a single display to be treated as belonging together, and to give
+ desktop applications a better idea of the monitor layout.
+
+Package: libnx-xinerama-dev
+Provides: libnx-xinerama1-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xinerama1 (= ${binary:Version}),
+ nx-x11proto-xinerama-dev (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Xinerama extension library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xinerama provides an X Window System client interface to the XINERAMA
+ extension to the X protocol.
+ .
+ The Xinerama (also known as panoramiX) extension allows for multiple screens
+ attached to a single display to be treated as belonging together, and to give
+ desktop applications a better idea of the monitor layout.
+ .
+ This package contains the development headers for this library.
+
+Package: nx-x11proto-xinerama-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Xinerama extension wire protocol
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the XINERAMA extension, used to use and manage a multiple-screen
+ display.
+
+Package: libnx-xinerama1-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xinerama1 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+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
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xinerama provides an X Window System client interface to the XINERAMA
+ extension to the X protocol.
+ .
+ The Xinerama (also known as panoramiX) extension allows for multiple
+ screens attached to a single display to be treated as belonging
+ together, and to give desktop applications a better idea of the monitor
+ layout.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xpm4
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 pixmap library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xpm provides support and common operation for the XPM pixmap
+ format, which is commonly used in legacy X applications. XPM is an
+ extension of the monochrome XBM bitmap specified in the X protocol.
+
+Package: libnx-xpm-dev
+Provides: libnx-xpm4-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xpm4 (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 pixmap library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xpm provides support and common operation for the XPM pixmap
+ format, which is commonly used in legacy X applications. XPM is an
+ extension of the monochrome XBM bitmap specified in the X protocol.
+ .
+ This package contains the development headers for this library.
+
+Package: libnx-xpm4-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xpm4 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 pixmap library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xpm provides support and common operation for the XPM pixmap
+ format, which is commonly used in legacy X applications. XPM is an
+ extension of the monochrome XBM bitmap specified in the X protocol.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xrandr2
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 RandR extension library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xrandr provides an X Window System client interface to the RandR
+ extension to the X protocol.
+ .
+ The RandR extension allows for run-time configuration of display attributes
+ such as resolution, rotation, and reflection.
+
+Package: libnx-xrandr-dev
+Provides: libnx-xrandr2-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xrandr2 (= ${binary:Version}),
+ nx-x11proto-randr-dev (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 RandR extension library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xrandr provides an X Window System client interface to the RandR
+ extension to the X protocol.
+ .
+ The RandR extension allows for run-time configuration of display attributes
+ such as resolution, rotation, and reflection.
+ .
+ This package contains the development headers for this library.
+
+Package: nx-x11proto-randr-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xrandr2 (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 RandR extension wire protocol
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xrandr provides an X Window System client interface to the RandR
+ extension to the X protocol.
+ .
+ The RandR extension allows for run-time configuration of display attributes
+ such as resolution, rotation, and reflection.
+ .
+ This package contains the development headers for this library.
+
+Package: libnx-xrandr2-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xrandr2 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 RandR extension library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xrandr provides an X Window System client interface to the RandR
+ extension to the X protocol.
+ .
+ The RandR extension allows for run-time configuration of display attributes
+ such as resolution, rotation, and reflection.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xrender1
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Rendering Extension client library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ The X Rendering Extension (Render) introduces digital image composition
+ as the foundation of a new rendering model within the X Window System.
+ Rendering geometric figures is accomplished by client-side tessellation
+ into either triangles or trapezoids. Text is drawn by loading glyphs
+ into the server and rendering sets of them. The Xrender library exposes
+ this extension to X clients.
+
+Package: libnx-xrender-dev
+Provides: libnx-xrender1-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xrender1 (= ${binary:Version}),
+ nx-x11proto-render-dev (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Rendering Extension client library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ The X Rendering Extension (Render) introduces digital image composition
+ as the foundation of a new rendering model within the X Window System.
+ Rendering geometric figures is accomplished by client-side tessellation
+ into either triangles or trapezoids. Text is drawn by loading glyphs
+ into the server and rendering sets of them. The Xrender library exposes
+ this extension to X clients.
+ .
+ This package contains the development headers for this library.
+
+Package: nx-x11proto-render-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Render extension wire protocol
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the Render extension, used to implement Porter-Duff operations
+ within X.
+
+Package: libnx-xrender1-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xrender1 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Rendering Extension client library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ The X Rendering Extension (Render) introduces digital image composition
+ as the foundation of a new rendering model within the X Window System.
+ Rendering geometric figures is accomplished by client-side tessellation
+ into either triangles or trapezoids. Text is drawn by loading glyphs
+ into the server and rendering sets of them. The Xrender library exposes
+ this extension to X clients.
+ .
+ This package contains debug symbols for this library.
+
+Package: libnx-xtst6
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11 (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Testing -- Record extension library
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xtst provides an X Window System client interface to the Record
+ extension to the X protocol.
+ .
+ The Record extension allows X clients to synthesise input events, which
+ is useful for automated testing.
+
+Package: libnx-xtst-dev
+Provides: libnx-xtst6-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnx-xtst6 (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Testing -- Record extension library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xtst provides an X Window System client interface to the Record
+ extension to the X protocol.
+ .
+ The Record extension allows X clients to synthesise input events, which
+ is useful for automated testing.
+ .
+ This package contains the development headers for this library.
+
+Package: libnx-xtst6-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libnx-xtst6 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: nx-X11 Testing -- Record extension library (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ libNX_Xtst provides an X Window System client interface to the Record
+ extension to the X protocol.
+ .
+ The Record extension allows X clients to synthesise input events, which
+ is useful for automated testing.
+ .
+ This package contains debug symbols for this library.
Package: libnx-mesa-extras-dev
Section: libdevel
@@ -79,12 +1000,10 @@ Description: Library headers for nx-X11/Meas (dummy package)
Package: nxagent
Architecture: any
+Multi-Arch: foreign
Depends:
${shlibs:Depends},
${misc:Depends},
- libxcomp3 (= ${binary:Version}),
- libxcompext3 (= ${binary:Version}),
- libxcompshad3 (= ${binary:Version}),
Recommends:
xfonts-base,
Description: NX agent
@@ -106,6 +1025,28 @@ Description: NX agent
requests locally, ensuring that the most common source of round-trips are
nearly reduced to zero.
+Package: nxagent-dbg
+Section: debug
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ nxagent (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: NX agent (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ nxagent is an agent providing NX transport of X sessions. The application
+ is based on the well known Xnest "nested" server. nxagent, like Xnest,
+ is an X server for its own clients, and at the same time, an X client
+ for a system's local X server.
+ .
+ This package contains detached debug symbols that help generating more
+ helpful backtraces. You can safely remove it if you do not intend to
+ debug NX packages on this system.
+
Package: x2goagent
Architecture: all
Depends:
@@ -130,6 +1071,7 @@ Description: X2Go agent
Package: nxproxy
Architecture: any
+Multi-Arch: foreign
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -139,9 +1081,35 @@ Description: NX proxy
using X applications over a network, especially a slow one.
.
This package provides the NX proxy (client) binary.
+ .
+ This package contains detached debug symbols that help generating more
+ helpful backtraces. You can safely remove it if you do not intend to
+ debug NX packages on this system.
+
+Package: nxproxy-dbg
+Section: debug
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ nxproxy (= ${binary:Version}),
+ ${misc:Depends},
+Suggests:
+ libxcomp3-dbg,
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: NX proxy (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides the NX proxy (client) binary.
+ .
+ This package contains detached debug symbols that help generating more
+ helpful backtraces. You can safely remove it if you do not intend to
+ debug NX packages on this system.
Package: nxauth
Architecture: any
+Multi-Arch: foreign
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -152,14 +1120,36 @@ Description: NX xauth
.
This package provides the NX xauth binary.
+Package: nxauth-dbg
+Section: debug
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ nxauth (= ${binary:Version}),
+ ${misc:Depends},
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+Description: NX auth (debug package)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides the NX auth binary.
+ .
+ This package contains detached debug symbols that help generating more
+ helpful backtraces. You can safely remove it if you do not intend to
+ debug NX packages on this system.
+
Package: libxcomp3
Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
${shlibs:Depends},
${misc:Depends},
Breaks: nxcomp (<= 3.5.1)
Replaces: nxcomp
-Description: NX X compression library
+Description: nx-X11 compression library
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
@@ -167,28 +1157,49 @@ Description: NX X compression library
This package provides the compression library.
Package: libxcomp-dev
+Provides: libxcomp3-dev
Section: libdevel
Architecture: any
Depends:
libxcomp3 (= ${binary:Version}),
${misc:Depends},
Breaks: nxcomp-dev (<=3.5.1)
-Replaces: nxcomp-dev
-Description: NX X compression library headers
+Replaces: nxcomp-dev,
+Description: nx-X11 compression library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package contains the development headers for this library.
+
+Package: libxcomp3-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libxcomp3 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+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
using X applications over a network, especially a slow one.
.
- This package provides the compression library (header files).
+ This package contains debug symbols for this library.
Package: libxcompext3
Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
${shlibs:Depends},
${misc:Depends},
Breaks: nxcompext (<=3.5.1)
Replaces: nxcompext
-Description: NX X11 protocol compression extensions library
+Description: nx-X11 protocol compression extensions library
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
@@ -196,31 +1207,51 @@ Description: NX X11 protocol compression extensions library
This package extends the core NX library with additional features.
Package: libxcompext-dev
+Provides: libxcompext3-dev
Architecture: any
Section: libdevel
Depends:
libxcompext3 (= ${binary:Version}),
${misc:Depends},
libxcomp-dev,
-Breaks: nxcompext-dev (<=3.5.1)
-Replaces: nxcompext-dev
-Description: NX X11 protocol compression extensions library headers
+Breaks: nxcompext-dev (<=3.5.1),
+Replaces: nxcompext-dev,
+Description: nx-X11 protocol compression extensions library (development headers)
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package contains the development headers for this library.
+
+Package: libxcompext3-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libxcompext3 (= ${binary:Version}),
+ ${misc:Depends},
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+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
using X applications over a network, especially a slow one.
.
- This package extends the core NX library with additional features
- (header files).
+ This package contains debug symbols for this library.
Package: libxcompshad3
Section: x11
Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
${shlibs:Depends},
${misc:Depends},
Breaks: nxcompshad (<=3.5.1)
Replaces: nxcompshad
-Description: NX shadowing library
+Description: nx-X11 shadowing library
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
@@ -228,33 +1259,34 @@ Description: NX shadowing library
This package provides a library for shadow session support.
Package: libxcompshad-dev
+Provides: libxcompshad3-dev
Section: libdevel
Architecture: any
Depends:
libxcompshad3 (= ${binary:Version}),
${misc:Depends},
-Breaks: nxcompshad-dev (<= 3.5.1)
-Replaces: nxcompshad-dev
-Description: NX shadowing library headers
+Breaks: nxcompshad-dev (<= 3.5.1),
+Replaces: nxcompshad-dev,
+Description: nx-X11 shadowing library (development headers)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
- This package provides a library for shadow session support (header
- files).
+ This package contains the development headers for this library.
-Package: nx-x11-dbg
-Section: debug
+Package: libxcompshad3-dbg
Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
- libnx-x11 (= ${binary:Version}),
- nxagent (= ${binary:Version}),
+ libxcompshad3 (= ${binary:Version}),
${misc:Depends},
-Description: Debug Symbols for nx-x11 libraries
+Section: debug
+Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
+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
using X applications over a network, especially a slow one.
.
- This package contains detached debug symbols that help generating more
- helpful backtraces. You can safely remove it if you do not intend to
- debug NX packages on this system.
+ This package contains debug symbols for this library.
diff --git a/debian/libnx-x11.docs b/debian/libnx-x11-6.docs
index 5a57a3fdc..5a57a3fdc 100644
--- a/debian/libnx-x11.docs
+++ b/debian/libnx-x11-6.docs
diff --git a/debian/libnx-x11-6.install.in b/debian/libnx-x11-6.install.in
new file mode 100644
index 000000000..4912d749f
--- /dev/null
+++ b/debian/libnx-x11-6.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_X11.so.*
diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in
new file mode 100644
index 000000000..331ec104f
--- /dev/null
+++ b/debian/libnx-x11-dev.install.in
@@ -0,0 +1,15 @@
+usr/lib/*/libNX_X11.so
+usr/include/*/nx/X11/ImUtil.h
+usr/include/*/nx/X11/XKBlib.h
+usr/include/*/nx/X11/Xcms.h
+usr/include/*/nx/X11/Xlib.h
+usr/include/*/nx/X11/XlibConf.h
+usr/include/*/nx/X11/Xlibint.h
+usr/include/*/nx/X11/Xlocale.h
+usr/include/*/nx/X11/Xregion.h
+usr/include/*/nx/X11/Xresource.h
+usr/include/*/nx/X11/Xutil.h
+usr/include/*/nx/X11/cursorfont.h
+usr/include/*/nx/X11/misc.h
+usr/include/*/nx/X11/os.h
+usr/include/*/nx/X11/X10.h
diff --git a/debian/libnx-x11.dirs b/debian/libnx-x11.dirs
deleted file mode 100644
index 339b13b39..000000000
--- a/debian/libnx-x11.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/nx/X11/Xinerama
-usr/lib/nx/X11/Xrandr
-usr/share/nx
diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install
deleted file mode 100644
index fb609cc87..000000000
--- a/debian/libnx-x11.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/nx/X11
-usr/share/nx
diff --git a/debian/libnx-x11.links b/debian/libnx-x11.links
deleted file mode 100644
index 7331e79e6..000000000
--- a/debian/libnx-x11.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/nx/X11/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so
-usr/lib/nx/X11/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1
diff --git a/debian/libnx-x11.lintian-overrides b/debian/libnx-x11.lintian-overrides
deleted file mode 100644
index b462ee4d3..000000000
--- a/debian/libnx-x11.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libnx-x11: possible-new-upstream-release-without-new-version
-libnx-x11: postinst-has-useless-call-to-ldconfig
-libnx-x11: postrm-has-useless-call-to-ldconfig
-libnx-x11: debian-revision-should-not-be-zero
diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install.in
new file mode 100644
index 000000000..dd17a6054
--- /dev/null
+++ b/debian/libnx-xau-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xau.so
+usr/include/*/nx/X11/Xauth.h
diff --git a/debian/libnx-xau6.docs b/debian/libnx-xau6.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xau6.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xau6.install.in b/debian/libnx-xau6.install.in
new file mode 100644
index 000000000..246377f12
--- /dev/null
+++ b/debian/libnx-xau6.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xau.so.*
diff --git a/debian/libnx-xcomposite-dev.install.in b/debian/libnx-xcomposite-dev.install.in
new file mode 100644
index 000000000..e7e3a33db
--- /dev/null
+++ b/debian/libnx-xcomposite-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xcomposite.so
+usr/include/*/nx/X11/extensions/Xcomposite.h
diff --git a/debian/libnx-xcomposite1.docs b/debian/libnx-xcomposite1.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xcomposite1.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xcomposite1.install.in b/debian/libnx-xcomposite1.install.in
new file mode 100644
index 000000000..ecc2f4237
--- /dev/null
+++ b/debian/libnx-xcomposite1.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xcomposite.so.*
diff --git a/debian/libnx-xdamage-dev.install.in b/debian/libnx-xdamage-dev.install.in
new file mode 100644
index 000000000..068f3badd
--- /dev/null
+++ b/debian/libnx-xdamage-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xdamage.so
+usr/include/*/nx/X11/extensions/Xdamage.h
diff --git a/debian/libnx-xdamage1.docs b/debian/libnx-xdamage1.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xdamage1.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xdamage1.install.in b/debian/libnx-xdamage1.install.in
new file mode 100644
index 000000000..42bd90874
--- /dev/null
+++ b/debian/libnx-xdamage1.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xdamage.so.*
diff --git a/debian/libnx-xdmcp-dev.install.in b/debian/libnx-xdmcp-dev.install.in
new file mode 100644
index 000000000..2c2457b10
--- /dev/null
+++ b/debian/libnx-xdmcp-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xdmcp.so
+usr/include/*/nx/X11/Xdmcp.h
diff --git a/debian/libnx-xdmcp6.docs b/debian/libnx-xdmcp6.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xdmcp6.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xdmcp6.install.in b/debian/libnx-xdmcp6.install.in
new file mode 100644
index 000000000..69100139e
--- /dev/null
+++ b/debian/libnx-xdmcp6.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xdmcp.so.*
diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in
new file mode 100644
index 000000000..9f4f60551
--- /dev/null
+++ b/debian/libnx-xext-dev.install.in
@@ -0,0 +1,34 @@
+usr/lib/*/libNX_Xext.so
+usr/include/*/nx/X11/extensions/MITMisc.h
+usr/include/*/nx/X11/extensions/XEVI.h
+usr/include/*/nx/X11/extensions/XEVIstr.h
+usr/include/*/nx/X11/extensions/Xevie.h
+usr/include/*/nx/X11/extensions/Xeviestr.h
+usr/include/*/nx/X11/extensions/XLbx.h
+usr/include/*/nx/X11/extensions/XShm.h
+usr/include/*/nx/X11/extensions/Xag.h
+usr/include/*/nx/X11/extensions/Xagsrv.h
+usr/include/*/nx/X11/extensions/Xagstr.h
+usr/include/*/nx/X11/extensions/Xcup.h
+usr/include/*/nx/X11/extensions/Xcupstr.h
+usr/include/*/nx/X11/extensions/Xdbe.h
+usr/include/*/nx/X11/extensions/Xdbeproto.h
+usr/include/*/nx/X11/extensions/Xext.h
+usr/include/*/nx/X11/extensions/dpms.h
+usr/include/*/nx/X11/extensions/dpmsstr.h
+usr/include/*/nx/X11/extensions/extutil.h
+usr/include/*/nx/X11/extensions/lbxstr.h
+usr/include/*/nx/X11/extensions/lbxbuf.h
+usr/include/*/nx/X11/extensions/lbxdeltastr.h
+usr/include/*/nx/X11/extensions/lbximage.h
+usr/include/*/nx/X11/extensions/lbxbufstr.h
+usr/include/*/nx/X11/extensions/lbxopts.h
+usr/include/*/nx/X11/extensions/lbxzlib.h
+usr/include/*/nx/X11/extensions/mitmiscstr.h
+usr/include/*/nx/X11/extensions/multibuf.h
+usr/include/*/nx/X11/extensions/multibufst.h
+usr/include/*/nx/X11/extensions/security.h
+usr/include/*/nx/X11/extensions/securstr.h
+usr/include/*/nx/X11/extensions/shape.h
+usr/include/*/nx/X11/extensions/sync.h
+usr/include/*/nx/X11/extensions/xtestext1.h
diff --git a/debian/libnx-xext6.docs b/debian/libnx-xext6.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xext6.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xext6.install.in b/debian/libnx-xext6.install.in
new file mode 100644
index 000000000..361d951f5
--- /dev/null
+++ b/debian/libnx-xext6.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xext.so.*
diff --git a/debian/libnx-xfixes-dev.install.in b/debian/libnx-xfixes-dev.install.in
new file mode 100644
index 000000000..96b6cf61c
--- /dev/null
+++ b/debian/libnx-xfixes-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xfixes.so
+usr/include/*/nx/X11/extensions/Xfixes.h
diff --git a/debian/libnx-xfixes3.docs b/debian/libnx-xfixes3.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xfixes3.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xfixes3.install.in b/debian/libnx-xfixes3.install.in
new file mode 100644
index 000000000..b86ea4ae1
--- /dev/null
+++ b/debian/libnx-xfixes3.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xfixes.so.*
diff --git a/debian/libnx-xinerama-dev.install.in b/debian/libnx-xinerama-dev.install.in
new file mode 100644
index 000000000..983784460
--- /dev/null
+++ b/debian/libnx-xinerama-dev.install.in
@@ -0,0 +1,3 @@
+usr/lib/*/libNX_Xinerama.so
+usr/include/*/nx/X11/extensions/Xinerama.h
+usr/include/*/nx/X11/extensions/panoramiXext.h
diff --git a/debian/libnx-xinerama1.dirs b/debian/libnx-xinerama1.dirs
new file mode 100644
index 000000000..aba613b81
--- /dev/null
+++ b/debian/libnx-xinerama1.dirs
@@ -0,0 +1 @@
+usr/lib/nx/X11/Xinerama
diff --git a/debian/libnx-xinerama1.docs b/debian/libnx-xinerama1.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xinerama1.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xinerama1.install.in b/debian/libnx-xinerama1.install.in
new file mode 100644
index 000000000..d53de9c4f
--- /dev/null
+++ b/debian/libnx-xinerama1.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xinerama.so.*
diff --git a/debian/libnx-x11.postinst.in b/debian/libnx-xinerama1.postinst.in
index c690be387..c690be387 100755
--- a/debian/libnx-x11.postinst.in
+++ b/debian/libnx-xinerama1.postinst.in
diff --git a/debian/libnx-x11.prerm b/debian/libnx-xinerama1.prerm
index 3fcd330e6..3fcd330e6 100755
--- a/debian/libnx-x11.prerm
+++ b/debian/libnx-xinerama1.prerm
diff --git a/debian/libnx-xpm-dev.install.in b/debian/libnx-xpm-dev.install.in
new file mode 100644
index 000000000..36c9bb485
--- /dev/null
+++ b/debian/libnx-xpm-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xpm.so
+usr/include/*/nx/X11/xpm.h
diff --git a/debian/libnx-xpm4.docs b/debian/libnx-xpm4.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xpm4.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xpm4.install.in b/debian/libnx-xpm4.install.in
new file mode 100644
index 000000000..5bc9da2a0
--- /dev/null
+++ b/debian/libnx-xpm4.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xpm.so.*
diff --git a/debian/libnx-xrandr-dev.install.in b/debian/libnx-xrandr-dev.install.in
new file mode 100644
index 000000000..4711b6a18
--- /dev/null
+++ b/debian/libnx-xrandr-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xrandr.so
+usr/include/*/nx/X11/extensions/Xrandr.h \ No newline at end of file
diff --git a/debian/libnx-xrandr2.docs b/debian/libnx-xrandr2.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xrandr2.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xrandr2.install.in b/debian/libnx-xrandr2.install.in
new file mode 100644
index 000000000..f4d1b039f
--- /dev/null
+++ b/debian/libnx-xrandr2.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xrandr.so.*
diff --git a/debian/libnx-xrender-dev.install.in b/debian/libnx-xrender-dev.install.in
new file mode 100644
index 000000000..392e20025
--- /dev/null
+++ b/debian/libnx-xrender-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xrender.so
+usr/include/*/nx/X11/extensions/Xrender.h
diff --git a/debian/libnx-xrender1.docs b/debian/libnx-xrender1.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xrender1.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xrender1.install.in b/debian/libnx-xrender1.install.in
new file mode 100644
index 000000000..371550abb
--- /dev/null
+++ b/debian/libnx-xrender1.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xrender.so.*
diff --git a/debian/libnx-xtst-dev.install.in b/debian/libnx-xtst-dev.install.in
new file mode 100644
index 000000000..9dd16a1db
--- /dev/null
+++ b/debian/libnx-xtst-dev.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libNX_Xtst.so
+usr/include/*/nx/X11/extensions/XTest.h
diff --git a/debian/libnx-xtst6.docs b/debian/libnx-xtst6.docs
new file mode 100644
index 000000000..5a57a3fdc
--- /dev/null
+++ b/debian/libnx-xtst6.docs
@@ -0,0 +1 @@
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libnx-xtst6.install.in b/debian/libnx-xtst6.install.in
new file mode 100644
index 000000000..85350d830
--- /dev/null
+++ b/debian/libnx-xtst6.install.in
@@ -0,0 +1 @@
+usr/lib/*/libNX_Xtst.so.*
diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install
deleted file mode 100644
index dd9b01dfa..000000000
--- a/debian/libxcomp-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-nxcomp/libXcomp.so usr/lib/nx
-nxcomp/libXcomp.a usr/lib/nx
-nxcomp/NX*.h usr/include/nx
-nxcomp/MD5.h usr/include/nx
diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install.in
new file mode 100644
index 000000000..7b7bbe591
--- /dev/null
+++ b/debian/libxcomp-dev.install.in
@@ -0,0 +1,9 @@
+usr/lib/*/libXcomp.so
+usr/include/*/nx/NX.h
+usr/include/*/nx/NXalert.h
+usr/include/*/nx/NXmitshm.h
+usr/include/*/nx/NXpack.h
+usr/include/*/nx/NXproto.h
+usr/include/*/nx/NXrender.h
+usr/include/*/nx/NXvars.h
+usr/include/*/nx/MD5.h
diff --git a/debian/libxcomp-dev.lintian-overrides b/debian/libxcomp-dev.lintian-overrides
deleted file mode 100644
index a19d92b23..000000000
--- a/debian/libxcomp-dev.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libxcomp-dev: possible-new-upstream-release-without-new-version
-libxcomp-dev: debian-revision-should-not-be-zero
-
diff --git a/debian/libxcomp3.install b/debian/libxcomp3.install
deleted file mode 100644
index bef21a189..000000000
--- a/debian/libxcomp3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-nxcomp/libXcomp.so.3.* usr/lib/nx
-nxcomp/libXcomp.so.3 usr/lib/nx
diff --git a/debian/libxcomp3.install.in b/debian/libxcomp3.install.in
new file mode 100644
index 000000000..9b8fa9f15
--- /dev/null
+++ b/debian/libxcomp3.install.in
@@ -0,0 +1 @@
+usr/lib/*/libXcomp.so.*
diff --git a/debian/libxcomp3.links b/debian/libxcomp3.links
deleted file mode 100644
index 4a141a23f..000000000
--- a/debian/libxcomp3.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/nx/libXcomp.so.3 usr/lib/libXcomp.so.3
-usr/lib/nx/libXcomp.so.3.5.0 usr/lib/libXcomp.so.3.5.0
-
diff --git a/debian/libxcomp3.lintian-overrides b/debian/libxcomp3.lintian-overrides
deleted file mode 100644
index e8bee0565..000000000
--- a/debian/libxcomp3.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libxcomp3: possible-new-upstream-release-without-new-version
-libxcomp3: debian-revision-should-not-be-zero
diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install
deleted file mode 100644
index fce72a4aa..000000000
--- a/debian/libxcompext-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-nxcompext/libXcompext.so usr/lib/nx
-nxcompext/NX*.h usr/include/nx
diff --git a/debian/libxcompext-dev.install.in b/debian/libxcompext-dev.install.in
new file mode 100644
index 000000000..8be19251e
--- /dev/null
+++ b/debian/libxcompext-dev.install.in
@@ -0,0 +1,3 @@
+usr/lib/*/libXcompext.so
+usr/include/*/nx/NXlib.h
+usr/include/*/nx/NXlibint.h
diff --git a/debian/libxcompext-dev.lintian-overrides b/debian/libxcompext-dev.lintian-overrides
deleted file mode 100644
index d1390c2a3..000000000
--- a/debian/libxcompext-dev.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libxcompext-dev: possible-new-upstream-release-without-new-version
-libxcompext-dev: debian-revision-should-not-be-zero
-
diff --git a/debian/libxcompext3.install b/debian/libxcompext3.install
deleted file mode 100644
index 88f74f852..000000000
--- a/debian/libxcompext3.install
+++ /dev/null
@@ -1 +0,0 @@
-nxcompext/libXcompext.so.* usr/lib/nx
diff --git a/debian/libxcompext3.install.in b/debian/libxcompext3.install.in
new file mode 100644
index 000000000..b9ac8ebb9
--- /dev/null
+++ b/debian/libxcompext3.install.in
@@ -0,0 +1 @@
+usr/lib/*/libXcompext.so.*
diff --git a/debian/libxcompext3.links b/debian/libxcompext3.links
deleted file mode 100644
index f34b5db79..000000000
--- a/debian/libxcompext3.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/nx/libXcompext.so.3 usr/lib/libXcompext.so.3
-usr/lib/nx/libXcompext.so.3.5.0 usr/lib/libXcompext.so.3.5.0
-
diff --git a/debian/libxcompext3.lintian-overrides b/debian/libxcompext3.lintian-overrides
deleted file mode 100644
index a6856ec4d..000000000
--- a/debian/libxcompext3.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libxcompext3: possible-new-upstream-release-without-new-version
-libxcompext3: debian-revision-should-not-be-zero \ No newline at end of file
diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install
deleted file mode 100644
index 6816b1545..000000000
--- a/debian/libxcompshad-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-nxcompshad/*.h usr/include/nx
-nxcompshad/*.a usr/lib/nx/
-nxcompshad/lib*.so usr/lib/nx/
-nxcompshad/*.a usr/lib/nx/
diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in
new file mode 100644
index 000000000..fe11227df
--- /dev/null
+++ b/debian/libxcompshad-dev.install.in
@@ -0,0 +1,12 @@
+usr/lib/*/libXcompshad.so
+usr/include/*/nx/Core.h
+usr/include/*/nx/Input.h
+usr/include/*/nx/Logger.h
+usr/include/*/nx/Manager.h
+usr/include/*/nx/Misc.h
+usr/include/*/nx/Poller.h
+usr/include/*/nx/Regions.h
+usr/include/*/nx/Shadow.h
+usr/include/*/nx/Updater.h
+usr/include/*/nx/Win.h
+usr/include/*/nx/X11.h
diff --git a/debian/libxcompshad-dev.lintian-overrides b/debian/libxcompshad-dev.lintian-overrides
deleted file mode 100644
index 4569b64dc..000000000
--- a/debian/libxcompshad-dev.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libxcompshad-dev: possible-new-upstream-release-without-new-version
-libxcompshad-dev: debian-revision-should-not-be-zero
-
diff --git a/debian/libxcompshad3.install b/debian/libxcompshad3.install
deleted file mode 100644
index 9307a3879..000000000
--- a/debian/libxcompshad3.install
+++ /dev/null
@@ -1 +0,0 @@
-nxcompshad/lib*.so.* usr/lib/nx
diff --git a/debian/libxcompshad3.install.in b/debian/libxcompshad3.install.in
new file mode 100644
index 000000000..6b452b2bd
--- /dev/null
+++ b/debian/libxcompshad3.install.in
@@ -0,0 +1 @@
+usr/lib/*/libXcompshad*.so.*
diff --git a/debian/libxcompshad3.links b/debian/libxcompshad3.links
deleted file mode 100644
index c1790f9a9..000000000
--- a/debian/libxcompshad3.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/nx/libXcompshad.so.3 usr/lib/libXcompshad.so.3
-usr/lib/nx/libXcompshad.so.3.5.0 usr/lib/libXcompshad.so.3.5.0
-
diff --git a/debian/libxcompshad3.lintian-overrides b/debian/libxcompshad3.lintian-overrides
deleted file mode 100644
index 3f14de930..000000000
--- a/debian/libxcompshad3.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libxcompshad3: possible-new-upstream-release-without-new-version
-libxcompshad3: debian-revision-should-not-be-zero \ No newline at end of file
diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install
new file mode 100644
index 000000000..74749114d
--- /dev/null
+++ b/debian/nx-x11-common.install
@@ -0,0 +1,2 @@
+usr/share/nx/
+usr/lib/nx/X11/
diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install.in
new file mode 100644
index 000000000..609454a5e
--- /dev/null
+++ b/debian/nx-x11proto-composite-dev.install.in
@@ -0,0 +1,2 @@
+usr/include/*/nx/X11/extensions/composite.h
+usr/include/*/nx/X11/extensions/compositeproto.h \ No newline at end of file
diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install.in
new file mode 100644
index 000000000..92c529f41
--- /dev/null
+++ b/debian/nx-x11proto-core-dev.install.in
@@ -0,0 +1,23 @@
+usr/include/*/nx/X11/DECkeysym.h
+usr/include/*/nx/X11/HPkeysym.h
+usr/include/*/nx/X11/Sunkeysym.h
+usr/include/*/nx/X11/X.h
+usr/include/*/nx/X11/XF86keysym.h
+usr/include/*/nx/X11/XWDFile.h
+usr/include/*/nx/X11/Xalloca.h
+usr/include/*/nx/X11/Xarch.h
+usr/include/*/nx/X11/Xatom.h
+usr/include/*/nx/X11/Xdefs.h
+usr/include/*/nx/X11/Xfuncproto.h
+usr/include/*/nx/X11/Xfuncs.h
+usr/include/*/nx/X11/Xmd.h
+usr/include/*/nx/X11/Xos.h
+usr/include/*/nx/X11/Xos_r.h
+usr/include/*/nx/X11/Xosdefs.h
+usr/include/*/nx/X11/Xpoll.h
+usr/include/*/nx/X11/Xproto.h
+usr/include/*/nx/X11/Xprotostr.h
+usr/include/*/nx/X11/Xthreads.h
+usr/include/*/nx/X11/ap_keysym.h
+usr/include/*/nx/X11/keysym.h
+usr/include/*/nx/X11/keysymdef.h
diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in
new file mode 100644
index 000000000..949549f17
--- /dev/null
+++ b/debian/nx-x11proto-damage-dev.install.in
@@ -0,0 +1,2 @@
+usr/include/*/nx/X11/extensions/damageproto.h
+usr/include/*/nx/X11/extensions/damagewire.h \ No newline at end of file
diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in
new file mode 100644
index 000000000..d92801663
--- /dev/null
+++ b/debian/nx-x11proto-randr-dev.install.in
@@ -0,0 +1,2 @@
+usr/include/*/nx/X11/extensions/randr.h
+usr/include/*/nx/X11/extensions/randrproto.h
diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install.in
new file mode 100644
index 000000000..bf778716f
--- /dev/null
+++ b/debian/nx-x11proto-render-dev.install.in
@@ -0,0 +1,3 @@
+usr/include/*/nx/X11/extensions/render.h
+usr/include/*/nx/X11/extensions/renderproto.h
+
diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in
new file mode 100644
index 000000000..7e0ca507f
--- /dev/null
+++ b/debian/nx-x11proto-xext-dev.install.in
@@ -0,0 +1,4 @@
+usr/include/*/nx/X11/extensions/xteststr.h
+usr/include/*/nx/X11/extensions/shapestr.h
+usr/include/*/nx/X11/extensions/shmstr.h
+usr/include/*/nx/X11/extensions/syncstr.h
diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in
new file mode 100644
index 000000000..4b614d6c1
--- /dev/null
+++ b/debian/nx-x11proto-xfixes-dev.install.in
@@ -0,0 +1,3 @@
+usr/include/*/nx/X11/extensions/xfixeswire.h
+usr/include/*/nx/X11/extensions/xfixesproto.h
+
diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in
new file mode 100644
index 000000000..36717e1f5
--- /dev/null
+++ b/debian/nx-x11proto-xinerama-dev.install.in
@@ -0,0 +1 @@
+usr/include/*/nx/X11/extensions/panoramiXproto.h \ No newline at end of file
diff --git a/debian/nxagent.install b/debian/nxagent.install
index ffe5e1a96..90266c545 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,6 +1,6 @@
-nx-X11/programs/Xserver/nxagent usr/lib/nx/bin
-bin/nxagent usr/bin
+etc/nxagent/keystrokes.cfg
+usr/lib/nx/bin/nxagent
+usr/bin/nxagent
debian/rgb usr/share/nx
debian/nxagent.keyboard etc/nxagent
nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps
-etc/nxagent/keystrokes.cfg
diff --git a/debian/nxagent.lintian-overrides b/debian/nxagent.lintian-overrides
deleted file mode 100644
index b937ae41f..000000000
--- a/debian/nxagent.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-nxagent: possible-new-upstream-release-without-new-version
-nxagent: debian-revision-should-not-be-zero \ No newline at end of file
diff --git a/debian/nxauth.lintian-overrides b/debian/nxauth.lintian-overrides
deleted file mode 100644
index 0dd32c312..000000000
--- a/debian/nxauth.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-nxauth: possible-new-upstream-release-without-new-version
-nxauth: debian-revision-should-not-be-zero \ No newline at end of file
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
index 46c2e0a3b..c7f7589b0 100644
--- a/debian/nxproxy.install
+++ b/debian/nxproxy.install
@@ -1,2 +1,3 @@
usr/lib/nx/bin/nxproxy
usr/bin/nxproxy
+usr/share/man/man1/nxproxy.1
diff --git a/debian/nxproxy.lintian-overrides b/debian/nxproxy.lintian-overrides
deleted file mode 100644
index 21fd7e4ab..000000000
--- a/debian/nxproxy.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-nxproxy: possible-new-upstream-release-without-new-version
-nxproxy: debian-revision-should-not-be-zero \ No newline at end of file
diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
index 9b9da7e31..af778fefc 100644
--- a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
+++ b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
@@ -36,12 +36,12 @@ Last-Update: 2012-02-14
install.bin:
+install.lib: all
-+ ./mkinstalldirs $(DESTDIR)${libdir}/nx
++ ./mkinstalldirs $(DESTDIR)${libdir}
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx
-+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
-+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx
-+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx
-+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx
++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
++ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
@@ -53,10 +53,10 @@ Last-Update: 2012-02-14
+uninstall.bin:
+
+uninstall.lib:
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a
++ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
index b704fc1bd..300c0a39e 100644
--- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
+++ b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
@@ -37,11 +37,11 @@ Last-Update: 2012-02-14
install.bin:
+install.lib: all
-+ ./mkinstalldirs $(DESTDIR)${libdir}/nx
++ ./mkinstalldirs $(DESTDIR)${libdir}
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx
-+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
-+ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}/nx
-+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx
++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
@@ -52,9 +52,9 @@ Last-Update: 2012-02-14
+uninstall.bin:
+
+uninstall.lib:
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.3
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so
++ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
index 057763505..921eccc4f 100644
--- a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
+++ b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
@@ -38,12 +38,12 @@ Last-Update: 2012-02-14
install.bin:
+install.lib: all
-+ $(INSTALL_DIR) $(DESTDIR)${libdir}/nx
++ $(INSTALL_DIR) $(DESTDIR)${libdir}
+ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx
-+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
-+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx
-+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx
-+ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx
++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}
++ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}
+ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
@@ -54,10 +54,10 @@ Last-Update: 2012-02-14
+uninstall.bin:
+
+uninstall.lib:
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so
-+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a
++ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
+ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
+ $(RM_DIR) $(DESTDIR)${libdir}/nx/
+ $(RM_DIR) $(DESTDIR)${includedir}/nx/
diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch
index 1bacd1ab3..e87918a71 100644
--- a/debian/patches/031_nx-X11_parallel-make.full.patch
+++ b/debian/patches/031_nx-X11_parallel-make.full.patch
@@ -9,19 +9,13 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
---
nx-X11/Makefile | 64 +++++++++++++++++-----------------
nx-X11/config/imake/Makefile.ini | 1
- nx-X11/extras/Mesa/Makefile | 2 -
- nx-X11/extras/Xpm/Makefile.noX | 1
- nx-X11/extras/drm/linux-core/Makefile | 4 +-
- nx-X11/extras/drm/linux/Makefile | 4 +-
- nx-X11/extras/ttf2pt1/Makefile | 4 +-
nx-X11/lib/X11/Imakefile | 12 ++----
- nx-X11/lib/X11/Imakefile.NX.original | 12 ++----
nx-X11/programs/Xserver/Imakefile | 4 +-
10 files changed, 60 insertions(+), 69 deletions(-)
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
-@@ -32,8 +32,8 @@ VERSSRC = $(CONFIGSRC)/util/printver.c
+@@ -32,8 +32,8 @@
VERSPROG = $(CONFIGSRC)/util/printver.exe
all:
@@ -32,7 +26,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
all-initial:
@echo Please use make World, or on NT use nmake World.Win32.
-@@ -57,8 +57,8 @@ World:
+@@ -57,8 +57,8 @@
@date
@echo ""
@if [ -f xmakefile ]; then \
@@ -43,7 +37,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
$(RM) xmakefile; \
fi
@if [ ! -f $(IRULESRC)/host.def ]; then \
-@@ -84,14 +84,14 @@ World:
+@@ -84,14 +84,14 @@
# fi
cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
$(MAKE) $(MFLAGS) Makefile.boot
@@ -65,7 +59,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
@echo ""
@date
@echo ""
-@@ -154,15 +154,15 @@ World.Win32:
+@@ -154,15 +154,15 @@
-if exist xmakefile.bak del xmakefile.bak
-if exist xmakefile ren xmakefile xmakefile.bak
$(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
@@ -87,7 +81,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
@echo :
@echo :
@echo Full build of $(RELEASE) complete.
-@@ -198,38 +198,38 @@ World.OS2:
+@@ -198,38 +198,38 @@
# a copy of every rule that might be invoked at top level
clean:
@@ -143,7 +137,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
+ ${MAKE} ${MAKE_OPTS} $@
--- a/nx-X11/config/imake/Makefile.ini
+++ b/nx-X11/config/imake/Makefile.ini
-@@ -21,7 +21,6 @@ IMAKEMDEP_CROSSCOMPILE = -DCROSSCOMPILE_
+@@ -21,7 +21,6 @@
SHELL = /bin/sh
RM = rm -f
MV = mv
@@ -151,83 +145,9 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
tags TAGS make.log
NPROC = 1
---- a/nx-X11/extras/Mesa/Makefile
-+++ b/nx-X11/extras/Mesa/Makefile
-@@ -12,7 +12,7 @@ default: $(TOP)/configs/current
-
-
- doxygen:
-- (cd doxygen ; make) ; \
-+ (cd doxygen ; ${MAKE}) ; \
-
- clean:
- @for dir in $(SUBDIRS) ; do \
---- a/nx-X11/extras/Xpm/Makefile.noX
-+++ b/nx-X11/extras/Xpm/Makefile.noX
-@@ -32,7 +32,6 @@
-
- SUBDIRS= lib sxpm cxpm
-
--MAKE=make
- MFLAGS=-f Makefile.noX
- INSTALL= install -c
- CURRENT_DIR=.
---- a/nx-X11/extras/drm/linux-core/Makefile
-+++ b/nx-X11/extras/drm/linux-core/Makefile
-@@ -176,7 +176,7 @@ endif
- all: modules
-
- modules: includes
-- make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
-+ ${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
-
- ifeq ($(HEADERFROMBOOT),1)
-
-@@ -246,7 +246,7 @@ clean cleandir:
- rm -rf $(CLEANFILES)
-
- $(MODULE_LIST)::
-- make DRM_MODULES=$@ modules
-+ ${MAKE} DRM_MODULES=$@ modules
-
- # Build test utilities
-
---- a/nx-X11/extras/drm/linux/Makefile
-+++ b/nx-X11/extras/drm/linux/Makefile
-@@ -184,7 +184,7 @@ endif
- all: modules
-
- modules: includes
-- make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
-+ ${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
-
- ifeq ($(HEADERFROMBOOT),1)
-
-@@ -254,7 +254,7 @@ clean cleandir:
- rm -rf $(CLEANFILES)
-
- $(MODULE_LIST)::
-- make DRM_MODULES=$@ modules
-+ ${MAKE} DRM_MODULES=$@ modules
-
- # Build test utilities
-
---- a/nx-X11/extras/ttf2pt1/Makefile
-+++ b/nx-X11/extras/ttf2pt1/Makefile
-@@ -158,8 +158,8 @@ mans: $(MANS)
-
- clean:
- rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core
-- ( cd other && make clean; )
-- ( cd app/netscape && make clean; )
-+ ( cd other && ${MAKE} clean; )
-+ ( cd app/netscape && ${MAKE} clean; )
-
- veryclean: clean
- rm -f $(DOCS) $(MANS)
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
-@@ -1161,25 +1161,23 @@ $(NX_XCOMPEXTCONFIGTARGET):
+@@ -1161,25 +1161,23 @@
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
@@ -261,9 +181,26 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
all:: $(NX_XCOMPLIBTARGET)
+--- a/nx-X11/programs/Xserver/Imakefile
++++ b/nx-X11/programs/Xserver/Imakefile
+@@ -1045,11 +1045,11 @@
+ #ifdef SunArchitecture
+ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
+ cd $(NX_XSHADOWLIBDIR) && \
+- gmake
++ ${MAKE}
+ #else
+ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
+ cd $(NX_XSHADOWLIBDIR) && \
+- rm -f *.o && make
++ rm -f *.o && ${MAKE}
+ #endif
+
+ ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
+
--- a/nx-X11/lib/X11/Imakefile.NX.original
+++ b/nx-X11/lib/X11/Imakefile.NX.original
-@@ -1159,21 +1159,17 @@ $(NX_XCOMPEXTCONFIGTARGET):
+@@ -1159,21 +1159,17 @@
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
@@ -289,19 +226,3 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
#endif
---- a/nx-X11/programs/Xserver/Imakefile
-+++ b/nx-X11/programs/Xserver/Imakefile
-@@ -1045,11 +1045,11 @@ $(NX_XSHADOWCONFIGTARGET):
- #ifdef SunArchitecture
- $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
- cd $(NX_XSHADOWLIBDIR) && \
-- gmake
-+ ${MAKE}
- #else
- $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
- cd $(NX_XSHADOWLIBDIR) && \
-- rm -f *.o && make
-+ rm -f *.o && ${MAKE}
- #endif
-
- ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
index 4e6607e60..ebc77ecd0 100644
--- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
+++ b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
@@ -41,22 +41,13 @@ Last-Update: 2012-02-15
nx-X11/config/cf/sv3Lib.tmpl | 24 +-
nx-X11/config/cf/sv4Lib.tmpl | 2
nx-X11/config/cf/usl.cf | 2
- nx-X11/extras/Mesa/src/mesa/main/Imakefile | 2
- nx-X11/extras/Xpm/lib/Imakefile | 2
- nx-X11/extras/drm/libdrm.pc.in | 2
- nx-X11/extras/fontconfig/fontconfig.pc.in | 2
- nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile | 2
- nx-X11/lib/FS/Imakefile | 2
nx-X11/lib/GLw/Imakefile | 2
- nx-X11/lib/ICE/Imakefile | 2
- nx-X11/lib/SM/Imakefile | 2
nx-X11/lib/X11/Imakefile | 2
nx-X11/lib/X11/Imakefile.NX.original | 2
nx-X11/lib/X11/Imakefile.X.original | 2
nx-X11/lib/XRes/Imakefile | 2
nx-X11/lib/XTrap/Imakefile | 2
nx-X11/lib/Xau/Imakefile | 2
- nx-X11/lib/Xaw/Imakefile | 2
nx-X11/lib/Xaw6/Imakefile | 2
nx-X11/lib/Xaw7/Imakefile | 2
nx-X11/lib/Xcomposite/Imakefile | 2
@@ -72,13 +63,9 @@ Last-Update: 2012-02-15
nx-X11/lib/Xfixes/Imakefile | 2
nx-X11/lib/Xfixes/xfixes.pc.in | 2
nx-X11/lib/Xfontcache/Imakefile | 2
- nx-X11/lib/Xft/Imakefile | 2
- nx-X11/lib/Xft/xft.pc.in | 2
nx-X11/lib/Xft1/Imakefile | 2
nx-X11/lib/Xi/Imakefile | 2
nx-X11/lib/Xinerama/Imakefile | 2
- nx-X11/lib/Xmu/Imakefile | 2
- nx-X11/lib/Xmuu/Imakefile | 2
nx-X11/lib/Xp/Imakefile | 2
nx-X11/lib/Xpm/Imakefile | 2
nx-X11/lib/Xpm/Imakefile.NX.original | 2
@@ -89,9 +76,6 @@ Last-Update: 2012-02-15
nx-X11/lib/Xrender/Imakefile | 2
nx-X11/lib/Xrender/xrender.pc.in | 2
nx-X11/lib/Xss/Imakefile | 2
- nx-X11/lib/Xt/Imakefile | 2
- nx-X11/lib/Xt/Imakefile.NX.original | 2
- nx-X11/lib/Xt/Imakefile.X.original | 2
nx-X11/lib/Xtst/Imakefile | 2
nx-X11/lib/Xv/Imakefile | 2
nx-X11/lib/XvMC/Imakefile | 2
@@ -107,20 +91,13 @@ Last-Update: 2012-02-15
nx-X11/lib/dmx/Imakefile | 2
nx-X11/lib/dps/Imakefile | 2
nx-X11/lib/dpstk/Imakefile | 2
- nx-X11/lib/expat/Imakefile | 2
nx-X11/lib/font/Imakefile | 2
- nx-X11/lib/fontconfig/Imakefile | 2
- nx-X11/lib/fontenc/Imakefile | 2
- nx-X11/lib/freetype2/Imakefile | 2
nx-X11/lib/oldX/Imakefile | 2
nx-X11/lib/psres/Imakefile | 2
- nx-X11/lib/regex/Imakefile | 2
nx-X11/lib/windows/Imakefile | 2
nx-X11/lib/xkbfile/Imakefile | 2
nx-X11/lib/xkbui/Imakefile | 2
- nx-X11/lib/zlib/Imakefile | 2
nx-X11/programs/Xserver/Imakefile | 18 -
- nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile | 2
nxcompext/Makefile.in | 4
nxcompshad/Makefile.in | 4
103 files changed, 294 insertions(+), 294 deletions(-)
@@ -1243,68 +1220,6 @@ Last-Update: 2012-02-15
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
---- a/nx-X11/extras/Mesa/src/mesa/main/Imakefile
-+++ b/nx-X11/extras/Mesa/src/mesa/main/Imakefile
-@@ -2,7 +2,7 @@
- #define DoSharedLib YES
- #define DoDebugLib NO
- #define DoProfileLib NO
--#define LibName MESAGL
-+#define LibName NX_MESAGL
- #define SoRev SOX11REV
- #define LibHeaders NO
-
---- a/nx-X11/extras/Xpm/lib/Imakefile
-+++ b/nx-X11/extras/Xpm/lib/Imakefile
-@@ -125,7 +125,7 @@
- STD_DEFINES = LibraryDefines
- CDEBUGFLAGS = LibraryCDebugFlags
- #else
--#define LibName Xpm
-+#define LibName NX_Xpm
- #define SoRev SOXPMLIBREV
- #define IncSubdir X11
- /* we have to cheat on Library.tmpl to get what we want... */
---- a/nx-X11/extras/drm/libdrm.pc.in
-+++ b/nx-X11/extras/drm/libdrm.pc.in
-@@ -6,5 +6,5 @@
- Name: libdrm
- Description: Userspace interface to kernel DRM services
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -ldrm
-+Libs: -L${libdir} -lNX_drm
- Cflags: -I${includedir} -I${includedir}/drm
---- a/nx-X11/extras/fontconfig/fontconfig.pc.in
-+++ b/nx-X11/extras/fontconfig/fontconfig.pc.in
-@@ -6,5 +6,5 @@
- Name: Fontconfig
- Description: Font configuration and customization library
- Version: @VERSION@
--Libs: -L${libdir} -lfontconfig
-+Libs: -L${libdir} -lNX_fontconfig
- Cflags: -I${includedir}
---- a/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile
-+++ b/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile
-@@ -36,7 +36,7 @@
- #define DoDebugLib DebugLibGlu
- #define DoProfileLib ProfileLibGlu
- #define IHaveSubdirs
--#define LibName GLU
-+#define LibName NX_GLU
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
- #define SoRev SOGLUREV
-
---- a/nx-X11/lib/FS/Imakefile
-+++ b/nx-X11/lib/FS/Imakefile
-@@ -11,7 +11,7 @@
- #define DoExtraLib SharedLibFS
- #define DoDebugLib DebugLibFS
- #define DoProfileLib ProfileLibFS
--#define LibName FS
-+#define LibName NX_FS
- #define SoRev SOFSREV
- #define IncSubdir X11
- #define IncSubSubdir fonts
--- a/nx-X11/lib/GLw/Imakefile
+++ b/nx-X11/lib/GLw/Imakefile
@@ -46,7 +46,7 @@
@@ -1316,28 +1231,6 @@ Last-Update: 2012-02-15
#define SoRev SOGLWREV
#define IncSubdir GL
---- a/nx-X11/lib/ICE/Imakefile
-+++ b/nx-X11/lib/ICE/Imakefile
-@@ -10,7 +10,7 @@
- #define DoExtraLib SharedLibICE
- #define DoDebugLib DebugLibICE
- #define DoProfileLib ProfileLibICE
--#define LibName ICE
-+#define LibName NX_ICE
- #define SoRev SOICEREV
- #define IncSubdir X11
- #define IncSubSubdir ICE
---- a/nx-X11/lib/SM/Imakefile
-+++ b/nx-X11/lib/SM/Imakefile
-@@ -10,7 +10,7 @@
- #define DoExtraLib SharedLibSM
- #define DoDebugLib DebugLibSM
- #define DoProfileLib ProfileLibSM
--#define LibName SM
-+#define LibName NX_SM
- #define SoRev SOSMREV
- #define IncSubdir X11
- #define IncSubSubdir SM
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -82,7 +82,7 @@
@@ -1404,17 +1297,6 @@ Last-Update: 2012-02-15
#define SoRev SOXAUTHREV
#define IncSubdir X11
---- a/nx-X11/lib/Xaw/Imakefile
-+++ b/nx-X11/lib/Xaw/Imakefile
-@@ -11,7 +11,7 @@
- #define DoDebugLib DebugLibXaw
- #define DoProfileLib ProfileLibXaw
- #define HasSharedData YES
--#define LibName Xaw
-+#define LibName NX_Xaw
- #define SoRev SOXAWREV
- #define IncSubdir X11
- #define IncSubSubdir Xaw
--- a/nx-X11/lib/Xaw6/Imakefile
+++ b/nx-X11/lib/Xaw6/Imakefile
@@ -5,7 +5,7 @@
@@ -1565,36 +1447,6 @@ Last-Update: 2012-02-15
#define SoRev SOXFONTCACHEREV
#define LibHeaders NO
---- a/nx-X11/lib/Xft/Imakefile
-+++ b/nx-X11/lib/Xft/Imakefile
-@@ -8,7 +8,7 @@
- #define DoProfileLib ProfileLibXft
-
- #define HasSharedData YES
--#define LibName Xft
-+#define LibName NX_Xft
- #define SoRev SOXFTREV
- #define IncSubdir X11
- #define IncSubSubdir Xft
---- a/nx-X11/lib/Xft/xft.pc.in
-+++ b/nx-X11/lib/Xft/xft.pc.in
-@@ -9,4 +9,4 @@
- Requires: xrender, fontconfig, freetype2
- Requires.private: xrender, fontconfig, freetype2
- Cflags: -I${includedir}
--Libs: -L${libdir} -lXft
-+Libs: -L${libdir} -lNX_Xft
---- a/nx-X11/lib/Xft1/Imakefile
-+++ b/nx-X11/lib/Xft1/Imakefile
-@@ -70,7 +70,7 @@
- #define DoDebugLib NO
- #define DoProfileLib NO
- #define HasSharedData YES
--#define LibName Xft
-+#define LibName NX_Xft
- #define SoRev SOXFT1REV
- #define LibHeaders NO
- #define NoSoSymlink
--- a/nx-X11/lib/Xi/Imakefile
+++ b/nx-X11/lib/Xi/Imakefile
@@ -10,7 +10,7 @@
@@ -1617,28 +1469,6 @@ Last-Update: 2012-02-15
#define SoRev SOXINERAMAREV
#define LibHeaders NO
---- a/nx-X11/lib/Xmu/Imakefile
-+++ b/nx-X11/lib/Xmu/Imakefile
-@@ -11,7 +11,7 @@
- #define DoDebugLib DebugLibXmu
- #define DoProfileLib ProfileLibXmu
- #define HasSharedData YES
--#define LibName Xmu
-+#define LibName NX_Xmu
- #define SoRev SOXMUREV
- #define IncSubdir X11
- #define IncSubSubdir Xmu
---- a/nx-X11/lib/Xmuu/Imakefile
-+++ b/nx-X11/lib/Xmuu/Imakefile
-@@ -11,7 +11,7 @@
- #define DoExtraLib SharedLibXmuu
- #define DoDebugLib DebugLibXmuu
- #define DoProfileLib ProfileLibXmuu
--#define LibName Xmuu
-+#define LibName NX_Xmuu
- #define SoRev SOXMUUREV
- #define LibHeaders NO
-
--- a/nx-X11/lib/Xp/Imakefile
+++ b/nx-X11/lib/Xp/Imakefile
@@ -44,7 +44,7 @@
@@ -1746,39 +1576,6 @@ Last-Update: 2012-02-15
#define SoRev SOXSSREV
#define LibHeaders NO
---- a/nx-X11/lib/Xt/Imakefile
-+++ b/nx-X11/lib/Xt/Imakefile
-@@ -42,7 +42,7 @@
- #define DoDebugLib DebugLibXt
- #define DoProfileLib ProfileLibXt
- #define HasSharedData YES
--#define LibName Xt
-+#define LibName NX_Xt
- #define SoRev SOXTREV
- #define IncSubdir X11
-
---- a/nx-X11/lib/Xt/Imakefile.NX.original
-+++ b/nx-X11/lib/Xt/Imakefile.NX.original
-@@ -42,7 +42,7 @@
- #define DoDebugLib DebugLibXt
- #define DoProfileLib ProfileLibXt
- #define HasSharedData YES
--#define LibName Xt
-+#define LibName NX_Xt
- #define SoRev SOXTREV
- #define IncSubdir X11
-
---- a/nx-X11/lib/Xt/Imakefile.X.original
-+++ b/nx-X11/lib/Xt/Imakefile.X.original
-@@ -11,7 +11,7 @@
- #define DoDebugLib DebugLibXt
- #define DoProfileLib ProfileLibXt
- #define HasSharedData YES
--#define LibName Xt
-+#define LibName NX_Xt
- #define SoRev SOXTREV
- #define IncSubdir X11
-
--- a/nx-X11/lib/Xtst/Imakefile
+++ b/nx-X11/lib/Xtst/Imakefile
@@ -10,7 +10,7 @@
@@ -1944,17 +1741,6 @@ Last-Update: 2012-02-15
#define SoRev SODPSTKREV
#define LibHeaders NO
---- a/nx-X11/lib/expat/Imakefile
-+++ b/nx-X11/lib/expat/Imakefile
-@@ -6,7 +6,7 @@
- #define DoDebugLib DebugLibExpat
- #define DoProfileLib ProfileLibExpat
- #define HasSharedData YES
--#define LibName expat
-+#define LibName NX_expat
- #define SoRev SOEXPATREV
- #ifdef SharedLibtoolExpatRev
- #define SharedLibtoolRev SharedLibtoolExpatRev
--- a/nx-X11/lib/font/Imakefile
+++ b/nx-X11/lib/font/Imakefile
@@ -31,7 +31,7 @@
@@ -1966,39 +1752,6 @@ Last-Update: 2012-02-15
SOREV = $(SOFONTREV)
#ifndef SeparateSharedCompile
---- a/nx-X11/lib/fontconfig/Imakefile
-+++ b/nx-X11/lib/fontconfig/Imakefile
-@@ -7,7 +7,7 @@
- #define DoDebugLib DebugLibFontconfig
- #define DoProfileLib ProfileLibFontconfig
- #define HasSharedData YES
--#define LibName fontconfig
-+#define LibName NX_fontconfig
- #define SoRev SOFONTCONFIGREV
- #define LibInstall InstallFontconfigLibrary
- #define LibHeaders InstallFontconfigLibrary
---- a/nx-X11/lib/fontenc/Imakefile
-+++ b/nx-X11/lib/fontenc/Imakefile
-@@ -17,7 +17,7 @@
- #define DoSharedLib SharedLibFontEnc
- #define DoDebugLib DebugLibFontEnc
- #define DoProfileLib ProfileLibFontEnc
--#define LibName fontenc
-+#define LibName NX_fontenc
- #define SoRev SOFONTENCREV
- #define IncSubdir X11
- #define IncSubSubdir fonts
---- a/nx-X11/lib/freetype2/Imakefile
-+++ b/nx-X11/lib/freetype2/Imakefile
-@@ -11,7 +11,7 @@
- #define DoDebugLib DebugLibFreetype2
- #define DoProfileLib ProfileLibFreetype2
- #define HasSharedData YES
--#define LibName freetype
-+#define LibName NX_freetype
- #define SoRev SOFREETYPE2REV
- #ifdef SharedLibtoolFreetype2Rev
- #define SharedLibtoolRev SharedLibtoolFreetype2Rev
--- a/nx-X11/lib/oldX/Imakefile
+++ b/nx-X11/lib/oldX/Imakefile
@@ -10,7 +10,7 @@
@@ -2021,17 +1774,6 @@ Last-Update: 2012-02-15
#define SoRev SOPSRESREV
#define LibHeaders NO
---- a/nx-X11/lib/regex/Imakefile
-+++ b/nx-X11/lib/regex/Imakefile
-@@ -6,7 +6,7 @@
- #define DoDebugLib NO
- #define DoProfileLib NO
- #define HasSharedData NO
--#define LibName regex
-+#define LibName NX_regex
- #define LibHeaders NO
- #define LibInstall NO
- #define LibInstallBuild YES
--- a/nx-X11/lib/windows/Imakefile
+++ b/nx-X11/lib/windows/Imakefile
@@ -2,7 +2,7 @@
@@ -2065,17 +1807,6 @@ Last-Update: 2012-02-15
#define SoRev SOXKBUIREV
#define IncSubdir X11
#define IncSubSubdir extensions
---- a/nx-X11/lib/zlib/Imakefile
-+++ b/nx-X11/lib/zlib/Imakefile
-@@ -12,7 +12,7 @@
- #define DoDebugLib NO
- #define DoProfileLib NO
- #define HasSharedData NO
--#define LibName z
-+#define LibName NX_z
- #define SoRev SOZLIBREV
-
- ZLIBDIR = $(TOP)/extras/zlib
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -313,7 +313,7 @@
@@ -2130,17 +1861,6 @@ Last-Update: 2012-02-15
#endif /* NXAgentServer */
#if defined(XnonServer) && XnonServer
---- a/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile
-+++ b/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile
-@@ -7,7 +7,7 @@
- #define DoDebugLib NO
- #define DoProfileLib NO
- #define HasSharedData NO
--#define LibName xf86config
-+#define LibName NX_xf86config
-
- #define UseDBMalloc NO
-
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -42,12 +42,12 @@
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 44ef2147d..92cc7f04d 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -141,40 +141,15 @@ rm -Rf "debian/"
#### bundled libraries and other stuff we do not need
UNUSED_FOLDERS="
- nx-X11/extras/drm/ \
- nx-X11/extras/expat/ \
- nx-X11/extras/fontconfig/ \
- nx-X11/extras/freetype2/ \
- nx-X11/extras/fonts/ \
- nx-X11/extras/ogl-sample/ \
- nx-X11/extras/regex/ \
- nx-X11/extras/rman/ \
- nx-X11/extras/ttf2pt1/ \
- nx-X11/extras/x86emu/ \
- nx-X11/extras/zlib/ \
- nx-X11/lib/expat/ \
- nx-X11/lib/fontconfig/ \
- nx-X11/lib/fontenc/ \
- nx-X11/lib/font/FreeType/ \
- nx-X11/lib/font/include/fontenc.h \
- nx-X11/lib/freetype2/ \
- nx-X11/lib/regex/ \
- nx-X11/lib/zlib/ \
- nx-X11/lib/FS/ \
- nx-X11/lib/ICE/ \
- nx-X11/lib/SM/ \
- nx-X11/lib/Xaw/ \
- nx-X11/lib/Xft/ \
- nx-X11/lib/Xt/ \
- nx-X11/lib/Xmu/ \
- nx-X11/lib/Xmuu/ \
+ nx-X11/config/docbook/ \
+ nx-X11/config/pswrap/ \
+ nx-X11/config/util/ \
nx-X11/extras/Mesa/bin/ \
nx-X11/extras/Mesa/config/ \
nx-X11/extras/Mesa/docs/ \
nx-X11/extras/Mesa/vms/ \
nx-X11/extras/Mesa/windows/ \
nx-X11/extras/Mesa/src/glw/ \
- nx-X11/extras/Mesa/src/glx/ \
nx-X11/extras/Mesa/src/mesa/drivers/dri/fb/ \
nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ \
nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/ \
@@ -196,6 +171,39 @@ UNUSED_FOLDERS="
nx-X11/extras/Mesa/src/mesa/drivers/dri/x11/ \
nx-X11/extras/Mesa/src/mesa/drivers/fbdev/ \
nx-X11/extras/Mesa/src/mesa/drivers/glide/ \
+ nx-X11/extras/drm/ \
+ nx-X11/extras/expat/ \
+ nx-X11/extras/fontconfig/ \
+ nx-X11/extras/freetype2/ \
+ nx-X11/extras/fonts/ \
+ nx-X11/extras/ogl-sample/ \
+ nx-X11/extras/regex/ \
+ nx-X11/extras/rman/ \
+ nx-X11/extras/ttf2pt1/ \
+ nx-X11/extras/x86emu/ \
+ nx-X11/extras/zlib/ \
+ nx-X11/lib/expat/ \
+ nx-X11/lib/fontconfig/ \
+ nx-X11/lib/fontenc/ \
+ nx-X11/lib/font/FreeType/ \
+ nx-X11/lib/font/include/fontenc.h \
+ nx-X11/lib/freetype2/ \
+ nx-X11/lib/regex/ \
+ nx-X11/lib/zlib/ \
+ nx-X11/lib/FS/ \
+ nx-X11/lib/ICE/ \
+ nx-X11/lib/SM/ \
+ nx-X11/lib/Xaw/ \
+ nx-X11/lib/Xft/ \
+ nx-X11/lib/Xt/ \
+ nx-X11/lib/Xmu/ \
+ nx-X11/lib/Xmuu/ \
+ nx-X11/nls/ \
+ nx-X11/programs/Xserver/afb/ \
+ nx-X11/programs/Xserver/cfb/ \
+ nx-X11/programs/Xserver/cfb16/ \
+ nx-X11/programs/Xserver/cfb24/ \
+ nx-X11/programs/Xserver/cfb32/ \
nx-X11/programs/Xserver/hw/darwin/ \
nx-X11/programs/Xserver/hw/dmx/ \
nx-X11/programs/Xserver/hw/kdrive/ \
@@ -205,15 +213,25 @@ UNUSED_FOLDERS="
nx-X11/programs/Xserver/hw/xnest/ \
nx-X11/programs/Xserver/hw/xwin/ \
nx-X11/programs/Xserver/hw/xfree86/ \
+ nx-X11/programs/Xserver/hw/xfree86/ \
+ nx-X11/programs/Xserver/ilbm/ \
+ nx-X11/programs/Xserver/iplan2p2/ \
+ nx-X11/programs/Xserver/iplan2p4/ \
+ nx-X11/programs/Xserver/iplan2p8/ \
+ nx-X11/programs/Xserver/lbx/ \
+ nx-X11/programs/Xserver/mfb/ \
+ nx-X11/programs/Xserver/miext/layer/ \
nx-X11/programs/Xserver/miext/shadow/ \
nx-X11/programs/Xserver/XpConfig/ \
nx-X11/programs/Xserver/Xprint/ \
nx-X11/programs/xterm/ \
+ nx-X11/util/ \
${NULL}
"
# folders to go away completely, but may get recreated by PRESERVE_SYMLINKED_FILES section below
CLEANUP_FOLDERS="
+ nx-X11/config/cf/ \
nx-X11/extras/Mesa/ \
nx-X11/extras/Xpm/ \
${NULL}
@@ -221,6 +239,143 @@ CLEANUP_FOLDERS="
# files that are symlinked into the nxagent Xserver, that we do need
PRESERVE_SYMLINKED_FILES="
+ nx-X11/config/cf/sunLib.tmpl.X.original
+ nx-X11/config/cf/Amoeba.cf
+ nx-X11/config/cf/sequent.cf
+ nx-X11/config/cf/cde.rules
+ nx-X11/config/cf/osfLib.rules
+ nx-X11/config/cf/mingw.rules
+ nx-X11/config/cf/X11.rules
+ nx-X11/config/cf/sunLib.tmpl
+ nx-X11/config/cf/cygwin.cf
+ nx-X11/config/cf/scoLib.rules
+ nx-X11/config/cf/os2def.db
+ nx-X11/config/cf/darwin.cf
+ nx-X11/config/cf/OpenBSDLib.tmpl
+ nx-X11/config/cf/oldlib.rules
+ nx-X11/config/cf/os2.rules
+ nx-X11/config/cf/pegasus.cf
+ nx-X11/config/cf/lnxLib.rules
+ nx-X11/config/cf/Win32.rules
+ nx-X11/config/cf/sco5.cf
+ nx-X11/config/cf/mingw.cf
+ nx-X11/config/cf/WinLib.tmpl
+ nx-X11/config/cf/apollo.cf
+ nx-X11/config/cf/convex.cf
+ nx-X11/config/cf/bsdLib.tmpl
+ nx-X11/config/cf/svr4.cf.X.original
+ nx-X11/config/cf/noop.rules
+ nx-X11/config/cf/dmx.cf
+ nx-X11/config/cf/sv3Lib.tmpl
+ nx-X11/config/cf/ibmLib.rules
+ nx-X11/config/cf/sv4Lib.rules
+ nx-X11/config/cf/hpLib.tmpl
+ nx-X11/config/cf/bsd.cf
+ nx-X11/config/cf/Motif.tmpl
+ nx-X11/config/cf/gnuLib.tmpl
+ nx-X11/config/cf/necLib.rules
+ nx-X11/config/cf/xorgsite.def
+ nx-X11/config/cf/QNX4.rules
+ nx-X11/config/cf/lynx.cf
+ nx-X11/config/cf/osf1.cf
+ nx-X11/config/cf/xf86.tmpl
+ nx-X11/config/cf/svr3.cf
+ nx-X11/config/cf/linux.cf
+ nx-X11/config/cf/minix.cf
+ nx-X11/config/cf/hp.cf
+ nx-X11/config/cf/QNX4.cf
+ nx-X11/config/cf/sgi.cf
+ nx-X11/config/cf/xf86.rules
+ nx-X11/config/cf/Imake.tmpl
+ nx-X11/config/cf/xprint_host.def
+ nx-X11/config/cf/xf86site.def
+ nx-X11/config/cf/ncr.cf
+ nx-X11/config/cf/sony.cf
+ nx-X11/config/cf/gnuLib.rules
+ nx-X11/config/cf/sun.cf.X.original
+ nx-X11/config/cf/OpenBSDLib.rules
+ nx-X11/config/cf/darwinLib.tmpl
+ nx-X11/config/cf/sequentLib.rules
+ nx-X11/config/cf/sv4Lib.tmpl
+ nx-X11/config/cf/hpLib.rules
+ nx-X11/config/cf/darwinLib.rules
+ nx-X11/config/cf/bsdiLib.tmpl
+ nx-X11/config/cf/host.def
+ nx-X11/config/cf/iPAQH3600.cf.NX.original
+ nx-X11/config/cf/Threads.tmpl
+ nx-X11/config/cf/nto.cf
+ nx-X11/config/cf/cygwin.tmpl
+ nx-X11/config/cf/sco.cf
+ nx-X11/config/cf/svr4.cf
+ nx-X11/config/cf/ServerLib.tmpl
+ nx-X11/config/cf/usl.cf
+ nx-X11/config/cf/sun.cf.NX.original
+ nx-X11/config/cf/host.def.NX.original
+ nx-X11/config/cf/sgiLib.tmpl
+ nx-X11/config/cf/cross.def.NX.original
+ nx-X11/config/cf/iPAQH3600.cf.X.original
+ nx-X11/config/cf/mingw.tmpl
+ nx-X11/config/cf/xorgversion.def
+ nx-X11/config/cf/sunLib.rules
+ nx-X11/config/cf/lnxLib.tmpl
+ nx-X11/config/cf/xfree86.cf
+ nx-X11/config/cf/sgiLib.rules
+ nx-X11/config/cf/ultrix.cf
+ nx-X11/config/cf/bsdiLib.rules
+ nx-X11/config/cf/ibm.cf
+ nx-X11/config/cf/cygwin.rules
+ nx-X11/config/cf/cross.def
+ nx-X11/config/cf/Win32.cf
+ nx-X11/config/cf/site.def
+ nx-X11/config/cf/os2.cf
+ nx-X11/config/cf/gnu.cf
+ nx-X11/config/cf/cross.rules
+ nx-X11/config/cf/nec.cf
+ nx-X11/config/cf/Library.tmpl
+ nx-X11/config/cf/OpenBSD.cf
+ nx-X11/config/cf/Server.tmpl
+ nx-X11/config/cf/fujitsu.cf
+ nx-X11/config/cf/os2Lib.tmpl
+ nx-X11/config/cf/Oki.cf
+ nx-X11/config/cf/README
+ nx-X11/config/cf/FreeBSD.cf
+ nx-X11/config/cf/site.sample
+ nx-X11/config/cf/bsdLib.rules
+ nx-X11/config/cf/Imake.cf
+ nx-X11/config/cf/cde.tmpl
+ nx-X11/config/cf/Motif.rules
+ nx-X11/config/cf/DragonFly.cf
+ nx-X11/config/cf/Mips.cf
+ nx-X11/config/cf/lnxdoc.rules
+ nx-X11/config/cf/necLib.tmpl
+ nx-X11/config/cf/lnxdoc.tmpl
+ nx-X11/config/cf/cross.def.X.original
+ nx-X11/config/cf/sunLib.tmpl.NX.original
+ nx-X11/config/cf/os2Lib.rules
+ nx-X11/config/cf/NetBSD.cf
+ nx-X11/config/cf/host.def.X.original
+ nx-X11/config/cf/moto.cf
+ nx-X11/config/cf/sv3Lib.rules
+ nx-X11/config/cf/bsdi.cf
+ nx-X11/config/cf/xorg.cf
+ nx-X11/config/cf/svr4.cf.NX.original
+ nx-X11/config/cf/DGUX.cf
+ nx-X11/config/cf/osfLib.tmpl
+ nx-X11/config/cf/x386.cf
+ nx-X11/config/cf/iPAQH3600.cf
+ nx-X11/config/cf/Imake.rules
+ nx-X11/config/cf/X11.tmpl
+ nx-X11/config/cf/luna.cf
+ nx-X11/config/cf/mach.cf
+ nx-X11/config/cf/xorg.tmpl
+ nx-X11/config/cf/ibmLib.tmpl
+ nx-X11/config/cf/isc.cf
+ nx-X11/config/cf/generic.cf
+ nx-X11/config/cf/sun.cf
+ nx-X11/config/cf/macII.cf
+ nx-X11/config/cf/cray.cf
+ nx-X11/config/cf/Imakefile
+ nx-X11/config/cf/nto.rules
nx-X11/extras/Mesa/include/GL/glext.h \
nx-X11/extras/Mesa/include/GL/gl.h \
nx-X11/extras/Mesa/include/GL/glxext.h \
@@ -874,8 +1029,13 @@ PRESERVE_SYMLINKED_FILES="
${NULL}
"
+PRESERVE_INCLUDED_FILES="
+ nx-X11/programs/Xserver/mfb/maskbits.h \
+ ${NULL}
+"
+
mkdir -p .preserve/
-for path in ${PRESERVE_SYMLINKED_FILES}; do
+for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES}; do
if [ ! -d $path ]; then
path_dirname=$(dirname "$path")
else
diff --git a/debian/rules b/debian/rules
index 72454772c..db56f8aa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,11 @@ else
CFLAGS += -O2
endif
+export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)"
+export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)"
+
%:
- CONFIGURE="./configure --prefix=/usr" LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt
+ CONFIGURE="./configure --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR)" dh $@ --with quilt
# before build, we will remove unused code / bundled libraries (keep this in sync with roll-tarball.sh)
UNUSED_FOLDERS = nx-X11/extras/drm/ \
@@ -741,19 +744,65 @@ PRESERVE_SYMLINKED_FILES = nx-X11/extras/Mesa/include/GL/glext.h \
override_dh_auto_clean:
rm -Rf nx-X11/.build-exports
- LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean
+ dh_auto_clean
override_dh_clean:
rm -f nx*/configure
rm -f nx*/changelog
rm -f nx-X11/programs/Xserver/hw/nxagent/changelog
rm -f nx-X11/programs/nxauth/changelog
- rm -Rf replace.sh Makefile bin rgb VERSION.x2goagent etc/keystrokes.cfg
- rm -f debian/libnx-x11.postinst
- rm -Rf .preserve/
+ if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi
+ . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
+ rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
+ rm -f debian/libnx-xinerama1.postinst
+ rm -fR .preserve/
if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi
dh_clean
+override_dh_install:
+
+ # handle builds for Debian squeeze (non multi-arch)
+ . ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \
+ find debian/*.install.in | while read file; do \
+ cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \
+ done; \
+ fi
+
+ # remove static libs
+ rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a
+ rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a
+
+ # remove extras, GL, and other unneeded headers
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/GL/
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/bitmaps/
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XInput.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/Print*.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmstr.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86misc.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dgastr.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxext.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxproto.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/fonts/
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/
+
+ dh_install --fail-missing
+
override_dh_auto_install:
PREFIX=/usr dh_auto_install -Smakefile
@@ -777,8 +826,8 @@ override_dh_auto_build:
ln -sf debian/VERSION VERSION.x2goagent
ln -sf ../debian/VERSION nxcomp/VERSION
- # let's prep the libnx-x11.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable
- sed debian/libnx-x11.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-x11.postinst
+ # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable
+ sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst
# make a copy of code to be preserved for build
mkdir -p .preserve
@@ -793,7 +842,25 @@ override_dh_auto_build:
cp -av .preserve/* .
rm -Rf .preserve/
- LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --parallel
+ SHLIBDIR=$(LIBDIR) PREFIX=/usr dh_auto_build --parallel
override_dh_strip:
- dh_strip --dbg-package=nx-x11-dbg
+ dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
+ dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg
+ dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg
+ dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg
+ dh_strip -plibnx-xdmcp6 --dbg-package=libnx-xdmcp6-dbg
+ dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg
+ dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg
+ dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg
+ dh_strip -plibnx-xpm4 --dbg-package=libnx-xpm4-dbg
+ dh_strip -plibnx-xrandr2 --dbg-package=libnx-xrandr2-dbg
+ dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg
+ dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg
+ dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg
+ dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg
+ dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg
+ dh_strip -pnxagent --dbg-package=nxagent-dbg
+ dh_strip -pnxproxy --dbg-package=nxproxy-dbg
+ dh_strip -pnxauth --dbg-package=nxauth-dbg
+
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 0aa6a1af1..000000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-nx-libs source: ancient-autotools-helper-file
-nx-libs source: outdated-autotools-helper-file
-nx-libs source: ancient-libtool
-nx-libs source: debian-revision-should-not-be-zero
diff --git a/debian/wrappers/nxagent b/debian/wrappers/nxagent
index 0aa75a82a..6306ed069 100644
--- a/debian/wrappers/nxagent
+++ b/debian/wrappers/nxagent
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/bin/$NXAPP "$@"
diff --git a/debian/wrappers/nxauth b/debian/wrappers/nxauth
index e49e79058..c8dbb83f3 100644
--- a/debian/wrappers/nxauth
+++ b/debian/wrappers/nxauth
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file
diff --git a/debian/wrappers/nxproxy b/debian/wrappers/nxproxy
index 7dfe2f3f0..23e7109e3 100644
--- a/debian/wrappers/nxproxy
+++ b/debian/wrappers/nxproxy
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file
diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent
index ba07a3f80..09011efbe 100644
--- a/debian/wrappers/x2goagent
+++ b/debian/wrappers/x2goagent
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
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
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
diff --git a/debian/x2goagent.keyboard b/debian/x2goagent.keyboard
new file mode 100644
index 000000000..afe283260
--- /dev/null
+++ b/debian/x2goagent.keyboard
@@ -0,0 +1 @@
+rules=xfree86
diff --git a/debian/x2goagent.lintian-overrides b/debian/x2goagent.lintian-overrides
deleted file mode 100644
index 9e142066d..000000000
--- a/debian/x2goagent.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-x2goagent: debian-revision-should-not-be-zero \ No newline at end of file