This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit b3d32ec569b8cd7efcb7a332d896eecd9681af02 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 27 13:56:36 2015 +0100 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. --- debian/Makefile.nx-libs | 33 +- debian/changelog | 31 +- debian/control | 1114 +++++++++++++++++++- debian/{libnx-x11.docs => libnx-x11-6.docs} | 0 debian/libnx-x11-6.install.in | 1 + debian/libnx-x11-dev.install.in | 15 + debian/libnx-x11.dirs | 3 - debian/libnx-x11.install | 2 - debian/libnx-x11.links | 2 - debian/libnx-x11.lintian-overrides | 4 - debian/libnx-xau-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xau6.docs} | 0 debian/libnx-xau6.install.in | 1 + debian/libnx-xcomposite-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xcomposite1.docs} | 0 debian/libnx-xcomposite1.install.in | 1 + debian/libnx-xdamage-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xdamage1.docs} | 0 debian/libnx-xdamage1.install.in | 1 + debian/libnx-xdmcp-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xdmcp6.docs} | 0 debian/libnx-xdmcp6.install.in | 1 + debian/libnx-xext-dev.install.in | 34 + debian/{libnx-x11.docs => libnx-xext6.docs} | 0 debian/libnx-xext6.install.in | 1 + debian/libnx-xfixes-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xfixes3.docs} | 0 debian/libnx-xfixes3.install.in | 1 + debian/libnx-xinerama-dev.install.in | 3 + debian/libnx-xinerama1.dirs | 1 + debian/{libnx-x11.docs => libnx-xinerama1.docs} | 0 debian/libnx-xinerama1.install.in | 1 + ...x11.postinst.in => libnx-xinerama1.postinst.in} | 0 debian/{libnx-x11.prerm => libnx-xinerama1.prerm} | 0 debian/libnx-xpm-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xpm4.docs} | 0 debian/libnx-xpm4.install.in | 1 + debian/libnx-xrandr-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xrandr2.docs} | 0 debian/libnx-xrandr2.install.in | 1 + debian/libnx-xrender-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xrender1.docs} | 0 debian/libnx-xrender1.install.in | 1 + debian/libnx-xtst-dev.install.in | 2 + debian/{libnx-x11.docs => libnx-xtst6.docs} | 0 debian/libnx-xtst6.install.in | 1 + debian/libxcomp-dev.install | 4 - debian/libxcomp-dev.install.in | 9 + debian/libxcomp-dev.lintian-overrides | 3 - debian/libxcomp3.install | 2 - debian/libxcomp3.install.in | 1 + debian/libxcomp3.links | 3 - debian/libxcomp3.lintian-overrides | 2 - debian/libxcompext-dev.install | 2 - debian/libxcompext-dev.install.in | 3 + debian/libxcompext-dev.lintian-overrides | 3 - debian/libxcompext3.install | 1 - debian/libxcompext3.install.in | 1 + debian/libxcompext3.links | 3 - debian/libxcompext3.lintian-overrides | 2 - debian/libxcompshad-dev.install | 4 - debian/libxcompshad-dev.install.in | 12 + debian/libxcompshad-dev.lintian-overrides | 3 - debian/libxcompshad3.install | 1 - debian/libxcompshad3.install.in | 1 + debian/libxcompshad3.links | 3 - debian/libxcompshad3.lintian-overrides | 2 - debian/nx-x11-common.install | 2 + debian/nx-x11proto-composite-dev.install.in | 2 + debian/nx-x11proto-core-dev.install.in | 23 + debian/nx-x11proto-damage-dev.install.in | 2 + debian/nx-x11proto-randr-dev.install.in | 2 + debian/nx-x11proto-render-dev.install.in | 3 + debian/nx-x11proto-xext-dev.install.in | 4 + debian/nx-x11proto-xfixes-dev.install.in | 3 + debian/nx-x11proto-xinerama-dev.install.in | 1 + debian/nxagent.install | 6 +- debian/nxagent.lintian-overrides | 2 - debian/nxauth.lintian-overrides | 2 - debian/nxproxy.install | 1 + debian/nxproxy.lintian-overrides | 2 - ...omp_makefile-uninstall+autoconf.full+lite.patch | 18 +- ...xcompext_makefile-uninstall+autoconf.full.patch | 14 +- ...compshad_makefile-uninstall+autoconf.full.patch | 18 +- debian/patches/031_nx-X11_parallel-make.full.patch | 129 +-- ...nxcompext+nxcompshad_unique-libnames.full.patch | 280 ----- debian/roll-tarballs.sh | 218 +++- debian/rules | 85 +- debian/source.lintian-overrides | 4 - debian/wrappers/nxagent | 3 - debian/wrappers/nxauth | 3 - debian/wrappers/nxproxy | 3 - debian/wrappers/x2goagent | 3 - debian/x2goagent.keyboard | 1 + debian/x2goagent.lintian-overrides | 1 - 95 files changed, 1582 insertions(+), 590 deletions(-) diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 8e023aa..97b2b6e 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 f60dc9c..1b7bb6b 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 44b99f3..fe3277b 100644 --- a/debian/control +++ b/debian/control @@ -25,42 +25,963 @@ 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}, + 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. + . + This package provides the core nx-X11 libraries customized for + nxagent. + +Package: libnx-x11-dev +Provides: libnx-x11-6-dev +Section: libdevel +Architecture: any +Breaks: nxlibs-dev (<=3.5.1), +Replaces: nxlibs-dev, +Depends: + libnx-x11-6 (= ${binary:Version}), + ${misc:Depends}, +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 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) -Replaces: nxlibs -Description: nx-X11 +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. . - This package provides the core nx-X11 libraries customized for - nxagent. + 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-x11-dev +Package: libnx-xinerama-dev +Provides: libnx-xinerama1-dev Section: libdevel Architecture: any -Breaks: nxlibs-dev (<=3.5.1) -Replaces: nxlibs-dev +Multi-Arch: same Depends: - libnx-x11 (= ${binary:Version}), + libnx-xinerama1 (= ${binary:Version}), + nx-x11proto-xinerama-dev (= ${binary:Version}), ${misc:Depends}, -Description: Library headers for nx-X11 (dummy package) +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. . - 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. + 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 similarity index 100% copy from debian/libnx-x11.docs copy to 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 0000000..4912d74 --- /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 0000000..331ec10 --- /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 339b13b..0000000 --- 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 fb609cc..0000000 --- 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 7331e79..0000000 --- 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 b462ee4..0000000 --- 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 0000000..dd17a60 --- /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-x11.docs b/debian/libnx-xau6.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xau6.docs diff --git a/debian/libnx-xau6.install.in b/debian/libnx-xau6.install.in new file mode 100644 index 0000000..246377f --- /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 0000000..e7e3a33 --- /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-x11.docs b/debian/libnx-xcomposite1.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xcomposite1.docs diff --git a/debian/libnx-xcomposite1.install.in b/debian/libnx-xcomposite1.install.in new file mode 100644 index 0000000..ecc2f42 --- /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 0000000..068f3ba --- /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-x11.docs b/debian/libnx-xdamage1.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xdamage1.docs diff --git a/debian/libnx-xdamage1.install.in b/debian/libnx-xdamage1.install.in new file mode 100644 index 0000000..42bd908 --- /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 0000000..2c2457b --- /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-x11.docs b/debian/libnx-xdmcp6.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xdmcp6.docs diff --git a/debian/libnx-xdmcp6.install.in b/debian/libnx-xdmcp6.install.in new file mode 100644 index 0000000..6910013 --- /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 0000000..9f4f605 --- /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-x11.docs b/debian/libnx-xext6.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xext6.docs diff --git a/debian/libnx-xext6.install.in b/debian/libnx-xext6.install.in new file mode 100644 index 0000000..361d951 --- /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 0000000..96b6cf6 --- /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-x11.docs b/debian/libnx-xfixes3.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xfixes3.docs diff --git a/debian/libnx-xfixes3.install.in b/debian/libnx-xfixes3.install.in new file mode 100644 index 0000000..b86ea4a --- /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 0000000..9837844 --- /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 0000000..aba613b --- /dev/null +++ b/debian/libnx-xinerama1.dirs @@ -0,0 +1 @@ +usr/lib/nx/X11/Xinerama diff --git a/debian/libnx-x11.docs b/debian/libnx-xinerama1.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xinerama1.docs diff --git a/debian/libnx-xinerama1.install.in b/debian/libnx-xinerama1.install.in new file mode 100644 index 0000000..d53de9c --- /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 similarity index 100% rename from debian/libnx-x11.postinst.in rename to debian/libnx-xinerama1.postinst.in diff --git a/debian/libnx-x11.prerm b/debian/libnx-xinerama1.prerm similarity index 100% rename from debian/libnx-x11.prerm rename to 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 0000000..36c9bb4 --- /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-x11.docs b/debian/libnx-xpm4.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xpm4.docs diff --git a/debian/libnx-xpm4.install.in b/debian/libnx-xpm4.install.in new file mode 100644 index 0000000..5bc9da2 --- /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 0000000..4711b6a --- /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-x11.docs b/debian/libnx-xrandr2.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xrandr2.docs diff --git a/debian/libnx-xrandr2.install.in b/debian/libnx-xrandr2.install.in new file mode 100644 index 0000000..f4d1b03 --- /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 0000000..392e200 --- /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-x11.docs b/debian/libnx-xrender1.docs similarity index 100% copy from debian/libnx-x11.docs copy to debian/libnx-xrender1.docs diff --git a/debian/libnx-xrender1.install.in b/debian/libnx-xrender1.install.in new file mode 100644 index 0000000..371550a --- /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 0000000..9dd16a1 --- /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-x11.docs b/debian/libnx-xtst6.docs similarity index 100% rename from debian/libnx-x11.docs rename to debian/libnx-xtst6.docs diff --git a/debian/libnx-xtst6.install.in b/debian/libnx-xtst6.install.in new file mode 100644 index 0000000..85350d8 --- /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 dd9b01d..0000000 --- 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 0000000..7b7bbe5 --- /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 a19d92b..0000000 --- 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 bef21a1..0000000 --- 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 0000000..9b8fa9f --- /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 4a141a2..0000000 --- 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 e8bee05..0000000 --- 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 fce72a4..0000000 --- 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 0000000..8be1925 --- /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 d1390c2..0000000 --- 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 88f74f8..0000000 --- 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 0000000..b9ac8eb --- /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 f34b5db..0000000 --- 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 a6856ec..0000000 --- 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 6816b15..0000000 --- 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 0000000..fe11227 --- /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 4569b64..0000000 --- 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 9307a38..0000000 --- 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 0000000..6b452b2 --- /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 c1790f9..0000000 --- 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 3f14de9..0000000 --- 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 0000000..7474911 --- /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 0000000..609454a --- /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 0000000..92c529f --- /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 0000000..949549f --- /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 0000000..d928016 --- /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 0000000..bf77871 --- /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 0000000..7e0ca50 --- /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 0000000..4b614d6 --- /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 0000000..36717e1 --- /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 ffe5e1a..90266c5 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 b937ae4..0000000 --- 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 0dd32c3..0000000 --- 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 46c2e0a..c7f7589 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 21fd7e4..0000000 --- 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 9b9da7e..af778fe 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 b704fc1..300c0a3 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 0577635..921eccc 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 1bacd1a..e87918a 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 4e6607e..ebc77ec 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 44ef214..92cc7f0 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 7245477..db56f8a 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 0aa6a1a..0000000 --- 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 0aa75a8..6306ed0 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 e49e790..c8dbb83 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 7dfe2f3..23e7109 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 ba07a3f..09011ef 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 0000000..afe2832 --- /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 9e14206..0000000 --- a/debian/x2goagent.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -x2goagent: debian-revision-should-not-be-zero \ No newline at end of file -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit bb70adf75aa95c94db3b4d7df5d2c526aa012cee Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 11:21:02 2015 +0100 Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files. --- debian/changelog | 1 + debian/patches/101_nxagent_set-rgb-path.full.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b7bb6b..a8cb9d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium + 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). + * Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files. [ Horst Schirmeier ] * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that diff --git a/debian/patches/101_nxagent_set-rgb-path.full.patch b/debian/patches/101_nxagent_set-rgb-path.full.patch index 793b19d..9d20bee 100644 --- a/debian/patches/101_nxagent_set-rgb-path.full.patch +++ b/debian/patches/101_nxagent_set-rgb-path.full.patch @@ -13,7 +13,7 @@ Last-Update: 2012-01-12 #include <unistd.h> -static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+static char* nxAltRgbPaths[] = {"/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; ++static char* nxAltRgbPaths[] = {"/etc/nxagent/rgb", "/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; static char _NXRgbPath[1024]; #endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 78c016e77f7b9edb42d3f3406a1c3227e5dc1d29 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 11:29:52 2015 +0100 Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. --- debian/changelog | 2 + ...gent_unbrand-nxagent-brand-x2goagent.full.patch | 48 ++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2883c3e..ea97edd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium file shipped with x2goagent supersede rgb file shipped with nxagent. FIXME: a better approach would be to decide at runtime if to use /etc/x2go/rgb or /etc/nxagent/rgb. + * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow + separate .keyboard files for x2goagent and nxagent. [ Horst Schirmeier ] * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch index db59976..62c85cf 100644 --- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch +++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch @@ -317,3 +317,51 @@ Last-Update: 2012-01-11 static char _NXRgbPath[1024]; #endif +--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +@@ -62,6 +62,7 @@ + + #include "globals.h" + #include "property.h" ++#include "Init.h" + + #include <X11/extensions/XKB.h> + +@@ -138,8 +139,11 @@ + #ifndef XKB_ALTERNATE_BASE_DIRECTORY + #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" + #endif +-#ifndef XKB_CONFIG_FILE +-#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" ++#ifndef XKB_CONFIG_FILE_NX ++#define XKB_CONFIG_FILE_NX "/etc/nxagent/nxagent.keyboard" ++#endif ++#ifndef XKB_CONFIG_FILE_X2GO ++#define XKB_CONFIG_FILE_X2GO "/etc/x2go/x2goagent.keyboard" + #endif + #ifndef XKB_DFLT_RULES_FILE + #define XKB_DFLT_RULES_FILE "xfree86" +@@ -988,7 +992,10 @@ + + XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); + +- nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); ++ if (nxagentX2go) ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO); ++ else ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX); + + nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); + +@@ -997,7 +1004,10 @@ + FatalError("nxagentKeyboardProc: malloc failed."); + } + +- strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); ++ if (nxagentX2go) ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO); ++ else ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX); + + #ifdef TEST + fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 0956f0c7df13ffd5028843bdf4960709e049e168 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 11:25:02 2015 +0100 Provide support for separate .keyboard files for nxagent/x2goagent. --- debian/x2goagent.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/x2goagent.install b/debian/x2goagent.install index 8bdd798..ad6b1d8 100644 --- a/debian/x2goagent.install +++ b/debian/x2goagent.install @@ -5,3 +5,4 @@ usr/share/x2go/rgb etc/x2go/rgb usr/share/x2go/versions/VERSION.x2goagent etc/x2go/keystrokes.cfg +etc/x2go/x2goagent.keyboard -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 100276175195da4d507e4498b8d0901c7a19d2ba Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 11:31:41 2015 +0100 debian/roll-tarball.sh: Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, x2goagent.keyboard). --- debian/changelog | 4 ++++ debian/roll-tarballs.sh | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index be0d472..cdbec3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. + * debian/roll-tarball.sh: + + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, + x2goagent.keyboard). + [ 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/roll-tarballs.sh b/debian/roll-tarballs.sh index 92cc7f0..ae550f8 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -87,7 +87,10 @@ if [ "x$MODE" = "xfull" ]; then cp -v $file doc/applied-patches echo ${file##*/} >> doc/applied-patches/series done - cp -v debian/rgb ./ + mkdir -p ./etc/ + cp -v debian/rgb ./etc/ + cp -v debian/nxagent.keyboard ./etc/ + cp -v debian/x2goagent.keyboard ./etc/ cp -v debian/VERSION ./VERSION.x2goagent else rm -Rf "nxcompshad"* @@ -101,6 +104,8 @@ else fi cp -v debian/VERSION ./nxcomp/VERSION cp -v debian/COPYING.full+lite COPYING +cp -v debian/nxagent.keyboard nxagent.keyboard +cp -v debian/x2goagent.keyboard x2goagent.keyboard # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 5565184a6de302ac6edbf5f52f237c0ff2b00283 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 12:58:30 2015 +0100 Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/folder lists in text files named debian/CODE-REDUCTION_*. --- debian/CODE-REDUCTION_CLEANUP-BACKUPFILES | 226 +++++++ debian/CODE-REDUCTION_CLEANUP-BRUTAL | 3 + debian/CODE-REDUCTION_CLEANUP-UNUSED | 57 ++ debian/CODE-REDUCTION_PRESERVE-INCLUDED | 1 + debian/CODE-REDUCTION_PRESERVE-NEEDED | 28 + debian/CODE-REDUCTION_PRESERVE-SYMLINKED | 650 +++++++++++++++++++++ debian/changelog | 5 +- debian/control | 1 + debian/roll-tarballs.sh | 910 +---------------------------- debian/rules | 746 +---------------------- 10 files changed, 1000 insertions(+), 1627 deletions(-) diff --git a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES new file mode 100644 index 0000000..ebd8113 --- /dev/null +++ b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES @@ -0,0 +1,226 @@ +nx-X11/CHANGELOG.NX.original +nx-X11/CHANGELOG.X.original +nx-X11/include/extensions/XKBsrv.h.NX.original +nx-X11/include/extensions/XKBsrv.h.X.original +nx-X11/include/Xpoll.h.in.NX.original +nx-X11/include/Xpoll.h.in.X.original +nx-X11/lib/font/fontfile/encparse.c.NX.original +nx-X11/lib/font/fontfile/encparse.c.X.original +nx-X11/lib/SM/sm_client.c.NX.original +nx-X11/lib/SM/sm_client.c.SM.original +nx-X11/lib/X11/ChkIfEv.c.NX.original +nx-X11/lib/X11/ChkIfEv.c.X.original +nx-X11/lib/X11/cmsProp.c.X.original +nx-X11/lib/X11/ConnDis.c.NX.original +nx-X11/lib/X11/ConnDis.c.X.original +nx-X11/lib/X11/IfEvent.c.NX.original +nx-X11/lib/X11/IfEvent.c.X.original +nx-X11/lib/X11/Imakefile.NX.original +nx-X11/lib/X11/Imakefile.X.original +nx-X11/lib/X11/MaskEvent.c.NX.original +nx-X11/lib/X11/MaskEvent.c.X.original +nx-X11/lib/X11/OpenDis.c.NX.original +nx-X11/lib/X11/OpenDis.c.X.original +nx-X11/lib/X11/PeekIfEv.c.NX.original +nx-X11/lib/X11/PeekIfEv.c.X.original +nx-X11/lib/X11/Pending.c.NX.original +nx-X11/lib/X11/Pending.c.X.original +nx-X11/lib/X11/XKBMAlloc.c.NX.original +nx-X11/lib/X11/XKBMAlloc.c.X.original +nx-X11/lib/X11/XlibAsync.c.NX.original +nx-X11/lib/X11/XlibAsync.c.X.original +nx-X11/lib/X11/Xlib.h.NX.original +nx-X11/lib/X11/Xlib.h.X.original +nx-X11/lib/X11/XlibInt.c.NX.original +nx-X11/lib/X11/XlibInt.c.X.original +nx-X11/lib/X11/Xlibint.h.NX.original +nx-X11/lib/X11/Xlibint.h.X.original +nx-X11/lib/Xau/AuRead.c.NX.original +nx-X11/lib/Xau/AuRead.c.X.original +nx-X11/lib/Xpm/Imakefile.NX.original +nx-X11/lib/Xpm/Imakefile.X.original +nx-X11/lib/Xrender/Glyph.c.NX.original +nx-X11/lib/Xrender/Glyph.c.X.original +nx-X11/lib/Xrender/Xrender.h.NX.original +nx-X11/lib/Xrender/Xrender.h.X.original +nx-X11/lib/xtrans/Xtranssock.c.NX.original +nx-X11/lib/xtrans/Xtranssock.c.X.original +nx-X11/programs/Imakefile.NX.original +nx-X11/programs/Imakefile.X.original +nx-X11/programs/Xserver/dix/dixfonts.c.NX.original +nx-X11/programs/Xserver/dix/dixfonts.c.X.original +nx-X11/programs/Xserver/dix/pixmap.c.NX.original +nx-X11/programs/Xserver/dix/pixmap.c.X.original +nx-X11/programs/Xserver/fb/fbtrap.c.NX.original +nx-X11/programs/Xserver/fb/fbtrap.c.X.original +nx-X11/programs/Xserver/fb/Imakefile.NX.original +nx-X11/programs/Xserver/fb/Imakefile.X.original +nx-X11/programs/Xserver/GL/glx/render2.c.NX.original +nx-X11/programs/Xserver/GL/glx/render2.c.X.original +nx-X11/programs/Xserver/GL/glx/render2swap.c.NX.original +nx-X11/programs/Xserver/GL/glx/render2swap.c.X.original +nx-X11/programs/Xserver/GL/mesa/main/Imakefile.NX.original +nx-X11/programs/Xserver/GL/mesa/main/Imakefile.X.original +nx-X11/programs/Xserver/GL/mesa/X/Imakefile.NX.original +nx-X11/programs/Xserver/GL/mesa/X/Imakefile.X.original +nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c.NX.original +nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c.X.original +nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXevents.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXevents.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXextension.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXextension.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXrender.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXrender.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXresource.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXresource.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXshm.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXshm.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.XF86.original +nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.X.original +nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original +nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.X.original +nx-X11/programs/Xserver/Imakefile.NX.original +nx-X11/programs/Xserver/Imakefile.X.original +nx-X11/programs/Xserver/include/dixstruct.h.NX.original +nx-X11/programs/Xserver/include/dixstruct.h.X.original +nx-X11/programs/Xserver/miext/rootless/Imakefile.NX.original +nx-X11/programs/Xserver/miext/rootless/Imakefile.X.original +nx-X11/programs/Xserver/mi/Imakefile.NX.original +nx-X11/programs/Xserver/mi/Imakefile.X.original +nx-X11/programs/Xserver/os/auth.c.NX.original +nx-X11/programs/Xserver/os/auth.c.X.original +nx-X11/programs/Xserver/os/connection.c.NX.original +nx-X11/programs/Xserver/os/connection.c.X.original +nx-X11/programs/Xserver/os/Imakefile.NX.original +nx-X11/programs/Xserver/os/Imakefile.X.original +nx-X11/programs/Xserver/os/log.c.NX.original +nx-X11/programs/Xserver/os/log.c.X.original +nx-X11/programs/Xserver/os/oscolor.c.NX.original +nx-X11/programs/Xserver/os/oscolor.c.X.original +nx-X11/programs/Xserver/os/utils.c.NX.original +nx-X11/programs/Xserver/os/utils.c.X.original +nx-X11/programs/Xserver/os/WaitFor.c.NX.original +nx-X11/programs/Xserver/os/WaitFor.c.X.original +nx-X11/programs/Xserver/os/xdmcp.c.NX.original +nx-X11/programs/Xserver/os/xdmcp.c.X.original +nx-X11/programs/Xserver/os/xprintf.c.NX.original +nx-X11/programs/Xserver/os/xprintf.c.X.original +nx-X11/programs/Xserver/randr/Imakefile.NX.original +nx-X11/programs/Xserver/randr/Imakefile.X.original +nx-X11/programs/Xserver/randr/panoramiXproto.h.NX.original +nx-X11/programs/Xserver/randr/panoramiXproto.h.X.original +nx-X11/programs/Xserver/randr/randr.c.NX.original +nx-X11/programs/Xserver/randr/randr.c.X.original +nx-X11/programs/Xserver/randr/randr.h.NX.original +nx-X11/programs/Xserver/randr/randr.h.X.original +nx-X11/programs/Xserver/randr/randrproto.h.NX.original +nx-X11/programs/Xserver/randr/randrproto.h.X.original +nx-X11/programs/Xserver/randr/registry.h.NX.original +nx-X11/programs/Xserver/randr/registry.h.X.original +nx-X11/programs/Xserver/randr/rrcrtc.c.NX.original +nx-X11/programs/Xserver/randr/rrcrtc.c.X.original +nx-X11/programs/Xserver/randr/rrdispatch.c.X.original +nx-X11/programs/Xserver/randr/rrmode.c.NX.original +nx-X11/programs/Xserver/randr/rrmode.c.X.original +nx-X11/programs/Xserver/randr/rrscreen.c.NX.original +nx-X11/programs/Xserver/randr/rrscreen.c.X.original +nx-X11/programs/Xserver/randr/rrxinerama.c.NX.original +nx-X11/programs/Xserver/randr/rrxinerama.c.X.original +nx-X11/programs/Xserver/randr.X.original +nx-X11/programs/Xserver/randr.X.original/Imakefile +nx-X11/programs/Xserver/randr.X.original/mirandr.c +nx-X11/programs/Xserver/randr.X.original/randr.c +nx-X11/programs/Xserver/randr.X.original/randrstr.h +nx-X11/programs/Xserver/render/renderedge.c.NX.original +nx-X11/programs/Xserver/render/renderedge.c.X.original +nx-X11/programs/Xserver/Xext/Imakefile.NX.original +nx-X11/programs/Xserver/Xext/Imakefile.X.original +nx-X11/programs/Xserver/Xext/security.c.NX.original +nx-X11/programs/Xserver/Xext/security.c.X.original +nx-X11/programs/Xserver/xfixes/cursor.c.NX.original +nx-X11/programs/Xserver/xfixes/cursor.c.X.original +nx-X11/programs/Xserver/xfixes/select.c.NX.original +nx-X11/programs/Xserver/xfixes/select.c.X.original +nx-X11/programs/Xserver/xkb/ddxKillSrv.c.NX.original +nx-X11/programs/Xserver/xkb/ddxKillSrv.c.X.original +nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original +nx-X11/programs/Xserver/xkb/ddxLoad.c.X.original +nx-X11/programs/Xserver/xkb/Imakefile.NX.original +nx-X11/programs/Xserver/xkb/Imakefile.X.original +nx-X11/programs/Xserver/xkb/xkbDflts.h.NX.original +nx-X11/programs/Xserver/xkb/xkbDflts.h.X.original +nx-X11/programs/xterm/charproc.c.NX.original +nx-X11/programs/xterm/charproc.c.X.original +nx-X11/programs/xterm/Imakefile.NX.original +nx-X11/programs/xterm/Imakefile.X.original +nx-X11/programs/xterm/main.c.NX.original +nx-X11/programs/xterm/main.c.X.original +nx-X11/WSDrawBuffer.h.X.original diff --git a/debian/CODE-REDUCTION_CLEANUP-BRUTAL b/debian/CODE-REDUCTION_CLEANUP-BRUTAL new file mode 100644 index 0000000..a964b21 --- /dev/null +++ b/debian/CODE-REDUCTION_CLEANUP-BRUTAL @@ -0,0 +1,3 @@ +nx-X11/config/cf/ +nx-X11/extras/Mesa/ +nx-X11/extras/Xpm/ diff --git a/debian/CODE-REDUCTION_CLEANUP-UNUSED b/debian/CODE-REDUCTION_CLEANUP-UNUSED new file mode 100644 index 0000000..a72ed11 --- /dev/null +++ b/debian/CODE-REDUCTION_CLEANUP-UNUSED @@ -0,0 +1,57 @@ +nx-X11/config/docbook/ +nx-X11/config/pswrap/ +nx-X11/extras/drm/ +nx-X11/extras/expat/ +nx-X11/extras/fontconfig/ +nx-X11/extras/fonts/ +nx-X11/extras/freetype2/ +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/FS/ +nx-X11/lib/ICE/ +nx-X11/lib/regex/ +nx-X11/lib/SM/ +nx-X11/lib/Xaw/ +nx-X11/lib/Xft/ +nx-X11/lib/Xmu/ +nx-X11/lib/Xmuu/ +nx-X11/lib/Xt/ +nx-X11/lib/zlib/ +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/ +nx-X11/programs/Xserver/hw/sun/ +nx-X11/programs/Xserver/hw/sunLynx/ +nx-X11/programs/Xserver/hw/vfb/ +nx-X11/programs/Xserver/hw/xfree86/ +nx-X11/programs/Xserver/hw/xfree86/ +nx-X11/programs/Xserver/hw/xnest/ +nx-X11/programs/Xserver/hw/xwin/ +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/ diff --git a/debian/CODE-REDUCTION_PRESERVE-INCLUDED b/debian/CODE-REDUCTION_PRESERVE-INCLUDED new file mode 100644 index 0000000..f45eaa7 --- /dev/null +++ b/debian/CODE-REDUCTION_PRESERVE-INCLUDED @@ -0,0 +1 @@ +nx-X11/programs/Xserver/mfb/maskbits.h diff --git a/debian/CODE-REDUCTION_PRESERVE-NEEDED b/debian/CODE-REDUCTION_PRESERVE-NEEDED new file mode 100644 index 0000000..159468f --- /dev/null +++ b/debian/CODE-REDUCTION_PRESERVE-NEEDED @@ -0,0 +1,28 @@ +nx-X11/config/cf/date.def +nx-X11/config/cf/host.def +nx-X11/config/cf/Imake.cf +nx-X11/config/cf/Imakefile +nx-X11/config/cf/Imake.rules +nx-X11/config/cf/Imake.tmpl +nx-X11/config/cf/Library.tmpl +nx-X11/config/cf/linux.cf +nx-X11/config/cf/lnxLib.rules +nx-X11/config/cf/lnxLib.tmpl +nx-X11/config/cf/Makefile +nx-X11/config/cf/noop.rules +nx-X11/config/cf/README +nx-X11/config/cf/ServerLib.tmpl +nx-X11/config/cf/Server.tmpl +nx-X11/config/cf/site.def +nx-X11/config/cf/Threads.tmpl +nx-X11/config/cf/version.def +nx-X11/config/cf/X11.rules +nx-X11/config/cf/X11.tmpl +nx-X11/config/cf/xf86.rules +nx-X11/config/cf/xf86site.def +nx-X11/config/cf/xf86.tmpl +nx-X11/config/cf/xfree86.cf +nx-X11/config/cf/xorg.cf +nx-X11/config/cf/xorgsite.def +nx-X11/config/cf/xorg.tmpl +nx-X11/config/cf/xorgversion.def diff --git a/debian/CODE-REDUCTION_PRESERVE-SYMLINKED b/debian/CODE-REDUCTION_PRESERVE-SYMLINKED new file mode 100644 index 0000000..d77095e --- /dev/null +++ b/debian/CODE-REDUCTION_PRESERVE-SYMLINKED @@ -0,0 +1,650 @@ +nx-X11/extras/Mesa/include/GL/glext.h +nx-X11/extras/Mesa/include/GL/gl.h +nx-X11/extras/Mesa/include/GL/glxext.h +nx-X11/extras/Mesa/include/GL/internal/glcore.h +nx-X11/extras/Mesa/include/GL/osmesa.h +nx-X11/extras/Mesa/include/GL/xmesa.h +nx-X11/extras/Mesa/include/GL/xmesa_xf86.h +nx-X11/extras/Mesa/src/glx/x11/compsize.c +nx-X11/extras/Mesa/src/glx/x11/indirect_size.c +nx-X11/extras/Mesa/src/glx/x11/indirect_size.h +nx-X11/extras/Mesa/src/mesa/array_cache/acache.h +nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c +nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h +nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c +nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c +nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h +nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c +nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h +nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h +nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c +nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c +nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c +nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h +nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c +nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c +nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c +nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h +nx-X11/extras/Mesa/src/mesa/glapi/glapi.c +nx-X11/extras/Mesa/src/mesa/glapi/glapi.h +nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h +nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h +nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h +nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +nx-X11/extras/Mesa/src/mesa/glapi/glthread.c +nx-X11/extras/Mesa/src/mesa/glapi/glthread.h +nx-X11/extras/Mesa/src/mesa/main/accum.c +nx-X11/extras/Mesa/src/mesa/main/accum.h +nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c +nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h +nx-X11/extras/Mesa/src/mesa/main/api_eval.h +nx-X11/extras/Mesa/src/mesa/main/api_loopback.c +nx-X11/extras/Mesa/src/mesa/main/api_loopback.h +nx-X11/extras/Mesa/src/mesa/main/api_noop.c +nx-X11/extras/Mesa/src/mesa/main/api_noop.h +nx-X11/extras/Mesa/src/mesa/main/api_validate.c +nx-X11/extras/Mesa/src/mesa/main/api_validate.h +nx-X11/extras/Mesa/src/mesa/main/attrib.c +nx-X11/extras/Mesa/src/mesa/main/attrib.h +nx-X11/extras/Mesa/src/mesa/main/blend.c +nx-X11/extras/Mesa/src/mesa/main/blend.h +nx-X11/extras/Mesa/src/mesa/main/bufferobj.c +nx-X11/extras/Mesa/src/mesa/main/bufferobj.h +nx-X11/extras/Mesa/src/mesa/main/buffers.c +nx-X11/extras/Mesa/src/mesa/main/buffers.h +nx-X11/extras/Mesa/src/mesa/main/clip.c +nx-X11/extras/Mesa/src/mesa/main/clip.h +nx-X11/extras/Mesa/src/mesa/main/colormac.h +nx-X11/extras/Mesa/src/mesa/main/colortab.c +nx-X11/extras/Mesa/src/mesa/main/colortab.h +nx-X11/extras/Mesa/src/mesa/main/config.h +nx-X11/extras/Mesa/src/mesa/main/context.c +nx-X11/extras/Mesa/src/mesa/main/context.h +nx-X11/extras/Mesa/src/mesa/main/convolve.c +nx-X11/extras/Mesa/src/mesa/main/convolve.h +nx-X11/extras/Mesa/src/mesa/main/dd.h +nx-X11/extras/Mesa/src/mesa/main/debug.c +nx-X11/extras/Mesa/src/mesa/main/debug.h +nx-X11/extras/Mesa/src/mesa/main/depth.c +nx-X11/extras/Mesa/src/mesa/main/depth.h +nx-X11/extras/Mesa/src/mesa/main/dispatch.c +nx-X11/extras/Mesa/src/mesa/main/dlist.c +nx-X11/extras/Mesa/src/mesa/main/dlist.h +nx-X11/extras/Mesa/src/mesa/main/drawpix.c +nx-X11/extras/Mesa/src/mesa/main/drawpix.h +nx-X11/extras/Mesa/src/mesa/main/enable.c +nx-X11/extras/Mesa/src/mesa/main/enable.h +nx-X11/extras/Mesa/src/mesa/main/enums.c +nx-X11/extras/Mesa/src/mesa/main/enums.h +nx-X11/extras/Mesa/src/mesa/main/eval.c +nx-X11/extras/Mesa/src/mesa/main/eval.h +nx-X11/extras/Mesa/src/mesa/main/execmem.c +nx-X11/extras/Mesa/src/mesa/main/extensions.c +nx-X11/extras/Mesa/src/mesa/main/extensions.h +nx-X11/extras/Mesa/src/mesa/main/fbobject.c +nx-X11/extras/Mesa/src/mesa/main/fbobject.h +nx-X11/extras/Mesa/src/mesa/main/feedback.c +nx-X11/extras/Mesa/src/mesa/main/feedback.h +nx-X11/extras/Mesa/src/mesa/main/fog.c +nx-X11/extras/Mesa/src/mesa/main/fog.h +nx-X11/extras/Mesa/src/mesa/main/framebuffer.c +nx-X11/extras/Mesa/src/mesa/main/framebuffer.h +nx-X11/extras/Mesa/src/mesa/main/get.c +nx-X11/extras/Mesa/src/mesa/main/get.h +nx-X11/extras/Mesa/src/mesa/main/getstring.c +nx-X11/extras/Mesa/src/mesa/main/glheader.h +nx-X11/extras/Mesa/src/mesa/main/hash.c +nx-X11/extras/Mesa/src/mesa/main/hash.h +nx-X11/extras/Mesa/src/mesa/main/hint.c +nx-X11/extras/Mesa/src/mesa/main/hint.h +nx-X11/extras/Mesa/src/mesa/main/histogram.c +nx-X11/extras/Mesa/src/mesa/main/histogram.h +nx-X11/extras/Mesa/src/mesa/main/image.c +nx-X11/extras/Mesa/src/mesa/main/image.h +nx-X11/extras/Mesa/src/mesa/main/imports.c +nx-X11/extras/Mesa/src/mesa/main/imports.h +nx-X11/extras/Mesa/src/mesa/main/light.c +nx-X11/extras/Mesa/src/mesa/main/light.h +nx-X11/extras/Mesa/src/mesa/main/lines.c +nx-X11/extras/Mesa/src/mesa/main/lines.h +nx-X11/extras/Mesa/src/mesa/main/macros.h +nx-X11/extras/Mesa/src/mesa/main/matrix.c +nx-X11/extras/Mesa/src/mesa/main/matrix.h +nx-X11/extras/Mesa/src/mesa/main/mm.c +nx-X11/extras/Mesa/src/mesa/main/mm.h +nx-X11/extras/Mesa/src/mesa/main/mtypes.h +nx-X11/extras/Mesa/src/mesa/main/occlude.c +nx-X11/extras/Mesa/src/mesa/main/occlude.h +nx-X11/extras/Mesa/src/mesa/main/pixel.c +nx-X11/extras/Mesa/src/mesa/main/pixel.h +nx-X11/extras/Mesa/src/mesa/main/points.c +nx-X11/extras/Mesa/src/mesa/main/points.h +nx-X11/extras/Mesa/src/mesa/main/polygon.c +nx-X11/extras/Mesa/src/mesa/main/polygon.h +nx-X11/extras/Mesa/src/mesa/main/rastpos.c +nx-X11/extras/Mesa/src/mesa/main/rastpos.h +nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c +nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h +nx-X11/extras/Mesa/src/mesa/main/simple_list.h +nx-X11/extras/Mesa/src/mesa/main/state.c +nx-X11/extras/Mesa/src/mesa/main/state.h +nx-X11/extras/Mesa/src/mesa/main/stencil.c +nx-X11/extras/Mesa/src/mesa/main/stencil.h +nx-X11/extras/Mesa/src/mesa/main/texcompress.c +nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c +nx-X11/extras/Mesa/src/mesa/main/texcompress.h +nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c +nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c +nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h +nx-X11/extras/Mesa/src/mesa/main/texformat.c +nx-X11/extras/Mesa/src/mesa/main/texformat.h +nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h +nx-X11/extras/Mesa/src/mesa/main/teximage.c +nx-X11/extras/Mesa/src/mesa/main/teximage.h +nx-X11/extras/Mesa/src/mesa/main/texobj.c +nx-X11/extras/Mesa/src/mesa/main/texobj.h +nx-X11/extras/Mesa/src/mesa/main/texrender.c +nx-X11/extras/Mesa/src/mesa/main/texrender.h +nx-X11/extras/Mesa/src/mesa/main/texstate.c +nx-X11/extras/Mesa/src/mesa/main/texstate.h +nx-X11/extras/Mesa/src/mesa/main/texstore.c +nx-X11/extras/Mesa/src/mesa/main/texstore.h +nx-X11/extras/Mesa/src/mesa/main/varray.c +nx-X11/extras/Mesa/src/mesa/main/varray.h +nx-X11/extras/Mesa/src/mesa/main/version.h +nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c +nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h +nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h +nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h +nx-X11/extras/Mesa/src/mesa/math/mathmod.h +nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h +nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h +nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c +nx-X11/extras/Mesa/src/mesa/math/m_debug.h +nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c +nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h +nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c +nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h +nx-X11/extras/Mesa/src/mesa/math/m_eval.c +nx-X11/extras/Mesa/src/mesa/math/m_eval.h +nx-X11/extras/Mesa/src/mesa/math/m_matrix.c +nx-X11/extras/Mesa/src/mesa/math/m_matrix.h +nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h +nx-X11/extras/Mesa/src/mesa/math/m_translate.c +nx-X11/extras/Mesa/src/mesa/math/m_translate.h +nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h +nx-X11/extras/Mesa/src/mesa/math/m_vector.c +nx-X11/extras/Mesa/src/mesa/math/m_vector.h +nx-X11/extras/Mesa/src/mesa/math/m_xform.c +nx-X11/extras/Mesa/src/mesa/math/m_xform.h +nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h +nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c +nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h +nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c +nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h +nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c +nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h +nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h +nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c +nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h +nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c +nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h +nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c +nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h +nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c +nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h +nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h +nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c +nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h +nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h +nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c +nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h +nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c +nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h +nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c +nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h +nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h +nx-X11/extras/Mesa/src/mesa/shader/program.c +nx-X11/extras/Mesa/src/mesa/shader/program.h +nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c +nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h +nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c +nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h +nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c +nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h +nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h +nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c +nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h +nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h +nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c +nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h +nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h +nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c +nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h +nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c +nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h +nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c +nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h +nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c +nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c +nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h +nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c +nx-X11/extras/Mesa/src/mesa/swrast/s_context.c +nx-X11/extras/Mesa/src/mesa/swrast/s_context.h +nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c +nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c +nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h +nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c +nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h +nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c +nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h +nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c +nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h +nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h +nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h +nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c +nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h +nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c +nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h +nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c +nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c +nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h +nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h +nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c +nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h +nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c +nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h +nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c +nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h +nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c +nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h +nx-X11/extras/Mesa/src/mesa/swrast/s_points.c +nx-X11/extras/Mesa/src/mesa/swrast/s_points.h +nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h +nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c +nx-X11/extras/Mesa/src/mesa/swrast/s_span.c +nx-X11/extras/Mesa/src/mesa/swrast/s_span.h +nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h +nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c +nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h +nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c +nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c +nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h +nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c +nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h +nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h +nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h +nx-X11/extras/Mesa/src/mesa/swrast/swrast.h +nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c +nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h +nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c +nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h +nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c +nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h +nx-X11/extras/Mesa/src/mesa/tnl/t_context.c +nx-X11/extras/Mesa/src/mesa/tnl/t_context.h +nx-X11/extras/Mesa/src/mesa/tnl/tnl.h +nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c +nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h +nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c +nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h +nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c +nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h +nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h +nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h +nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c +nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c +nx-X11/extras/Xpm/lib/Attrib.c +nx-X11/extras/Xpm/lib/CrBufFrI.c +nx-X11/extras/Xpm/lib/CrBufFrP.c +nx-X11/extras/Xpm/lib/CrDatFrI.c +nx-X11/extras/Xpm/lib/CrDatFrP.c +nx-X11/extras/Xpm/lib/create.c +nx-X11/extras/Xpm/lib/CrIFrBuf.c +nx-X11/extras/Xpm/lib/CrIFrDat.c +nx-X11/extras/Xpm/lib/CrIFrP.c +nx-X11/extras/Xpm/lib/CrPFrBuf.c +nx-X11/extras/Xpm/lib/CrPFrDat.c +nx-X11/extras/Xpm/lib/CrPFrI.c +nx-X11/extras/Xpm/lib/data.c +nx-X11/extras/Xpm/lib/hashtab.c +nx-X11/extras/Xpm/lib/Image.c +nx-X11/extras/Xpm/lib/Info.c +nx-X11/extras/Xpm/lib/misc.c +nx-X11/extras/Xpm/lib/parse.c +nx-X11/extras/Xpm/lib/RdFToBuf.c +nx-X11/extras/Xpm/lib/RdFToDat.c +nx-X11/extras/Xpm/lib/RdFToI.c +nx-X11/extras/Xpm/lib/RdFToP.c +nx-X11/extras/Xpm/lib/rgb.c +nx-X11/extras/Xpm/lib/scan.c +nx-X11/extras/Xpm/lib/WrFFrBuf.c +nx-X11/extras/Xpm/lib/WrFFrDat.c +nx-X11/extras/Xpm/lib/WrFFrI.c +nx-X11/extras/Xpm/lib/WrFFrP.c +nx-X11/extras/Xpm/lib/xpm.h +nx-X11/extras/Xpm/lib/XpmI.h +nx-X11/include/ap_keysym.h +nx-X11/include/bitmaps/1x1 +nx-X11/include/bitmaps/2x2 +nx-X11/include/bitmaps/black +nx-X11/include/bitmaps/boxes +nx-X11/include/bitmaps/calculator +nx-X11/include/bitmaps/cntr_ptr +nx-X11/include/bitmaps/cntr_ptrmsk +nx-X11/include/bitmaps/cross_weave +nx-X11/include/bitmaps/dimple1 +nx-X11/include/bitmaps/dimple3 +nx-X11/include/bitmaps/dot +nx-X11/include/bitmaps/dropbar7 +nx-X11/include/bitmaps/dropbar8 +nx-X11/include/bitmaps/escherknot +nx-X11/include/bitmaps/flagdown +nx-X11/include/bitmaps/flagup +nx-X11/include/bitmaps/flipped_gray +nx-X11/include/bitmaps/gray +nx-X11/include/bitmaps/gray1 +nx-X11/include/bitmaps/gray3 +nx-X11/include/bitmaps/grid16 +nx-X11/include/bitmaps/grid2 +nx-X11/include/bitmaps/grid4 +nx-X11/include/bitmaps/grid8 +nx-X11/include/bitmaps/hlines2 +nx-X11/include/bitmaps/hlines3 +nx-X11/include/bitmaps/icon +nx-X11/include/bitmaps/keyboard16 +nx-X11/include/bitmaps/left_ptr +nx-X11/include/bitmaps/left_ptrmsk +nx-X11/include/bitmaps/letters +nx-X11/include/bitmaps/light_gray +nx-X11/include/bitmaps/mailempty +nx-X11/include/bitmaps/mailemptymsk +nx-X11/include/bitmaps/mailfull +nx-X11/include/bitmaps/mailfullmsk +nx-X11/include/bitmaps/mensetmanus +nx-X11/include/bitmaps/menu10 +nx-X11/include/bitmaps/menu12 +nx-X11/include/bitmaps/menu16 +nx-X11/include/bitmaps/menu6 +nx-X11/include/bitmaps/menu8 +nx-X11/include/bitmaps/noletters +nx-X11/include/bitmaps/opendot +nx-X11/include/bitmaps/opendotMask +nx-X11/include/bitmaps/plaid +nx-X11/include/bitmaps/right_ptr +nx-X11/include/bitmaps/right_ptrmsk +nx-X11/include/bitmaps/root_weave +nx-X11/include/bitmaps/scales +nx-X11/include/bitmaps/sipb +nx-X11/include/bitmaps/star +nx-X11/include/bitmaps/starMask +nx-X11/include/bitmaps/stipple +nx-X11/include/bitmaps/target +nx-X11/include/bitmaps/terminal +nx-X11/include/bitmaps/tie_fighter +nx-X11/include/bitmaps/vlines2 +nx-X11/include/bitmaps/vlines3 +nx-X11/include/bitmaps/weird_size +nx-X11/include/bitmaps/wide_weave +nx-X11/include/bitmaps/wingdogs +nx-X11/include/bitmaps/woman +nx-X11/include/bitmaps/xfd_icon +nx-X11/include/bitmaps/xlogo11 +nx-X11/include/bitmaps/xlogo16 +nx-X11/include/bitmaps/xlogo32 +nx-X11/include/bitmaps/xlogo64 +nx-X11/include/bitmaps/xsnow +nx-X11/include/DECkeysym.h +nx-X11/include/extensions/bigreqstr.h +nx-X11/include/extensions/composite.h +nx-X11/include/extensions/compositeproto.h +nx-X11/include/extensions/damageproto.h +nx-X11/include/extensions/damagewire.h +nx-X11/include/extensions/dmxext.h +nx-X11/include/extensions/dmxproto.h +nx-X11/include/extensions/dpms.h +nx-X11/include/extensions/dpmsstr.h +nx-X11/include/extensions/extutil.h +nx-X11/include/extensions/lbxbuf.h +nx-X11/include/extensions/lbxbufstr.h +nx-X11/include/extensions/lbxdeltastr.h +nx-X11/include/extensions/lbximage.h +nx-X11/include/extensions/lbxopts.h +nx-X11/include/extensions/lbxstr.h +nx-X11/include/extensions/lbxzlib.h +nx-X11/include/extensions/MITMisc.h +nx-X11/include/extensions/mitmiscstr.h +nx-X11/include/extensions/multibuf.h +nx-X11/include/extensions/multibufst.h +nx-X11/include/extensions/panoramiXext.h +nx-X11/include/extensions/panoramiXproto.h +nx-X11/include/extensions/Print.h +nx-X11/include/extensions/Printstr.h +nx-X11/include/extensions/randr.h +nx-X11/include/extensions/randrproto.h +nx-X11/include/extensions/record.h +nx-X11/include/extensions/recordstr.h +nx-X11/include/extensions/render.h +nx-X11/include/extensions/renderproto.h +nx-X11/include/extensions/security.h +nx-X11/include/extensions/securstr.h +nx-X11/include/extensions/shape.h +nx-X11/include/extensions/shapestr.h +nx-X11/include/extensions/shmstr.h +nx-X11/include/extensions/sync.h +nx-X11/include/extensions/syncstr.h +nx-X11/include/extensions/vldXvMC.h +nx-X11/include/extensions/Xag.h +nx-X11/include/extensions/Xagsrv.h +nx-X11/include/extensions/Xagstr.h +nx-X11/include/extensions/xcmiscstr.h +nx-X11/include/extensions/Xcup.h +nx-X11/include/extensions/Xcupstr.h +nx-X11/include/extensions/Xdbe.h +nx-X11/include/extensions/Xdbeproto.h +nx-X11/include/extensions/Xevie.h +nx-X11/include/extensions/Xeviestr.h +nx-X11/include/extensions/XEVI.h +nx-X11/include/extensions/XEVIstr.h +nx-X11/include/extensions/Xext.h +nx-X11/include/extensions/xf86bigfont.h +nx-X11/include/extensions/xf86bigfstr.h +nx-X11/include/extensions/xf86dga1.h +nx-X11/include/extensions/xf86dga1str.h +nx-X11/include/extensions/xf86dga.h +nx-X11/include/extensions/xf86dgastr.h +nx-X11/include/extensions/xf86misc.h +nx-X11/include/extensions/xf86mscstr.h +nx-X11/include/extensions/xf86vmode.h +nx-X11/include/extensions/xf86vmstr.h +nx-X11/include/extensions/xfixesproto.h +nx-X11/include/extensions/xfixeswire.h +nx-X11/include/extensions/XI.h +nx-X11/include/extensions/Xinerama.h +nx-X11/include/extensions/XInput.h +nx-X11/include/extensions/XIproto.h +nx-X11/include/extensions/XKBgeom.h +nx-X11/include/extensions/XKB.h +nx-X11/include/extensions/XKBproto.h +nx-X11/include/extensions/XKBsrv.h +nx-X11/include/extensions/XKBstr.h +nx-X11/include/extensions/XLbx.h +nx-X11/include/extensions/XRes.h +nx-X11/include/extensions/XResproto.h +nx-X11/include/extensions/XShm.h +nx-X11/include/extensions/xtestext1.h +nx-X11/include/extensions/XTest.h +nx-X11/include/extensions/xteststr.h +nx-X11/include/extensions/xtrapbits.h +nx-X11/include/extensions/xtrapddmi.h +nx-X11/include/extensions/xtrapdi.h +nx-X11/include/extensions/xtrapemacros.h +nx-X11/include/extensions/xtraplib.h +nx-X11/include/extensions/xtraplibp.h +nx-X11/include/extensions/xtrapproto.h +nx-X11/include/extensions/Xv.h +nx-X11/include/extensions/Xvlib.h +nx-X11/include/extensions/XvMC.h +nx-X11/include/extensions/XvMClib.h +nx-X11/include/extensions/XvMCproto.h +nx-X11/include/extensions/Xvproto.h +nx-X11/include/fonts/font.h +nx-X11/include/fonts/fontstruct.h +nx-X11/include/fonts/FS.h +nx-X11/include/fonts/fsmasks.h +nx-X11/include/fonts/FSproto.h +nx-X11/include/GL/glu.h +nx-X11/include/GL/glx.h +nx-X11/include/GL/glxint.h +nx-X11/include/GL/glxmd.h +nx-X11/include/GL/glxproto.h +nx-X11/include/GL/glxtokens.h +nx-X11/include/HPkeysym.h +nx-X11/include/keysymdef.h +nx-X11/include/keysym.h +nx-X11/include/Sunkeysym.h +nx-X11/include/Xalloca.h +nx-X11/include/Xarch.h +nx-X11/include/Xatom.h +nx-X11/include/Xdefs.h +nx-X11/include/XF86keysym.h +nx-X11/include/Xfuncproto.h +nx-X11/include/Xfuncs.h +nx-X11/include/X.h +nx-X11/include/Xmd.h +nx-X11/include/Xosdefs.h +nx-X11/include/Xos.h +nx-X11/include/Xos_r.h +nx-X11/include/Xproto.h +nx-X11/include/Xprotostr.h +nx-X11/include/Xthreads.h +nx-X11/include/XWDFile.h +nx-X11/lib/font/bitmap/bdfint.h +nx-X11/lib/font/bitmap/pcf.h +nx-X11/lib/font/include/bitmap.h +nx-X11/lib/font/include/bufio.h +nx-X11/lib/font/include/fntfil.h +nx-X11/lib/font/include/fntfilio.h +nx-X11/lib/font/include/fntfilst.h +nx-X11/lib/font/include/fontencc.h +nx-X11/lib/font/include/fontmisc.h +nx-X11/lib/font/include/fontmod.h +nx-X11/lib/font/include/fontshow.h +nx-X11/lib/font/include/fontutil.h +nx-X11/lib/font/include/fontxlfd.h +nx-X11/lib/misc/strlcat.c +nx-X11/lib/misc/strlcpy.c +nx-X11/lib/oldX/X10.h +nx-X11/lib/X11/cursorfont.h +nx-X11/lib/X11/ImUtil.h +nx-X11/lib/X11/Xcms.h +nx-X11/lib/X11/XKBAlloc.c +nx-X11/lib/X11/XKBGAlloc.c +nx-X11/lib/X11/XKBlib.h +nx-X11/lib/X11/XKBMAlloc.c +nx-X11/lib/X11/XKBMisc.c +nx-X11/lib/X11/XlibConf.h +nx-X11/lib/X11/Xlib.h +nx-X11/lib/X11/Xlibint.h +nx-X11/lib/X11/Xlocale.h +nx-X11/lib/X11/Xregion.h +nx-X11/lib/X11/Xresource.h +nx-X11/lib/X11/Xutil.h +nx-X11/lib/Xau/AuDispose.c +nx-X11/lib/Xau/AuFileName.c +nx-X11/lib/Xau/AuGetBest.c +nx-X11/lib/Xau/AuRead.c +nx-X11/lib/Xau/Xauth.h +nx-X11/lib/Xcomposite/Xcomposite.h +nx-X11/lib/Xdamage/Xdamage.h +nx-X11/lib/Xdmcp/Wrap.c +nx-X11/lib/Xdmcp/Wrap.h +nx-X11/lib/Xdmcp/Wraphelp.c +nx-X11/lib/Xdmcp/Xdmcp.h +nx-X11/lib/Xfixes/Xfixes.h +nx-X11/lib/xkbfile/maprules.c +nx-X11/lib/xkbfile/XKBbells.h +nx-X11/lib/xkbfile/xkbconfig.c +nx-X11/lib/xkbfile/XKBconfig.h +nx-X11/lib/xkbfile/xkberrs.c +nx-X11/lib/xkbfile/XKBfile.h +nx-X11/lib/xkbfile/xkbmisc.c +nx-X11/lib/xkbfile/xkbout.c +nx-X11/lib/xkbfile/XKBrules.h +nx-X11/lib/xkbfile/xkbtext.c +nx-X11/lib/xkbfile/XKMformat.h +nx-X11/lib/xkbfile/XKM.h +nx-X11/lib/xkbfile/xkmread.c +nx-X11/lib/Xrandr/Xrandr.h +nx-X11/lib/Xrender/Xrender.h +nx-X11/lib/xtrans/transport.c +nx-X11/lib/xtrans/Xtrans.c +nx-X11/lib/xtrans/Xtransdnet.c +nx-X11/lib/xtrans/Xtrans.h +nx-X11/lib/xtrans/Xtransint.h +nx-X11/lib/xtrans/Xtranslcl.c +nx-X11/lib/xtrans/Xtransos2.c +nx-X11/lib/xtrans/Xtranssock.c +nx-X11/lib/xtrans/Xtranstli.c +nx-X11/lib/xtrans/Xtransutil.c +nx-X11/programs/Xserver/hw/xfree86/common/compiler.h +nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h +nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h +nx-X11/programs/Xserver/hw/xfree86/xf86Version.h +nx-X11/programs/Xserver/include/misc.h +nx-X11/programs/Xserver/include/os.h +nx-X11/programs/Xserver/mi/miinitext.c +nx-X11/programs/Xserver/os/osdep.h +nx-X11/programs/Xserver/Xext/extmod/modinit.h +nx-X11/programs/Xserver/Xi/stubs.c diff --git a/debian/changelog b/debian/changelog index 1bd36fd..a5cc573 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. - * NX code reduction efforts (from 93Mb to 52Mb): + * NX code reduction efforts (from 93Mb to 60Mb): - 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. @@ -32,6 +32,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium . nx-X11/programs/Xserver/XpConfig/ . nx-X11/programs/Xserver/Xprint/ - Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore. + - Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/ + folder lists in text files named debian/CODE-REDUCTION_*. * Debian/Ubuntu packaging: + Fully rework the way nx-libs gets packaged for Debian/Ubuntu. @@ -53,6 +55,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium shell globbing with curly braces). + Correctly link config files (etc/rgb, etc/nxagent.keyboard, etc/x2goagent.keyboard) before dh_auto_build. + + Add to B-D: expat. * nx-libs.spec: + The gpg-offline bin:package is not available in our SLE repo. We can do diff --git a/debian/control b/debian/control index fe3277b..eaaec02 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Build-Depends: autoconf, pkg-config, x11proto-core-dev, + expat, Build-Conflicts: x11proto-kb-dev, x11proto-randr-dev, diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index ae550f8..4b4624f 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -140,907 +140,21 @@ test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx- test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh + +#### stuff we do not needed +UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` +CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` +UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` +PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` +PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` +PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` + # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" -#### bundled libraries and other stuff we do not need -UNUSED_FOLDERS=" - 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/mesa/drivers/dri/fb/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/ \ - 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/ \ - nx-X11/programs/Xserver/hw/sun/ \ - nx-X11/programs/Xserver/hw/sunLynx/ \ - nx-X11/programs/Xserver/hw/vfb/ \ - 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} -" - -# 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 \ - nx-X11/extras/Mesa/include/GL/internal/glcore.h \ - nx-X11/extras/Mesa/include/GL/osmesa.h \ - nx-X11/extras/Mesa/include/GL/xmesa.h \ - nx-X11/extras/Mesa/include/GL/xmesa_xf86.h \ - nx-X11/extras/Mesa/src/glx/x11/compsize.c \ - nx-X11/extras/Mesa/src/glx/x11/indirect_size.c \ - nx-X11/extras/Mesa/src/glx/x11/indirect_size.h \ - nx-X11/extras/Mesa/src/mesa/array_cache/acache.h \ - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c \ - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h \ - nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c \ - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c \ - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h \ - nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapi.c \ - nx-X11/extras/Mesa/src/mesa/glapi/glapi.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glthread.c \ - nx-X11/extras/Mesa/src/mesa/glapi/glthread.h \ - nx-X11/extras/Mesa/src/mesa/main/accum.c \ - nx-X11/extras/Mesa/src/mesa/main/accum.h \ - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c \ - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h \ - nx-X11/extras/Mesa/src/mesa/main/api_eval.h \ - nx-X11/extras/Mesa/src/mesa/main/api_loopback.c \ - nx-X11/extras/Mesa/src/mesa/main/api_loopback.h \ - nx-X11/extras/Mesa/src/mesa/main/api_noop.c \ - nx-X11/extras/Mesa/src/mesa/main/api_noop.h \ - nx-X11/extras/Mesa/src/mesa/main/api_validate.c \ - nx-X11/extras/Mesa/src/mesa/main/api_validate.h \ - nx-X11/extras/Mesa/src/mesa/main/attrib.c \ - nx-X11/extras/Mesa/src/mesa/main/attrib.h \ - nx-X11/extras/Mesa/src/mesa/main/blend.c \ - nx-X11/extras/Mesa/src/mesa/main/blend.h \ - nx-X11/extras/Mesa/src/mesa/main/bufferobj.c \ - nx-X11/extras/Mesa/src/mesa/main/bufferobj.h \ - nx-X11/extras/Mesa/src/mesa/main/buffers.c \ - nx-X11/extras/Mesa/src/mesa/main/buffers.h \ - nx-X11/extras/Mesa/src/mesa/main/clip.c \ - nx-X11/extras/Mesa/src/mesa/main/clip.h \ - nx-X11/extras/Mesa/src/mesa/main/colormac.h \ - nx-X11/extras/Mesa/src/mesa/main/colortab.c \ - nx-X11/extras/Mesa/src/mesa/main/colortab.h \ - nx-X11/extras/Mesa/src/mesa/main/config.h \ - nx-X11/extras/Mesa/src/mesa/main/context.c \ - nx-X11/extras/Mesa/src/mesa/main/context.h \ - nx-X11/extras/Mesa/src/mesa/main/convolve.c \ - nx-X11/extras/Mesa/src/mesa/main/convolve.h \ - nx-X11/extras/Mesa/src/mesa/main/dd.h \ - nx-X11/extras/Mesa/src/mesa/main/debug.c \ - nx-X11/extras/Mesa/src/mesa/main/debug.h \ - nx-X11/extras/Mesa/src/mesa/main/depth.c \ - nx-X11/extras/Mesa/src/mesa/main/depth.h \ - nx-X11/extras/Mesa/src/mesa/main/dispatch.c \ - nx-X11/extras/Mesa/src/mesa/main/dlist.c \ - nx-X11/extras/Mesa/src/mesa/main/dlist.h \ - nx-X11/extras/Mesa/src/mesa/main/drawpix.c \ - nx-X11/extras/Mesa/src/mesa/main/drawpix.h \ - nx-X11/extras/Mesa/src/mesa/main/enable.c \ - nx-X11/extras/Mesa/src/mesa/main/enable.h \ - nx-X11/extras/Mesa/src/mesa/main/enums.c \ - nx-X11/extras/Mesa/src/mesa/main/enums.h \ - nx-X11/extras/Mesa/src/mesa/main/eval.c \ - nx-X11/extras/Mesa/src/mesa/main/eval.h \ - nx-X11/extras/Mesa/src/mesa/main/execmem.c \ - nx-X11/extras/Mesa/src/mesa/main/extensions.c \ - nx-X11/extras/Mesa/src/mesa/main/extensions.h \ - nx-X11/extras/Mesa/src/mesa/main/fbobject.c \ - nx-X11/extras/Mesa/src/mesa/main/fbobject.h \ - nx-X11/extras/Mesa/src/mesa/main/feedback.c \ - nx-X11/extras/Mesa/src/mesa/main/feedback.h \ - nx-X11/extras/Mesa/src/mesa/main/fog.c \ - nx-X11/extras/Mesa/src/mesa/main/fog.h \ - nx-X11/extras/Mesa/src/mesa/main/framebuffer.c \ - nx-X11/extras/Mesa/src/mesa/main/framebuffer.h \ - nx-X11/extras/Mesa/src/mesa/main/get.c \ - nx-X11/extras/Mesa/src/mesa/main/get.h \ - nx-X11/extras/Mesa/src/mesa/main/getstring.c \ - nx-X11/extras/Mesa/src/mesa/main/glheader.h \ - nx-X11/extras/Mesa/src/mesa/main/hash.c \ - nx-X11/extras/Mesa/src/mesa/main/hash.h \ - nx-X11/extras/Mesa/src/mesa/main/hint.c \ - nx-X11/extras/Mesa/src/mesa/main/hint.h \ - nx-X11/extras/Mesa/src/mesa/main/histogram.c \ - nx-X11/extras/Mesa/src/mesa/main/histogram.h \ - nx-X11/extras/Mesa/src/mesa/main/image.c \ - nx-X11/extras/Mesa/src/mesa/main/image.h \ - nx-X11/extras/Mesa/src/mesa/main/imports.c \ - nx-X11/extras/Mesa/src/mesa/main/imports.h \ - nx-X11/extras/Mesa/src/mesa/main/light.c \ - nx-X11/extras/Mesa/src/mesa/main/light.h \ - nx-X11/extras/Mesa/src/mesa/main/lines.c \ - nx-X11/extras/Mesa/src/mesa/main/lines.h \ - nx-X11/extras/Mesa/src/mesa/main/macros.h \ - nx-X11/extras/Mesa/src/mesa/main/matrix.c \ - nx-X11/extras/Mesa/src/mesa/main/matrix.h \ - nx-X11/extras/Mesa/src/mesa/main/mm.c \ - nx-X11/extras/Mesa/src/mesa/main/mm.h \ - nx-X11/extras/Mesa/src/mesa/main/mtypes.h \ - nx-X11/extras/Mesa/src/mesa/main/occlude.c \ - nx-X11/extras/Mesa/src/mesa/main/occlude.h \ - nx-X11/extras/Mesa/src/mesa/main/pixel.c \ - nx-X11/extras/Mesa/src/mesa/main/pixel.h \ - nx-X11/extras/Mesa/src/mesa/main/points.c \ - nx-X11/extras/Mesa/src/mesa/main/points.h \ - nx-X11/extras/Mesa/src/mesa/main/polygon.c \ - nx-X11/extras/Mesa/src/mesa/main/polygon.h \ - nx-X11/extras/Mesa/src/mesa/main/rastpos.c \ - nx-X11/extras/Mesa/src/mesa/main/rastpos.h \ - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c \ - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h \ - nx-X11/extras/Mesa/src/mesa/main/simple_list.h \ - nx-X11/extras/Mesa/src/mesa/main/state.c \ - nx-X11/extras/Mesa/src/mesa/main/state.h \ - nx-X11/extras/Mesa/src/mesa/main/stencil.c \ - nx-X11/extras/Mesa/src/mesa/main/stencil.h \ - nx-X11/extras/Mesa/src/mesa/main/texcompress.c \ - nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c \ - nx-X11/extras/Mesa/src/mesa/main/texcompress.h \ - nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c \ - nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c \ - nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h \ - nx-X11/extras/Mesa/src/mesa/main/texformat.c \ - nx-X11/extras/Mesa/src/mesa/main/texformat.h \ - nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h \ - nx-X11/extras/Mesa/src/mesa/main/teximage.c \ - nx-X11/extras/Mesa/src/mesa/main/teximage.h \ - nx-X11/extras/Mesa/src/mesa/main/texobj.c \ - nx-X11/extras/Mesa/src/mesa/main/texobj.h \ - nx-X11/extras/Mesa/src/mesa/main/texrender.c \ - nx-X11/extras/Mesa/src/mesa/main/texrender.h \ - nx-X11/extras/Mesa/src/mesa/main/texstate.c \ - nx-X11/extras/Mesa/src/mesa/main/texstate.h \ - nx-X11/extras/Mesa/src/mesa/main/texstore.c \ - nx-X11/extras/Mesa/src/mesa/main/texstore.h \ - nx-X11/extras/Mesa/src/mesa/main/varray.c \ - nx-X11/extras/Mesa/src/mesa/main/varray.h \ - nx-X11/extras/Mesa/src/mesa/main/version.h \ - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c \ - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h \ - nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h \ - nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h \ - nx-X11/extras/Mesa/src/mesa/math/mathmod.h \ - nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c \ - nx-X11/extras/Mesa/src/mesa/math/m_debug.h \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c \ - nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_eval.c \ - nx-X11/extras/Mesa/src/mesa/math/m_eval.h \ - nx-X11/extras/Mesa/src/mesa/math/m_matrix.c \ - nx-X11/extras/Mesa/src/mesa/math/m_matrix.h \ - nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_translate.c \ - nx-X11/extras/Mesa/src/mesa/math/m_translate.h \ - nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_vector.c \ - nx-X11/extras/Mesa/src/mesa/math/m_vector.h \ - nx-X11/extras/Mesa/src/mesa/math/m_xform.c \ - nx-X11/extras/Mesa/src/mesa/math/m_xform.h \ - nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c \ - nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h \ - nx-X11/extras/Mesa/src/mesa/shader/program.c \ - nx-X11/extras/Mesa/src/mesa/shader/program.h \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_context.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_context.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_points.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_points.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_span.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_span.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/swrast.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_context.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_context.h \ - nx-X11/extras/Mesa/src/mesa/tnl/tnl.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c \ - nx-X11/extras/Xpm/lib/Attrib.c \ - nx-X11/extras/Xpm/lib/CrBufFrI.c \ - nx-X11/extras/Xpm/lib/CrBufFrP.c \ - nx-X11/extras/Xpm/lib/CrDatFrI.c \ - nx-X11/extras/Xpm/lib/CrDatFrP.c \ - nx-X11/extras/Xpm/lib/create.c \ - nx-X11/extras/Xpm/lib/CrIFrBuf.c \ - nx-X11/extras/Xpm/lib/CrIFrDat.c \ - nx-X11/extras/Xpm/lib/CrIFrP.c \ - nx-X11/extras/Xpm/lib/CrPFrBuf.c \ - nx-X11/extras/Xpm/lib/CrPFrDat.c \ - nx-X11/extras/Xpm/lib/CrPFrI.c \ - nx-X11/extras/Xpm/lib/data.c \ - nx-X11/extras/Xpm/lib/hashtab.c \ - nx-X11/extras/Xpm/lib/Image.c \ - nx-X11/extras/Xpm/lib/Info.c \ - nx-X11/extras/Xpm/lib/misc.c \ - nx-X11/extras/Xpm/lib/parse.c \ - nx-X11/extras/Xpm/lib/RdFToBuf.c \ - nx-X11/extras/Xpm/lib/RdFToDat.c \ - nx-X11/extras/Xpm/lib/RdFToI.c \ - nx-X11/extras/Xpm/lib/RdFToP.c \ - nx-X11/extras/Xpm/lib/rgb.c \ - nx-X11/extras/Xpm/lib/scan.c \ - nx-X11/extras/Xpm/lib/WrFFrBuf.c \ - nx-X11/extras/Xpm/lib/WrFFrDat.c \ - nx-X11/extras/Xpm/lib/WrFFrI.c \ - nx-X11/extras/Xpm/lib/WrFFrP.c \ - nx-X11/extras/Xpm/lib/xpm.h \ - nx-X11/extras/Xpm/lib/XpmI.h \ - nx-X11/include/ap_keysym.h \ - nx-X11/include/bitmaps/1x1 \ - nx-X11/include/bitmaps/2x2 \ - nx-X11/include/bitmaps/black \ - nx-X11/include/bitmaps/boxes \ - nx-X11/include/bitmaps/calculator \ - nx-X11/include/bitmaps/cntr_ptr \ - nx-X11/include/bitmaps/cntr_ptrmsk \ - nx-X11/include/bitmaps/cross_weave \ - nx-X11/include/bitmaps/dimple1 \ - nx-X11/include/bitmaps/dimple3 \ - nx-X11/include/bitmaps/dot \ - nx-X11/include/bitmaps/dropbar7 \ - nx-X11/include/bitmaps/dropbar8 \ - nx-X11/include/bitmaps/escherknot \ - nx-X11/include/bitmaps/flagdown \ - nx-X11/include/bitmaps/flagup \ - nx-X11/include/bitmaps/flipped_gray \ - nx-X11/include/bitmaps/gray \ - nx-X11/include/bitmaps/gray1 \ - nx-X11/include/bitmaps/gray3 \ - nx-X11/include/bitmaps/grid16 \ - nx-X11/include/bitmaps/grid2 \ - nx-X11/include/bitmaps/grid4 \ - nx-X11/include/bitmaps/grid8 \ - nx-X11/include/bitmaps/hlines2 \ - nx-X11/include/bitmaps/hlines3 \ - nx-X11/include/bitmaps/icon \ - nx-X11/include/bitmaps/keyboard16 \ - nx-X11/include/bitmaps/left_ptr \ - nx-X11/include/bitmaps/left_ptrmsk \ - nx-X11/include/bitmaps/letters \ - nx-X11/include/bitmaps/light_gray \ - nx-X11/include/bitmaps/mailempty \ - nx-X11/include/bitmaps/mailemptymsk \ - nx-X11/include/bitmaps/mailfull \ - nx-X11/include/bitmaps/mailfullmsk \ - nx-X11/include/bitmaps/mensetmanus \ - nx-X11/include/bitmaps/menu10 \ - nx-X11/include/bitmaps/menu12 \ - nx-X11/include/bitmaps/menu16 \ - nx-X11/include/bitmaps/menu6 \ - nx-X11/include/bitmaps/menu8 \ - nx-X11/include/bitmaps/noletters \ - nx-X11/include/bitmaps/opendot \ - nx-X11/include/bitmaps/opendotMask \ - nx-X11/include/bitmaps/plaid \ - nx-X11/include/bitmaps/right_ptr \ - nx-X11/include/bitmaps/right_ptrmsk \ - nx-X11/include/bitmaps/root_weave \ - nx-X11/include/bitmaps/scales \ - nx-X11/include/bitmaps/sipb \ - nx-X11/include/bitmaps/star \ - nx-X11/include/bitmaps/starMask \ - nx-X11/include/bitmaps/stipple \ - nx-X11/include/bitmaps/target \ - nx-X11/include/bitmaps/terminal \ - nx-X11/include/bitmaps/tie_fighter \ - nx-X11/include/bitmaps/vlines2 \ - nx-X11/include/bitmaps/vlines3 \ - nx-X11/include/bitmaps/weird_size \ - nx-X11/include/bitmaps/wide_weave \ - nx-X11/include/bitmaps/wingdogs \ - nx-X11/include/bitmaps/woman \ - nx-X11/include/bitmaps/xfd_icon \ - nx-X11/include/bitmaps/xlogo11 \ - nx-X11/include/bitmaps/xlogo16 \ - nx-X11/include/bitmaps/xlogo32 \ - nx-X11/include/bitmaps/xlogo64 \ - nx-X11/include/bitmaps/xsnow \ - nx-X11/include/DECkeysym.h \ - nx-X11/include/extensions/bigreqstr.h \ - nx-X11/include/extensions/composite.h \ - nx-X11/include/extensions/compositeproto.h \ - nx-X11/include/extensions/damageproto.h \ - nx-X11/include/extensions/damagewire.h \ - nx-X11/include/extensions/dmxext.h \ - nx-X11/include/extensions/dmxproto.h \ - nx-X11/include/extensions/dpms.h \ - nx-X11/include/extensions/dpmsstr.h \ - nx-X11/include/extensions/extutil.h \ - nx-X11/include/extensions/lbxbuf.h \ - nx-X11/include/extensions/lbxbufstr.h \ - nx-X11/include/extensions/lbxdeltastr.h \ - nx-X11/include/extensions/lbximage.h \ - nx-X11/include/extensions/lbxopts.h \ - nx-X11/include/extensions/lbxstr.h \ - nx-X11/include/extensions/lbxzlib.h \ - nx-X11/include/extensions/MITMisc.h \ - nx-X11/include/extensions/mitmiscstr.h \ - nx-X11/include/extensions/multibuf.h \ - nx-X11/include/extensions/multibufst.h \ - nx-X11/include/extensions/panoramiXext.h \ - nx-X11/include/extensions/panoramiXproto.h \ - nx-X11/include/extensions/Print.h \ - nx-X11/include/extensions/Printstr.h \ - nx-X11/include/extensions/randr.h \ - nx-X11/include/extensions/randrproto.h \ - nx-X11/include/extensions/record.h \ - nx-X11/include/extensions/recordstr.h \ - nx-X11/include/extensions/render.h \ - nx-X11/include/extensions/renderproto.h \ - nx-X11/include/extensions/security.h \ - nx-X11/include/extensions/securstr.h \ - nx-X11/include/extensions/shape.h \ - nx-X11/include/extensions/shapestr.h \ - nx-X11/include/extensions/shmstr.h \ - nx-X11/include/extensions/sync.h \ - nx-X11/include/extensions/syncstr.h \ - nx-X11/include/extensions/vldXvMC.h \ - nx-X11/include/extensions/Xag.h \ - nx-X11/include/extensions/Xagsrv.h \ - nx-X11/include/extensions/Xagstr.h \ - nx-X11/include/extensions/xcmiscstr.h \ - nx-X11/include/extensions/Xcup.h \ - nx-X11/include/extensions/Xcupstr.h \ - nx-X11/include/extensions/Xdbe.h \ - nx-X11/include/extensions/Xdbeproto.h \ - nx-X11/include/extensions/Xevie.h \ - nx-X11/include/extensions/Xeviestr.h \ - nx-X11/include/extensions/XEVI.h \ - nx-X11/include/extensions/XEVIstr.h \ - nx-X11/include/extensions/Xext.h \ - nx-X11/include/extensions/xf86bigfont.h \ - nx-X11/include/extensions/xf86bigfstr.h \ - nx-X11/include/extensions/xf86dga1.h \ - nx-X11/include/extensions/xf86dga1str.h \ - nx-X11/include/extensions/xf86dga.h \ - nx-X11/include/extensions/xf86dgastr.h \ - nx-X11/include/extensions/xf86misc.h \ - nx-X11/include/extensions/xf86mscstr.h \ - nx-X11/include/extensions/xf86vmode.h \ - nx-X11/include/extensions/xf86vmstr.h \ - nx-X11/include/extensions/xfixesproto.h \ - nx-X11/include/extensions/xfixeswire.h \ - nx-X11/include/extensions/XI.h \ - nx-X11/include/extensions/Xinerama.h \ - nx-X11/include/extensions/XInput.h \ - nx-X11/include/extensions/XIproto.h \ - nx-X11/include/extensions/XKBgeom.h \ - nx-X11/include/extensions/XKB.h \ - nx-X11/include/extensions/XKBproto.h \ - nx-X11/include/extensions/XKBsrv.h \ - nx-X11/include/extensions/XKBstr.h \ - nx-X11/include/extensions/XLbx.h \ - nx-X11/include/extensions/XRes.h \ - nx-X11/include/extensions/XResproto.h \ - nx-X11/include/extensions/XShm.h \ - nx-X11/include/extensions/xtestext1.h \ - nx-X11/include/extensions/XTest.h \ - nx-X11/include/extensions/xteststr.h \ - nx-X11/include/extensions/xtrapbits.h \ - nx-X11/include/extensions/xtrapddmi.h \ - nx-X11/include/extensions/xtrapdi.h \ - nx-X11/include/extensions/xtrapemacros.h \ - nx-X11/include/extensions/xtraplib.h \ - nx-X11/include/extensions/xtraplibp.h \ - nx-X11/include/extensions/xtrapproto.h \ - nx-X11/include/extensions/Xv.h \ - nx-X11/include/extensions/Xvlib.h \ - nx-X11/include/extensions/XvMC.h \ - nx-X11/include/extensions/XvMClib.h \ - nx-X11/include/extensions/XvMCproto.h \ - nx-X11/include/extensions/Xvproto.h \ - nx-X11/include/fonts/font.h \ - nx-X11/include/fonts/fontstruct.h \ - nx-X11/include/fonts/FS.h \ - nx-X11/include/fonts/fsmasks.h \ - nx-X11/include/fonts/FSproto.h \ - nx-X11/include/GL/glu.h \ - nx-X11/include/GL/glx.h \ - nx-X11/include/GL/glxint.h \ - nx-X11/include/GL/glxmd.h \ - nx-X11/include/GL/glxproto.h \ - nx-X11/include/GL/glxtokens.h \ - nx-X11/include/HPkeysym.h \ - nx-X11/include/keysymdef.h \ - nx-X11/include/keysym.h \ - nx-X11/include/Sunkeysym.h \ - nx-X11/include/Xalloca.h \ - nx-X11/include/Xarch.h \ - nx-X11/include/Xatom.h \ - nx-X11/include/Xdefs.h \ - nx-X11/include/XF86keysym.h \ - nx-X11/include/Xfuncproto.h \ - nx-X11/include/Xfuncs.h \ - nx-X11/include/X.h \ - nx-X11/include/Xmd.h \ - nx-X11/include/Xosdefs.h \ - nx-X11/include/Xos.h \ - nx-X11/include/Xos_r.h \ - nx-X11/include/Xproto.h \ - nx-X11/include/Xprotostr.h \ - nx-X11/include/Xthreads.h \ - nx-X11/include/XWDFile.h \ - nx-X11/lib/font/bitmap/bdfint.h \ - nx-X11/lib/font/bitmap/pcf.h \ - nx-X11/lib/font/include/bitmap.h \ - nx-X11/lib/font/include/bufio.h \ - nx-X11/lib/font/include/fntfil.h \ - nx-X11/lib/font/include/fntfilio.h \ - nx-X11/lib/font/include/fntfilst.h \ - nx-X11/lib/font/include/fontencc.h \ - nx-X11/lib/font/include/fontmisc.h \ - nx-X11/lib/font/include/fontmod.h \ - nx-X11/lib/font/include/fontshow.h \ - nx-X11/lib/font/include/fontutil.h \ - nx-X11/lib/font/include/fontxlfd.h \ - nx-X11/lib/misc/strlcat.c \ - nx-X11/lib/misc/strlcpy.c \ - nx-X11/lib/oldX/X10.h \ - nx-X11/lib/X11/cursorfont.h \ - nx-X11/lib/X11/ImUtil.h \ - nx-X11/lib/X11/Xcms.h \ - nx-X11/lib/X11/XKBAlloc.c \ - nx-X11/lib/X11/XKBGAlloc.c \ - nx-X11/lib/X11/XKBlib.h \ - nx-X11/lib/X11/XKBMAlloc.c \ - nx-X11/lib/X11/XKBMisc.c \ - nx-X11/lib/X11/XlibConf.h \ - nx-X11/lib/X11/Xlib.h \ - nx-X11/lib/X11/Xlibint.h \ - nx-X11/lib/X11/Xlocale.h \ - nx-X11/lib/X11/Xregion.h \ - nx-X11/lib/X11/Xresource.h \ - nx-X11/lib/X11/Xutil.h \ - nx-X11/lib/Xau/AuDispose.c \ - nx-X11/lib/Xau/AuFileName.c \ - nx-X11/lib/Xau/AuGetBest.c \ - nx-X11/lib/Xau/AuRead.c \ - nx-X11/lib/Xau/Xauth.h \ - nx-X11/lib/Xcomposite/Xcomposite.h \ - nx-X11/lib/Xdamage/Xdamage.h \ - nx-X11/lib/Xdmcp/Wrap.c \ - nx-X11/lib/Xdmcp/Wrap.h \ - nx-X11/lib/Xdmcp/Wraphelp.c \ - nx-X11/lib/Xdmcp/Xdmcp.h \ - nx-X11/lib/Xfixes/Xfixes.h \ - nx-X11/lib/xkbfile/maprules.c \ - nx-X11/lib/xkbfile/XKBbells.h \ - nx-X11/lib/xkbfile/xkbconfig.c \ - nx-X11/lib/xkbfile/XKBconfig.h \ - nx-X11/lib/xkbfile/xkberrs.c \ - nx-X11/lib/xkbfile/XKBfile.h \ - nx-X11/lib/xkbfile/xkbmisc.c \ - nx-X11/lib/xkbfile/xkbout.c \ - nx-X11/lib/xkbfile/XKBrules.h \ - nx-X11/lib/xkbfile/xkbtext.c \ - nx-X11/lib/xkbfile/XKMformat.h \ - nx-X11/lib/xkbfile/XKM.h \ - nx-X11/lib/xkbfile/xkmread.c \ - nx-X11/lib/Xrandr/Xrandr.h \ - nx-X11/lib/Xrender/Xrender.h \ - nx-X11/lib/xtrans/transport.c \ - nx-X11/lib/xtrans/Xtrans.c \ - nx-X11/lib/xtrans/Xtransdnet.c \ - nx-X11/lib/xtrans/Xtrans.h \ - nx-X11/lib/xtrans/Xtransint.h \ - nx-X11/lib/xtrans/Xtranslcl.c \ - nx-X11/lib/xtrans/Xtransos2.c \ - nx-X11/lib/xtrans/Xtranssock.c \ - nx-X11/lib/xtrans/Xtranstli.c \ - nx-X11/lib/xtrans/Xtransutil.c \ - nx-X11/programs/Xserver/hw/xfree86/common/compiler.h \ - nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h \ - nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h \ - nx-X11/programs/Xserver/hw/xfree86/xf86Version.h \ - nx-X11/programs/Xserver/include/misc.h \ - nx-X11/programs/Xserver/include/os.h \ - nx-X11/programs/Xserver/mi/miinitext.c \ - nx-X11/programs/Xserver/os/osdep.h \ - nx-X11/programs/Xserver/Xext/extmod/modinit.h \ - nx-X11/programs/Xserver/Xi/stubs.c \ - ${NULL} -" - -PRESERVE_INCLUDED_FILES=" - nx-X11/programs/Xserver/mfb/maskbits.h \ - ${NULL} -" - mkdir -p .preserve/ -for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES}; do +for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do if [ ! -d $path ]; then path_dirname=$(dirname "$path") else @@ -1050,8 +164,8 @@ for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES}; do cp -av "$path" ".preserve/$path" done -for folder in ${UNUSED_FOLDERS} ${CLEAN_FOLDERS}; do - rm -Rf "$folder" +for path in ${UNUSED_FOLDERS} ${CLEAN_FOLDERS} ${UNNEEDED_BACKUPS}; do + rm -R "$path" done # re-create the to-be-preserved files diff --git a/debian/rules b/debian/rules index a62bc68..f1ec963 100755 --- a/debian/rules +++ b/debian/rules @@ -16,731 +16,12 @@ export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARC 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/ \ - 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/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/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/ \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/ \ - 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/programs/Xserver/hw/darwin/ \ - nx-X11/programs/Xserver/hw/dmx/ \ - nx-X11/programs/Xserver/hw/kdrive/ \ - nx-X11/programs/Xserver/hw/sun/ \ - nx-X11/programs/Xserver/hw/sunLynx/ \ - nx-X11/programs/Xserver/hw/vfb/ \ - nx-X11/programs/Xserver/hw/xnest/ \ - nx-X11/programs/Xserver/hw/xwin/ \ - nx-X11/programs/Xserver/hw/xfree86/ \ - nx-X11/programs/Xserver/miext/shadow/ \ - nx-X11/programs/Xserver/XpConfig/ \ - nx-X11/programs/Xserver/Xprint/ \ - nx-X11/programs/xterm/ \ - $(NULL) - -CLEANUP_FOLDERS = nx-X11/extras/Mesa/ \ - nx-X11/extras/Xpm/ \ - $(NULL) - -PRESERVE_SYMLINKED_FILES = nx-X11/extras/Mesa/include/GL/glext.h \ - nx-X11/extras/Mesa/include/GL/gl.h \ - nx-X11/extras/Mesa/include/GL/glxext.h \ - nx-X11/extras/Mesa/include/GL/internal/glcore.h \ - nx-X11/extras/Mesa/include/GL/osmesa.h \ - nx-X11/extras/Mesa/include/GL/xmesa.h \ - nx-X11/extras/Mesa/include/GL/xmesa_xf86.h \ - nx-X11/extras/Mesa/src/glx/x11/compsize.c \ - nx-X11/extras/Mesa/src/glx/x11/indirect_size.c \ - nx-X11/extras/Mesa/src/glx/x11/indirect_size.h \ - nx-X11/extras/Mesa/src/mesa/array_cache/acache.h \ - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c \ - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h \ - nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c \ - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c \ - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c \ - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c \ - nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h \ - nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapi.c \ - nx-X11/extras/Mesa/src/mesa/glapi/glapi.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h \ - nx-X11/extras/Mesa/src/mesa/glapi/glthread.c \ - nx-X11/extras/Mesa/src/mesa/glapi/glthread.h \ - nx-X11/extras/Mesa/src/mesa/main/accum.c \ - nx-X11/extras/Mesa/src/mesa/main/accum.h \ - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c \ - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h \ - nx-X11/extras/Mesa/src/mesa/main/api_eval.h \ - nx-X11/extras/Mesa/src/mesa/main/api_loopback.c \ - nx-X11/extras/Mesa/src/mesa/main/api_loopback.h \ - nx-X11/extras/Mesa/src/mesa/main/api_noop.c \ - nx-X11/extras/Mesa/src/mesa/main/api_noop.h \ - nx-X11/extras/Mesa/src/mesa/main/api_validate.c \ - nx-X11/extras/Mesa/src/mesa/main/api_validate.h \ - nx-X11/extras/Mesa/src/mesa/main/attrib.c \ - nx-X11/extras/Mesa/src/mesa/main/attrib.h \ - nx-X11/extras/Mesa/src/mesa/main/blend.c \ - nx-X11/extras/Mesa/src/mesa/main/blend.h \ - nx-X11/extras/Mesa/src/mesa/main/bufferobj.c \ - nx-X11/extras/Mesa/src/mesa/main/bufferobj.h \ - nx-X11/extras/Mesa/src/mesa/main/buffers.c \ - nx-X11/extras/Mesa/src/mesa/main/buffers.h \ - nx-X11/extras/Mesa/src/mesa/main/clip.c \ - nx-X11/extras/Mesa/src/mesa/main/clip.h \ - nx-X11/extras/Mesa/src/mesa/main/colormac.h \ - nx-X11/extras/Mesa/src/mesa/main/colortab.c \ - nx-X11/extras/Mesa/src/mesa/main/colortab.h \ - nx-X11/extras/Mesa/src/mesa/main/config.h \ - nx-X11/extras/Mesa/src/mesa/main/context.c \ - nx-X11/extras/Mesa/src/mesa/main/context.h \ - nx-X11/extras/Mesa/src/mesa/main/convolve.c \ - nx-X11/extras/Mesa/src/mesa/main/convolve.h \ - nx-X11/extras/Mesa/src/mesa/main/dd.h \ - nx-X11/extras/Mesa/src/mesa/main/debug.c \ - nx-X11/extras/Mesa/src/mesa/main/debug.h \ - nx-X11/extras/Mesa/src/mesa/main/depth.c \ - nx-X11/extras/Mesa/src/mesa/main/depth.h \ - nx-X11/extras/Mesa/src/mesa/main/dispatch.c \ - nx-X11/extras/Mesa/src/mesa/main/dlist.c \ - nx-X11/extras/Mesa/src/mesa/main/dlist.h \ - nx-X11/extras/Mesa/src/mesa/main/drawpix.c \ - nx-X11/extras/Mesa/src/mesa/main/drawpix.h \ - nx-X11/extras/Mesa/src/mesa/main/enable.c \ - nx-X11/extras/Mesa/src/mesa/main/enable.h \ - nx-X11/extras/Mesa/src/mesa/main/enums.c \ - nx-X11/extras/Mesa/src/mesa/main/enums.h \ - nx-X11/extras/Mesa/src/mesa/main/eval.c \ - nx-X11/extras/Mesa/src/mesa/main/eval.h \ - nx-X11/extras/Mesa/src/mesa/main/execmem.c \ - nx-X11/extras/Mesa/src/mesa/main/extensions.c \ - nx-X11/extras/Mesa/src/mesa/main/extensions.h \ - nx-X11/extras/Mesa/src/mesa/main/fbobject.c \ - nx-X11/extras/Mesa/src/mesa/main/fbobject.h \ - nx-X11/extras/Mesa/src/mesa/main/feedback.c \ - nx-X11/extras/Mesa/src/mesa/main/feedback.h \ - nx-X11/extras/Mesa/src/mesa/main/fog.c \ - nx-X11/extras/Mesa/src/mesa/main/fog.h \ - nx-X11/extras/Mesa/src/mesa/main/framebuffer.c \ - nx-X11/extras/Mesa/src/mesa/main/framebuffer.h \ - nx-X11/extras/Mesa/src/mesa/main/get.c \ - nx-X11/extras/Mesa/src/mesa/main/get.h \ - nx-X11/extras/Mesa/src/mesa/main/getstring.c \ - nx-X11/extras/Mesa/src/mesa/main/glheader.h \ - nx-X11/extras/Mesa/src/mesa/main/hash.c \ - nx-X11/extras/Mesa/src/mesa/main/hash.h \ - nx-X11/extras/Mesa/src/mesa/main/hint.c \ - nx-X11/extras/Mesa/src/mesa/main/hint.h \ - nx-X11/extras/Mesa/src/mesa/main/histogram.c \ - nx-X11/extras/Mesa/src/mesa/main/histogram.h \ - nx-X11/extras/Mesa/src/mesa/main/image.c \ - nx-X11/extras/Mesa/src/mesa/main/image.h \ - nx-X11/extras/Mesa/src/mesa/main/imports.c \ - nx-X11/extras/Mesa/src/mesa/main/imports.h \ - nx-X11/extras/Mesa/src/mesa/main/light.c \ - nx-X11/extras/Mesa/src/mesa/main/light.h \ - nx-X11/extras/Mesa/src/mesa/main/lines.c \ - nx-X11/extras/Mesa/src/mesa/main/lines.h \ - nx-X11/extras/Mesa/src/mesa/main/macros.h \ - nx-X11/extras/Mesa/src/mesa/main/matrix.c \ - nx-X11/extras/Mesa/src/mesa/main/matrix.h \ - nx-X11/extras/Mesa/src/mesa/main/mm.c \ - nx-X11/extras/Mesa/src/mesa/main/mm.h \ - nx-X11/extras/Mesa/src/mesa/main/mtypes.h \ - nx-X11/extras/Mesa/src/mesa/main/occlude.c \ - nx-X11/extras/Mesa/src/mesa/main/occlude.h \ - nx-X11/extras/Mesa/src/mesa/main/pixel.c \ - nx-X11/extras/Mesa/src/mesa/main/pixel.h \ - nx-X11/extras/Mesa/src/mesa/main/points.c \ - nx-X11/extras/Mesa/src/mesa/main/points.h \ - nx-X11/extras/Mesa/src/mesa/main/polygon.c \ - nx-X11/extras/Mesa/src/mesa/main/polygon.h \ - nx-X11/extras/Mesa/src/mesa/main/rastpos.c \ - nx-X11/extras/Mesa/src/mesa/main/rastpos.h \ - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c \ - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h \ - nx-X11/extras/Mesa/src/mesa/main/simple_list.h \ - nx-X11/extras/Mesa/src/mesa/main/state.c \ - nx-X11/extras/Mesa/src/mesa/main/state.h \ - nx-X11/extras/Mesa/src/mesa/main/stencil.c \ - nx-X11/extras/Mesa/src/mesa/main/stencil.h \ - nx-X11/extras/Mesa/src/mesa/main/texcompress.c \ - nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c \ - nx-X11/extras/Mesa/src/mesa/main/texcompress.h \ - nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c \ - nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c \ - nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h \ - nx-X11/extras/Mesa/src/mesa/main/texformat.c \ - nx-X11/extras/Mesa/src/mesa/main/texformat.h \ - nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h \ - nx-X11/extras/Mesa/src/mesa/main/teximage.c \ - nx-X11/extras/Mesa/src/mesa/main/teximage.h \ - nx-X11/extras/Mesa/src/mesa/main/texobj.c \ - nx-X11/extras/Mesa/src/mesa/main/texobj.h \ - nx-X11/extras/Mesa/src/mesa/main/texrender.c \ - nx-X11/extras/Mesa/src/mesa/main/texrender.h \ - nx-X11/extras/Mesa/src/mesa/main/texstate.c \ - nx-X11/extras/Mesa/src/mesa/main/texstate.h \ - nx-X11/extras/Mesa/src/mesa/main/texstore.c \ - nx-X11/extras/Mesa/src/mesa/main/texstore.h \ - nx-X11/extras/Mesa/src/mesa/main/varray.c \ - nx-X11/extras/Mesa/src/mesa/main/varray.h \ - nx-X11/extras/Mesa/src/mesa/main/version.h \ - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c \ - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h \ - nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h \ - nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h \ - nx-X11/extras/Mesa/src/mesa/math/mathmod.h \ - nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c \ - nx-X11/extras/Mesa/src/mesa/math/m_debug.h \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h \ - nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c \ - nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_eval.c \ - nx-X11/extras/Mesa/src/mesa/math/m_eval.h \ - nx-X11/extras/Mesa/src/mesa/math/m_matrix.c \ - nx-X11/extras/Mesa/src/mesa/math/m_matrix.h \ - nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_translate.c \ - nx-X11/extras/Mesa/src/mesa/math/m_translate.h \ - nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h \ - nx-X11/extras/Mesa/src/mesa/math/m_vector.c \ - nx-X11/extras/Mesa/src/mesa/math/m_vector.h \ - nx-X11/extras/Mesa/src/mesa/math/m_xform.c \ - nx-X11/extras/Mesa/src/mesa/math/m_xform.h \ - nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c \ - nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h \ - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h \ - nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h \ - nx-X11/extras/Mesa/src/mesa/shader/program.c \ - nx-X11/extras/Mesa/src/mesa/shader/program.h \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c \ - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c \ - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h \ - nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_context.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_context.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h \ - nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_points.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_points.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_span.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_span.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h \ - nx-X11/extras/Mesa/src/mesa/swrast/swrast.h \ - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c \ - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_context.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_context.h \ - nx-X11/extras/Mesa/src/mesa/tnl/tnl.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c \ - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c \ - nx-X11/extras/Xpm/lib/Attrib.c \ - nx-X11/extras/Xpm/lib/CrBufFrI.c \ - nx-X11/extras/Xpm/lib/CrBufFrP.c \ - nx-X11/extras/Xpm/lib/CrDatFrI.c \ - nx-X11/extras/Xpm/lib/CrDatFrP.c \ - nx-X11/extras/Xpm/lib/create.c \ - nx-X11/extras/Xpm/lib/CrIFrBuf.c \ - nx-X11/extras/Xpm/lib/CrIFrDat.c \ - nx-X11/extras/Xpm/lib/CrIFrP.c \ - nx-X11/extras/Xpm/lib/CrPFrBuf.c \ - nx-X11/extras/Xpm/lib/CrPFrDat.c \ - nx-X11/extras/Xpm/lib/CrPFrI.c \ - nx-X11/extras/Xpm/lib/data.c \ - nx-X11/extras/Xpm/lib/hashtab.c \ - nx-X11/extras/Xpm/lib/Image.c \ - nx-X11/extras/Xpm/lib/Info.c \ - nx-X11/extras/Xpm/lib/misc.c \ - nx-X11/extras/Xpm/lib/parse.c \ - nx-X11/extras/Xpm/lib/RdFToBuf.c \ - nx-X11/extras/Xpm/lib/RdFToDat.c \ - nx-X11/extras/Xpm/lib/RdFToI.c \ - nx-X11/extras/Xpm/lib/RdFToP.c \ - nx-X11/extras/Xpm/lib/rgb.c \ - nx-X11/extras/Xpm/lib/scan.c \ - nx-X11/extras/Xpm/lib/WrFFrBuf.c \ - nx-X11/extras/Xpm/lib/WrFFrDat.c \ - nx-X11/extras/Xpm/lib/WrFFrI.c \ - nx-X11/extras/Xpm/lib/WrFFrP.c \ - nx-X11/extras/Xpm/lib/xpm.h \ - nx-X11/extras/Xpm/lib/XpmI.h \ - nx-X11/include/ap_keysym.h \ - nx-X11/include/bitmaps/1x1 \ - nx-X11/include/bitmaps/2x2 \ - nx-X11/include/bitmaps/black \ - nx-X11/include/bitmaps/boxes \ - nx-X11/include/bitmaps/calculator \ - nx-X11/include/bitmaps/cntr_ptr \ - nx-X11/include/bitmaps/cntr_ptrmsk \ - nx-X11/include/bitmaps/cross_weave \ - nx-X11/include/bitmaps/dimple1 \ - nx-X11/include/bitmaps/dimple3 \ - nx-X11/include/bitmaps/dot \ - nx-X11/include/bitmaps/dropbar7 \ - nx-X11/include/bitmaps/dropbar8 \ - nx-X11/include/bitmaps/escherknot \ - nx-X11/include/bitmaps/flagdown \ - nx-X11/include/bitmaps/flagup \ - nx-X11/include/bitmaps/flipped_gray \ - nx-X11/include/bitmaps/gray \ - nx-X11/include/bitmaps/gray1 \ - nx-X11/include/bitmaps/gray3 \ - nx-X11/include/bitmaps/grid16 \ - nx-X11/include/bitmaps/grid2 \ - nx-X11/include/bitmaps/grid4 \ - nx-X11/include/bitmaps/grid8 \ - nx-X11/include/bitmaps/hlines2 \ - nx-X11/include/bitmaps/hlines3 \ - nx-X11/include/bitmaps/icon \ - nx-X11/include/bitmaps/keyboard16 \ - nx-X11/include/bitmaps/left_ptr \ - nx-X11/include/bitmaps/left_ptrmsk \ - nx-X11/include/bitmaps/letters \ - nx-X11/include/bitmaps/light_gray \ - nx-X11/include/bitmaps/mailempty \ - nx-X11/include/bitmaps/mailemptymsk \ - nx-X11/include/bitmaps/mailfull \ - nx-X11/include/bitmaps/mailfullmsk \ - nx-X11/include/bitmaps/mensetmanus \ - nx-X11/include/bitmaps/menu10 \ - nx-X11/include/bitmaps/menu12 \ - nx-X11/include/bitmaps/menu16 \ - nx-X11/include/bitmaps/menu6 \ - nx-X11/include/bitmaps/menu8 \ - nx-X11/include/bitmaps/noletters \ - nx-X11/include/bitmaps/opendot \ - nx-X11/include/bitmaps/opendotMask \ - nx-X11/include/bitmaps/plaid \ - nx-X11/include/bitmaps/right_ptr \ - nx-X11/include/bitmaps/right_ptrmsk \ - nx-X11/include/bitmaps/root_weave \ - nx-X11/include/bitmaps/scales \ - nx-X11/include/bitmaps/sipb \ - nx-X11/include/bitmaps/star \ - nx-X11/include/bitmaps/starMask \ - nx-X11/include/bitmaps/stipple \ - nx-X11/include/bitmaps/target \ - nx-X11/include/bitmaps/terminal \ - nx-X11/include/bitmaps/tie_fighter \ - nx-X11/include/bitmaps/vlines2 \ - nx-X11/include/bitmaps/vlines3 \ - nx-X11/include/bitmaps/weird_size \ - nx-X11/include/bitmaps/wide_weave \ - nx-X11/include/bitmaps/wingdogs \ - nx-X11/include/bitmaps/woman \ - nx-X11/include/bitmaps/xfd_icon \ - nx-X11/include/bitmaps/xlogo11 \ - nx-X11/include/bitmaps/xlogo16 \ - nx-X11/include/bitmaps/xlogo32 \ - nx-X11/include/bitmaps/xlogo64 \ - nx-X11/include/bitmaps/xsnow \ - nx-X11/include/DECkeysym.h \ - nx-X11/include/extensions/bigreqstr.h \ - nx-X11/include/extensions/composite.h \ - nx-X11/include/extensions/compositeproto.h \ - nx-X11/include/extensions/damageproto.h \ - nx-X11/include/extensions/damagewire.h \ - nx-X11/include/extensions/dmxext.h \ - nx-X11/include/extensions/dmxproto.h \ - nx-X11/include/extensions/dpms.h \ - nx-X11/include/extensions/dpmsstr.h \ - nx-X11/include/extensions/extutil.h \ - nx-X11/include/extensions/lbxbuf.h \ - nx-X11/include/extensions/lbxbufstr.h \ - nx-X11/include/extensions/lbxdeltastr.h \ - nx-X11/include/extensions/lbximage.h \ - nx-X11/include/extensions/lbxopts.h \ - nx-X11/include/extensions/lbxstr.h \ - nx-X11/include/extensions/lbxzlib.h \ - nx-X11/include/extensions/MITMisc.h \ - nx-X11/include/extensions/mitmiscstr.h \ - nx-X11/include/extensions/multibuf.h \ - nx-X11/include/extensions/multibufst.h \ - nx-X11/include/extensions/panoramiXext.h \ - nx-X11/include/extensions/panoramiXproto.h \ - nx-X11/include/extensions/Print.h \ - nx-X11/include/extensions/Printstr.h \ - nx-X11/include/extensions/randr.h \ - nx-X11/include/extensions/randrproto.h \ - nx-X11/include/extensions/record.h \ - nx-X11/include/extensions/recordstr.h \ - nx-X11/include/extensions/render.h \ - nx-X11/include/extensions/renderproto.h \ - nx-X11/include/extensions/security.h \ - nx-X11/include/extensions/securstr.h \ - nx-X11/include/extensions/shape.h \ - nx-X11/include/extensions/shapestr.h \ - nx-X11/include/extensions/shmstr.h \ - nx-X11/include/extensions/sync.h \ - nx-X11/include/extensions/syncstr.h \ - nx-X11/include/extensions/vldXvMC.h \ - nx-X11/include/extensions/Xag.h \ - nx-X11/include/extensions/Xagsrv.h \ - nx-X11/include/extensions/Xagstr.h \ - nx-X11/include/extensions/xcmiscstr.h \ - nx-X11/include/extensions/Xcup.h \ - nx-X11/include/extensions/Xcupstr.h \ - nx-X11/include/extensions/Xdbe.h \ - nx-X11/include/extensions/Xdbeproto.h \ - nx-X11/include/extensions/Xevie.h \ - nx-X11/include/extensions/Xeviestr.h \ - nx-X11/include/extensions/XEVI.h \ - nx-X11/include/extensions/XEVIstr.h \ - nx-X11/include/extensions/Xext.h \ - nx-X11/include/extensions/xf86bigfont.h \ - nx-X11/include/extensions/xf86bigfstr.h \ - nx-X11/include/extensions/xf86dga1.h \ - nx-X11/include/extensions/xf86dga1str.h \ - nx-X11/include/extensions/xf86dga.h \ - nx-X11/include/extensions/xf86dgastr.h \ - nx-X11/include/extensions/xf86misc.h \ - nx-X11/include/extensions/xf86mscstr.h \ - nx-X11/include/extensions/xf86vmode.h \ - nx-X11/include/extensions/xf86vmstr.h \ - nx-X11/include/extensions/xfixesproto.h \ - nx-X11/include/extensions/xfixeswire.h \ - nx-X11/include/extensions/XI.h \ - nx-X11/include/extensions/Xinerama.h \ - nx-X11/include/extensions/XInput.h \ - nx-X11/include/extensions/XIproto.h \ - nx-X11/include/extensions/XKBgeom.h \ - nx-X11/include/extensions/XKB.h \ - nx-X11/include/extensions/XKBproto.h \ - nx-X11/include/extensions/XKBsrv.h \ - nx-X11/include/extensions/XKBstr.h \ - nx-X11/include/extensions/XLbx.h \ - nx-X11/include/extensions/XRes.h \ - nx-X11/include/extensions/XResproto.h \ - nx-X11/include/extensions/XShm.h \ - nx-X11/include/extensions/xtestext1.h \ - nx-X11/include/extensions/XTest.h \ - nx-X11/include/extensions/xteststr.h \ - nx-X11/include/extensions/xtrapbits.h \ - nx-X11/include/extensions/xtrapddmi.h \ - nx-X11/include/extensions/xtrapdi.h \ - nx-X11/include/extensions/xtrapemacros.h \ - nx-X11/include/extensions/xtraplib.h \ - nx-X11/include/extensions/xtraplibp.h \ - nx-X11/include/extensions/xtrapproto.h \ - nx-X11/include/extensions/Xv.h \ - nx-X11/include/extensions/Xvlib.h \ - nx-X11/include/extensions/XvMC.h \ - nx-X11/include/extensions/XvMClib.h \ - nx-X11/include/extensions/XvMCproto.h \ - nx-X11/include/extensions/Xvproto.h \ - nx-X11/include/fonts/font.h \ - nx-X11/include/fonts/fontstruct.h \ - nx-X11/include/fonts/FS.h \ - nx-X11/include/fonts/fsmasks.h \ - nx-X11/include/fonts/FSproto.h \ - nx-X11/include/GL/glu.h \ - nx-X11/include/GL/glx.h \ - nx-X11/include/GL/glxint.h \ - nx-X11/include/GL/glxmd.h \ - nx-X11/include/GL/glxproto.h \ - nx-X11/include/GL/glxtokens.h \ - nx-X11/include/HPkeysym.h \ - nx-X11/include/keysymdef.h \ - nx-X11/include/keysym.h \ - nx-X11/include/Sunkeysym.h \ - nx-X11/include/Xalloca.h \ - nx-X11/include/Xarch.h \ - nx-X11/include/Xatom.h \ - nx-X11/include/Xdefs.h \ - nx-X11/include/XF86keysym.h \ - nx-X11/include/Xfuncproto.h \ - nx-X11/include/Xfuncs.h \ - nx-X11/include/X.h \ - nx-X11/include/Xmd.h \ - nx-X11/include/Xosdefs.h \ - nx-X11/include/Xos.h \ - nx-X11/include/Xos_r.h \ - nx-X11/include/Xproto.h \ - nx-X11/include/Xprotostr.h \ - nx-X11/include/Xthreads.h \ - nx-X11/include/XWDFile.h \ - nx-X11/lib/font/bitmap/bdfint.h \ - nx-X11/lib/font/bitmap/pcf.h \ - nx-X11/lib/font/include/bitmap.h \ - nx-X11/lib/font/include/bufio.h \ - nx-X11/lib/font/include/fntfil.h \ - nx-X11/lib/font/include/fntfilio.h \ - nx-X11/lib/font/include/fntfilst.h \ - nx-X11/lib/font/include/fontencc.h \ - nx-X11/lib/font/include/fontmisc.h \ - nx-X11/lib/font/include/fontmod.h \ - nx-X11/lib/font/include/fontshow.h \ - nx-X11/lib/font/include/fontutil.h \ - nx-X11/lib/font/include/fontxlfd.h \ - nx-X11/lib/misc/strlcat.c \ - nx-X11/lib/misc/strlcpy.c \ - nx-X11/lib/oldX/X10.h \ - nx-X11/lib/X11/cursorfont.h \ - nx-X11/lib/X11/ImUtil.h \ - nx-X11/lib/X11/Xcms.h \ - nx-X11/lib/X11/XKBAlloc.c \ - nx-X11/lib/X11/XKBGAlloc.c \ - nx-X11/lib/X11/XKBlib.h \ - nx-X11/lib/X11/XKBMAlloc.c \ - nx-X11/lib/X11/XKBMisc.c \ - nx-X11/lib/X11/XlibConf.h \ - nx-X11/lib/X11/Xlib.h \ - nx-X11/lib/X11/Xlibint.h \ - nx-X11/lib/X11/Xlocale.h \ - nx-X11/lib/X11/Xregion.h \ - nx-X11/lib/X11/Xresource.h \ - nx-X11/lib/X11/Xutil.h \ - nx-X11/lib/Xau/AuDispose.c \ - nx-X11/lib/Xau/AuFileName.c \ - nx-X11/lib/Xau/AuGetBest.c \ - nx-X11/lib/Xau/AuRead.c \ - nx-X11/lib/Xau/Xauth.h \ - nx-X11/lib/Xcomposite/Xcomposite.h \ - nx-X11/lib/Xdamage/Xdamage.h \ - nx-X11/lib/Xdmcp/Wrap.c \ - nx-X11/lib/Xdmcp/Wrap.h \ - nx-X11/lib/Xdmcp/Wraphelp.c \ - nx-X11/lib/Xdmcp/Xdmcp.h \ - nx-X11/lib/Xfixes/Xfixes.h \ - nx-X11/lib/xkbfile/maprules.c \ - nx-X11/lib/xkbfile/XKBbells.h \ - nx-X11/lib/xkbfile/xkbconfig.c \ - nx-X11/lib/xkbfile/XKBconfig.h \ - nx-X11/lib/xkbfile/xkberrs.c \ - nx-X11/lib/xkbfile/XKBfile.h \ - nx-X11/lib/xkbfile/xkbmisc.c \ - nx-X11/lib/xkbfile/xkbout.c \ - nx-X11/lib/xkbfile/XKBrules.h \ - nx-X11/lib/xkbfile/xkbtext.c \ - nx-X11/lib/xkbfile/XKMformat.h \ - nx-X11/lib/xkbfile/XKM.h \ - nx-X11/lib/xkbfile/xkmread.c \ - nx-X11/lib/Xrandr/Xrandr.h \ - nx-X11/lib/Xrender/Xrender.h \ - nx-X11/lib/xtrans/transport.c \ - nx-X11/lib/xtrans/Xtrans.c \ - nx-X11/lib/xtrans/Xtransdnet.c \ - nx-X11/lib/xtrans/Xtrans.h \ - nx-X11/lib/xtrans/Xtransint.h \ - nx-X11/lib/xtrans/Xtranslcl.c \ - nx-X11/lib/xtrans/Xtransos2.c \ - nx-X11/lib/xtrans/Xtranssock.c \ - nx-X11/lib/xtrans/Xtranstli.c \ - nx-X11/lib/xtrans/Xtransutil.c \ - nx-X11/programs/Xserver/hw/xfree86/common/compiler.h \ - nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h \ - nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h \ - nx-X11/programs/Xserver/hw/xfree86/xf86Version.h \ - nx-X11/programs/Xserver/include/misc.h \ - nx-X11/programs/Xserver/include/os.h \ - nx-X11/programs/Xserver/mi/miinitext.c \ - nx-X11/programs/Xserver/os/osdep.h \ - nx-X11/programs/Xserver/Xext/extmod/modinit.h \ - nx-X11/programs/Xserver/Xi/stubs.c \ - $(NULL) +UNUSED_FOLDERS = "debian/CODE-REDUCTION_CLEANUP-UNUSED" +CLEANUP_FOLDERS = "debian/CODE-REDUCTION_CLEANUP-BRUTAL" +UNNEEDED_BACKUPS = "debian/CODE-REDUCTION_CLEANUP-BACKUPFILES" +PRESERVE_SYMLINKED_FILES = "debian/CODE-REDUCTION_PRESERVE-SYMLINKED" +PRESERVE_NEEDED_FILES = "debian/CODE-REDUCTION_PRESERVE-NEEDED" +PRESERVE_INCLUDED_FILES = "debian/CODE-REDUCTION_PRESERVE-INCLUDED" override_dh_auto_clean: rm -Rf nx-X11/.build-exports @@ -766,6 +47,10 @@ override_dh_install: find debian/*.install.in | while read file; do \ cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \ done; \ + else \ + find debian/*.install.in | while read file; do \ + cat $$file > $$(string_rep $$file .install.in .install); \ + done; \ fi # remove static libs @@ -833,12 +118,17 @@ override_dh_auto_build: # make a copy of code to be preserved for build mkdir -p .preserve - for path in $(PRESERVE_SYMLINKED_FILES); do test -d $$path && mkdir -p .preserve/$$path || mkdir -p .preserve/$$(dirname $$path); cp -av $$path .preserve/$$path; done + for path in `cat $(PRESERVE_SYMLINKED_FILES)` `cat $(PRESERVE_NEEDED_FILES)` `cat $(PRESERVE_INCLUDED_FILES)`; do \ + if echo $$path | grep -E "^#.*"; then continue; fi; \ + test -d $$path && mkdir -p .preserve/$$path || mkdir -p .preserve/$$(dirname $$path); \ + cp -av $$path .preserve/$$path; \ + done # remove unused code / bundled libraries (see at the top of the debian/rules file) # for the exact list of files and folders - rm -Rf $(UNUSED_FOLDERS) - rm -Rf $(CLEANUP_FOLDERS) + rm -Rf `cat $(UNUSED_FOLDERS)` + rm -Rf `cat $(CLEANUP_FOLDERS)` + rm -Rf `cat $(UNNEEDED_BACKUPS)` # copy to-be-preserved files back into code tree cp -av .preserve/* . -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 8b432c7a5bbf99cc426f492d25fda988d162280c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 14:57:42 2015 +0100 debian/changelog: whitespace fix --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a5cc573..8d95b5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium . nx-X11/programs/Xserver/miext/shadow/ . nx-X11/programs/Xserver/XpConfig/ . nx-X11/programs/Xserver/Xprint/ - - Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore. + - Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore. - Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/ folder lists in text files named debian/CODE-REDUCTION_*. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 151bca3a1118b43adfe5b4b16fcb909db7684645 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 15:04:50 2015 +0100 Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files that get removed during code reduction. --- debian/changelog | 2 + ...nxcompext+nxcompshad_unique-libnames.full.patch | 335 -------------------- 2 files changed, 2 insertions(+), 335 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d1078a..60d1a90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium /etc/x2go/rgb or /etc/nxagent/rgb. * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. + * Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't + patch files that get removed during code reduction. * NX code reduction efforts (from 93Mb to 60Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in 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 ebc77ec..55aa0df 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 @@ -21,26 +21,9 @@ Author: Jan Engelhardt <jengelh@medozas.de> Last-Update: 2012-02-15 --- nx-X11/config/cf/Imake.rules | 12 - - nx-X11/config/cf/Motif.tmpl | 4 nx-X11/config/cf/X11.tmpl | 240 ++++++++++---------- - nx-X11/config/cf/bsdLib.rules | 6 - nx-X11/config/cf/bsdLib.tmpl | 2 - nx-X11/config/cf/bsdiLib.tmpl | 2 - nx-X11/config/cf/convex.cf | 6 - nx-X11/config/cf/cygwin.tmpl | 2 - nx-X11/config/cf/darwinLib.tmpl | 2 - nx-X11/config/cf/gnuLib.tmpl | 2 - nx-X11/config/cf/ibmLib.rules | 12 - - nx-X11/config/cf/ibmLib.tmpl | 2 nx-X11/config/cf/lnxLib.rules | 16 - nx-X11/config/cf/lnxLib.tmpl | 4 - nx-X11/config/cf/mingw.tmpl | 2 - nx-X11/config/cf/nto.rules | 2 - nx-X11/config/cf/os2Lib.tmpl | 58 ++-- - nx-X11/config/cf/sco5.cf | 2 - nx-X11/config/cf/sv3Lib.tmpl | 24 +- - nx-X11/config/cf/sv4Lib.tmpl | 2 - nx-X11/config/cf/usl.cf | 2 nx-X11/lib/GLw/Imakefile | 2 nx-X11/lib/X11/Imakefile | 2 nx-X11/lib/X11/Imakefile.NX.original | 2 @@ -130,20 +113,6 @@ Last-Update: 2012-02-15 #endif /* ---- a/nx-X11/config/cf/Motif.tmpl -+++ b/nx-X11/config/cf/Motif.tmpl -@@ -465,9 +465,9 @@ - #endif - - #if SharedLibXm --SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) -+SharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) - #else --ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir) -+ProjectUnsharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),MBuildLibDir) - #endif - - #if SharedLibMrm --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1835,9 +1835,9 @@ @@ -849,134 +818,6 @@ Last-Update: 2012-02-15 #endif #ifndef NeedDefaultDepLibs ---- a/nx-X11/config/cf/bsdLib.rules -+++ b/nx-X11/config/cf/bsdLib.rules -@@ -134,9 +134,9 @@ - #ifndef SharedFontLibReferences - #define SharedFontLibReferences() @@\ - SOFONTREV = SharedFontRev @@\ --DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ --FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - #endif - - /* ---- a/nx-X11/config/cf/bsdLib.tmpl -+++ b/nx-X11/config/cf/bsdLib.tmpl -@@ -38,7 +38,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/bsdiLib.tmpl -+++ b/nx-X11/config/cf/bsdiLib.tmpl -@@ -11,7 +11,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/convex.cf -+++ b/nx-X11/config/cf/convex.cf -@@ -90,9 +90,9 @@ - LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln) - - XMLIBSRC = $(LIBSRC)/Xm -- DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a) -- XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB)) -- LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln) -+ DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libNX_Xm.a) -+ XMLIB = LoaderLibPrefix _Use(-lNX_Xm,$(DEPXMLIB)) -+ LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lNX_Xm.ln) - - UILLIBSRC = $(LIBSRC)/uil - DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a) ---- a/nx-X11/config/cf/cygwin.tmpl -+++ b/nx-X11/config/cf/cygwin.tmpl -@@ -50,7 +50,7 @@ - - #ifndef FixupLibReferences - # define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/darwinLib.tmpl -+++ b/nx-X11/config/cf/darwinLib.tmpl -@@ -5,7 +5,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/gnuLib.tmpl -+++ b/nx-X11/config/cf/gnuLib.tmpl -@@ -6,7 +6,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/ibmLib.rules -+++ b/nx-X11/config/cf/ibmLib.rules -@@ -127,23 +127,23 @@ - # ifndef SharedFontLibReferences - # define SharedFontLibReferences() @@\ - DEPFONTLIB = /**/ @@\ --FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(FONTLIBSRC)/libNX_Xfont.a) @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - # endif - # else - # ifndef SharedFontLibReferences - # define SharedFontLibReferences() @@\ - DEPFONTLIB = /**/ @@\ --FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libNX_Xfont.a)) @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - # endif - # endif - # else /* OSMajorVersion < 5 */ - # ifndef SharedFontLibReferences - # define SharedFontLibReferences() @@\ - DEPFONTLIB = /**/ @@\ --FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDI)/libNX_Xfont.so)) @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - # endif - - # endif ---- a/nx-X11/config/cf/ibmLib.tmpl -+++ b/nx-X11/config/cf/ibmLib.tmpl -@@ -81,7 +81,7 @@ - /* we want this to be defined only when building X */ - # ifndef FixupLibReferences - # define FixupLibReferences() @@\ --DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a) -+DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt.a) - # endif - #endif - --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -389,7 +389,7 @@ @@ -1044,182 +885,6 @@ Last-Update: 2012-02-15 #endif #endif /* UseElfFormat */ ---- a/nx-X11/config/cf/mingw.tmpl -+++ b/nx-X11/config/cf/mingw.tmpl -@@ -50,7 +50,7 @@ - - #ifndef FixupLibReferences - # define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/nto.rules -+++ b/nx-X11/config/cf/nto.rules -@@ -104,7 +104,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/os2Lib.tmpl -+++ b/nx-X11/config/cf/os2Lib.tmpl -@@ -107,35 +107,35 @@ - #endif - - #if LinkStatically --#define SDlibX11 -lX11_s --#define SDlibXExt -lXExt_s --#define SDlibXmu -lXmu_s --#define SDlibXt -lXt_s --#define SDlibXaw -lXaw_s --#define SDlibXaw7 -lXaw_s --#define SDlibXaw6 -lXaw_s --#define SDlibXi -lXi_s --#define SDlibXtst -lXtst_s --#define SDlibXp -lXp_s --#define SDlibXv -lXv_s --#define SDlibGL -lGL_s --#define SDlibDPS -lDPS_s --#define SDlibDPSTK -lDPSTK_s -+#define SDlibX11 -lNX_X11_s -+#define SDlibXExt -lNX_XExt_s -+#define SDlibXmu -lNX_Xmu_s -+#define SDlibXt -lNX_Xt_s -+#define SDlibXaw -lNX_Xaw_s -+#define SDlibXaw7 -lNX_Xaw_s -+#define SDlibXaw6 -lNX_Xaw_s -+#define SDlibXi -lNX_Xi_s -+#define SDlibXtst -lNX_Xtst_s -+#define SDlibXp -lNX_Xp_s -+#define SDlibXv -lNX_Xv_s -+#define SDlibGL -lNX_GL_s -+#define SDlibDPS -lNX_DPS_s -+#define SDlibDPSTK -lNX_DPSTK_s - #else --#define SDlibX11 -lX11 --#define SDlibXExt -lXExt --#define SDlibXmu -lXmu --#define SDlibXt -lXt --#define SDlibXaw -lXaw --#define SDlibXaw7 -lXaw --#define SDlibXaw6 -lXaw --#define SDlibXi -lXi --#define SDlibXtst -lXtst --#define SDlibXp -lXp --#define SDlibXv -lXv --#define SDlibGL -lGL --#define SDlibDPS -lDPS --#define SDlibDPSTK -lDPSTK -+#define SDlibX11 -lNX_X11 -+#define SDlibXExt -lNX_XExt -+#define SDlibXmu -lNX_Xmu -+#define SDlibXt -lNX_Xt -+#define SDlibXaw -lNX_Xaw -+#define SDlibXaw7 -lNX_Xaw -+#define SDlibXaw6 -lNX_Xaw -+#define SDlibXi -lNX_Xi -+#define SDlibXtst -lNX_Xtst -+#define SDlibXp -lNX_Xp -+#define SDlibXv -lNX_Xv -+#define SDlibGL -lNX_GL -+#define SDlibDPS -lNX_DPS -+#define SDlibDPSTK -lNX_DPSTK - #endif - - /* -@@ -159,7 +159,7 @@ - #endif - #if SharedOldX - DEPOLDXLIB = -- OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX) -+ OLDXLIB = _Use(-lNX_oldX,-L$(OLDXLIBSRC) -lNX_oldX) - #endif - #if SharedLibXt - DEPXTOOLLIB = ---- a/nx-X11/config/cf/sco5.cf -+++ b/nx-X11/config/cf/sco5.cf -@@ -318,7 +318,7 @@ - */ - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/sv3Lib.tmpl -+++ b/nx-X11/config/cf/sv3Lib.tmpl -@@ -40,31 +40,31 @@ - * are using shared libraries, we really do not need to depend on anything - */ - #if SharedLibXext -- DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a) -- EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB)) -+ DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libNX_Xext_s.a) -+ EXTENSIONLIB = LoaderLibPrefix _Use(-lNX_Xext_s, $(DEPEXTENSIONLIB)) - #endif - #if SharedLibX -- DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a) -- XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a) -+ DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libNX_X11_s.a) -+ XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lNX_X11_s,$(XLIBSRC)/libNX_X11_s.a) - #endif - #if SharedLibXmu -- DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a) -- XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB)) -+ DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libNX_Xmu_s.a) -+ XMULIB = LoaderLibPrefix _Use(-lNX_Xmu_s,$(DEPXMULIB)) - #endif - #if SharedOldLibX - DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a) - OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB)) - #endif - #if SharedLibXt -- DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a) -- XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB)) -+ DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt_s.a) -+ XTOOLLIB = LoaderLibPrefix _Use(-lNX_Xt_s,$(DEPXTOOLLIB)) - #endif - #if SharedLibXaw -- DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a) -- XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB)) -+ DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libNX_Xaw_s.a) -+ XAWLIB = LoaderLibPrefix _Use(-lNX_Xaw_s,$(DEPXAWLIB)) - #endif - #if SharedLibXinput -- DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a) -- XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB)) -+ DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libNX_Xi_s.a) -+ XILIB = LoaderLibPrefix _Use(-lNX_Xi_s,$(DEPXILIB)) - #endif - ---- a/nx-X11/config/cf/sv4Lib.tmpl -+++ b/nx-X11/config/cf/sv4Lib.tmpl -@@ -7,7 +7,7 @@ - XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $ - - /* SVR4 shared libraries are deficient in link semantics */ --XMULIBONLY = -lXmu -+XMULIBONLY = -lNX_Xmu - #ifndef FixupLibReferences - # define FixupLibReferences() @@\ - XMULIB = $(XMULIBONLY) -z nodefs ---- a/nx-X11/config/cf/usl.cf -+++ b/nx-X11/config/cf/usl.cf -@@ -262,7 +262,7 @@ - */ - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - --- a/nx-X11/lib/GLw/Imakefile +++ b/nx-X11/lib/GLw/Imakefile @@ -46,7 +46,7 @@ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit f0f1df262b6e12f1f3393627dafa8fd1a372b814 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 18:21:17 2015 +0100 more code reduction and adaptation of patch 600_....patch --- debian/CODE-REDUCTION_CLEANUP-BRUTAL | 1 + debian/CODE-REDUCTION_CLEANUP-UNUSED | 26 ++ debian/CODE-REDUCTION_PRESERVE-INCLUDED | 1 + ...nxcompext+nxcompshad_unique-libnames.full.patch | 358 -------------------- 4 files changed, 28 insertions(+), 358 deletions(-) diff --git a/debian/CODE-REDUCTION_CLEANUP-BRUTAL b/debian/CODE-REDUCTION_CLEANUP-BRUTAL index a964b21..991469f 100644 --- a/debian/CODE-REDUCTION_CLEANUP-BRUTAL +++ b/debian/CODE-REDUCTION_CLEANUP-BRUTAL @@ -1,3 +1,4 @@ nx-X11/config/cf/ nx-X11/extras/Mesa/ nx-X11/extras/Xpm/ +nx-X11/lib/Xcursor/ \ No newline at end of file diff --git a/debian/CODE-REDUCTION_CLEANUP-UNUSED b/debian/CODE-REDUCTION_CLEANUP-UNUSED index 2780ec1..7f41984 100644 --- a/debian/CODE-REDUCTION_CLEANUP-UNUSED +++ b/debian/CODE-REDUCTION_CLEANUP-UNUSED @@ -18,6 +18,24 @@ nx-X11/lib/font/FreeType/ nx-X11/lib/font/include/fontenc.h nx-X11/lib/freetype2/ nx-X11/lib/FS/ +nx-X11/lib/GL/apple/ +nx-X11/lib/GL/dri/ +nx-X11/lib/GL/mesa/drivers/dri/ffb +nx-X11/lib/GL/mesa/drivers/dri/gamma +nx-X11/lib/GL/mesa/drivers/dri/i810 +nx-X11/lib/GL/mesa/drivers/dri/i915 +nx-X11/lib/GL/mesa/drivers/dri/Imakefile +nx-X11/lib/GL/mesa/drivers/dri/mach64 +nx-X11/lib/GL/mesa/drivers/dri/mga +nx-X11/lib/GL/mesa/drivers/dri/r128 +nx-X11/lib/GL/mesa/drivers/dri/r200 +nx-X11/lib/GL/mesa/drivers/dri/radeon +nx-X11/lib/GL/mesa/drivers/dri/savage +nx-X11/lib/GL/mesa/drivers/dri/sis +nx-X11/lib/GL/mesa/drivers/dri/tdfx +nx-X11/lib/GL/mesa/drivers/dri/unichrome +nx-X11/lib/GL/mesa/drivers/dri/via +nx-X11/lib/GL/windows/ nx-X11/lib/GLU/ nx-X11/lib/GLw/ nx-X11/lib/ICE/ @@ -74,7 +92,15 @@ 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/miext/rootless/ +nx-X11/programs/Xserver/GL/apple/ +nx-X11/programs/Xserver/GL/dri/ +nx-X11/programs/Xserver/GL/windows/ nx-X11/programs/Xserver/XpConfig/ nx-X11/programs/Xserver/Xprint/ +nx-X11/programs/Xserver/XFree86.def +nx-X11/programs/Xserver/Xnest.def +nx-X11/programs/Xserver/Xorg.def +nx-X11/programs/Xserver/Xvfb.def nx-X11/programs/xterm/ nx-X11/util/ diff --git a/debian/CODE-REDUCTION_PRESERVE-INCLUDED b/debian/CODE-REDUCTION_PRESERVE-INCLUDED index f45eaa7..7daf5a9 100644 --- a/debian/CODE-REDUCTION_PRESERVE-INCLUDED +++ b/debian/CODE-REDUCTION_PRESERVE-INCLUDED @@ -1 +1,2 @@ nx-X11/programs/Xserver/mfb/maskbits.h +nx-X11/lib/Xcursor/config-subst \ No newline at end of file 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 55aa0df..1f3fd11 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 @@ -24,15 +24,10 @@ Last-Update: 2012-02-15 nx-X11/config/cf/X11.tmpl | 240 ++++++++++---------- nx-X11/config/cf/lnxLib.rules | 16 - nx-X11/config/cf/lnxLib.tmpl | 4 - nx-X11/lib/GLw/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/Xaw6/Imakefile | 2 - nx-X11/lib/Xaw7/Imakefile | 2 nx-X11/lib/Xcomposite/Imakefile | 2 nx-X11/lib/Xcomposite/xcomposite.pc.in | 2 nx-X11/lib/Xcursor/Imakefile | 2 @@ -40,44 +35,18 @@ Last-Update: 2012-02-15 nx-X11/lib/Xdamage/Imakefile | 2 nx-X11/lib/Xdamage/xdamage.pc.in | 2 nx-X11/lib/Xdmcp/Imakefile | 2 - nx-X11/lib/Xevie/Imakefile | 2 - nx-X11/lib/Xevie/xevie.pc.in | 2 nx-X11/lib/Xext/Imakefile | 2 nx-X11/lib/Xfixes/Imakefile | 2 nx-X11/lib/Xfixes/xfixes.pc.in | 2 nx-X11/lib/Xfontcache/Imakefile | 2 - nx-X11/lib/Xft1/Imakefile | 2 - nx-X11/lib/Xi/Imakefile | 2 nx-X11/lib/Xinerama/Imakefile | 2 - nx-X11/lib/Xp/Imakefile | 2 nx-X11/lib/Xpm/Imakefile | 2 - nx-X11/lib/Xpm/Imakefile.NX.original | 2 - nx-X11/lib/Xpm/Imakefile.X.original | 2 - nx-X11/lib/XprintAppUtil/Imakefile | 2 - nx-X11/lib/XprintUtil/Imakefile | 2 nx-X11/lib/Xrandr/Imakefile | 2 nx-X11/lib/Xrender/Imakefile | 2 nx-X11/lib/Xrender/xrender.pc.in | 2 - nx-X11/lib/Xss/Imakefile | 2 nx-X11/lib/Xtst/Imakefile | 2 - nx-X11/lib/Xv/Imakefile | 2 - nx-X11/lib/XvMC/Imakefile | 2 - nx-X11/lib/XvMC/hw/i810/Imakefile | 2 - nx-X11/lib/XvMC/hw/via/unichrome/Imakefile | 2 - nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile | 2 - nx-X11/lib/XvMC/wrapper/Imakefile | 2 - nx-X11/lib/Xxf86dga/Imakefile | 2 - nx-X11/lib/Xxf86misc/Imakefile | 2 - nx-X11/lib/Xxf86rush/Imakefile | 2 - nx-X11/lib/Xxf86vm/Imakefile | 2 - nx-X11/lib/apple/Imakefile | 2 - nx-X11/lib/dmx/Imakefile | 2 - nx-X11/lib/dps/Imakefile | 2 - nx-X11/lib/dpstk/Imakefile | 2 nx-X11/lib/font/Imakefile | 2 nx-X11/lib/oldX/Imakefile | 2 - nx-X11/lib/psres/Imakefile | 2 - nx-X11/lib/windows/Imakefile | 2 nx-X11/lib/xkbfile/Imakefile | 2 nx-X11/lib/xkbui/Imakefile | 2 nx-X11/programs/Xserver/Imakefile | 18 - @@ -885,17 +854,6 @@ Last-Update: 2012-02-15 #endif #endif /* UseElfFormat */ ---- a/nx-X11/lib/GLw/Imakefile -+++ b/nx-X11/lib/GLw/Imakefile -@@ -46,7 +46,7 @@ - #define DoProfileLib ProfileLibGLw - - #define HasSharedData NO --#define LibName GLw -+#define LibName NX_GLw - #define SoRev SOGLWREV - #define IncSubdir GL - --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -82,7 +82,7 @@ @@ -907,28 +865,6 @@ Last-Update: 2012-02-15 #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 ---- a/nx-X11/lib/X11/Imakefile.NX.original -+++ b/nx-X11/lib/X11/Imakefile.NX.original -@@ -83,7 +83,7 @@ - #define DoExtraLib SharedLibX11 - #define DoDebugLib DebugLibX11 - #define DoProfileLib ProfileLibX11 --#define LibName X11 -+#define LibName NX_X11 - #define SoRev SOXLIBREV - #define HugeLibrary YES - #define IncSubdir X11 ---- a/nx-X11/lib/X11/Imakefile.X.original -+++ b/nx-X11/lib/X11/Imakefile.X.original -@@ -28,7 +28,7 @@ - #define DoExtraLib SharedLibX11 - #define DoDebugLib DebugLibX11 - #define DoProfileLib ProfileLibX11 --#define LibName X11 -+#define LibName NX_X11 - #define SoRev SOXLIBREV - #define HugeLibrary YES - #define IncSubdir X11 --- a/nx-X11/lib/XRes/Imakefile +++ b/nx-X11/lib/XRes/Imakefile @@ -4,7 +4,7 @@ @@ -962,28 +898,6 @@ Last-Update: 2012-02-15 #define SoRev SOXAUTHREV #define IncSubdir X11 ---- a/nx-X11/lib/Xaw6/Imakefile -+++ b/nx-X11/lib/Xaw6/Imakefile -@@ -5,7 +5,7 @@ - #define DoDebugLib DebugLibXaw6 - #define DoProfileLib ProfileLibXaw6 - #define HasSharedData YES --#define LibName Xaw -+#define LibName NX_Xaw - #define SoRev SOXAW6REV - #define LibHeaders NO - #define NoSoSymlink ---- a/nx-X11/lib/Xaw7/Imakefile -+++ b/nx-X11/lib/Xaw7/Imakefile -@@ -5,7 +5,7 @@ - #define DoDebugLib DebugLibXaw7 - #define DoProfileLib ProfileLibXaw7 - #define HasSharedData YES --#define LibName Xaw -+#define LibName NX_Xaw - #define SoRev SOXAW7REV - - #if BuildXaw --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -14,7 +14,7 @@ @@ -1052,25 +966,6 @@ Last-Update: 2012-02-15 #define SoRev SOXDMCPREV #define IncSubdir X11 ---- a/nx-X11/lib/Xevie/Imakefile -+++ b/nx-X11/lib/Xevie/Imakefile -@@ -14,7 +14,7 @@ - #define DoDebugLib DebugLibXevie - #define DoProfileLib ProfileLibXevie - --#define LibName Xevie -+#define LibName NX_Xevie - #define SoRev SOXEVIEREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xevie/xevie.pc.in -+++ b/nx-X11/lib/Xevie/xevie.pc.in -@@ -9,4 +9,4 @@ - Description: X Event Interceptor Library - Version: @VERSION@ - Cflags: -I${includedir} ${xcflags} --Libs: -L${libdir} -lXevie ${xlibs} -+Libs: -L${libdir} -lNX_Xevie ${xlibs} --- a/nx-X11/lib/Xext/Imakefile +++ b/nx-X11/lib/Xext/Imakefile @@ -10,7 +10,7 @@ @@ -1112,17 +1007,6 @@ Last-Update: 2012-02-15 #define SoRev SOXFONTCACHEREV #define LibHeaders NO ---- a/nx-X11/lib/Xi/Imakefile -+++ b/nx-X11/lib/Xi/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXi - #define DoDebugLib DebugLibXi - #define DoProfileLib ProfileLibXi --#define LibName Xi -+#define LibName NX_Xi - #define SoRev SOXINPUTREV - #define LibHeaders NO - --- a/nx-X11/lib/Xinerama/Imakefile +++ b/nx-X11/lib/Xinerama/Imakefile @@ -4,7 +4,7 @@ @@ -1134,17 +1018,6 @@ Last-Update: 2012-02-15 #define SoRev SOXINERAMAREV #define LibHeaders NO ---- a/nx-X11/lib/Xp/Imakefile -+++ b/nx-X11/lib/Xp/Imakefile -@@ -44,7 +44,7 @@ - #define DoExtraLib SharedLibXp - #define DoDebugLib DebugLibXp - #define DoProfileLib ProfileLibXp --#define LibName Xp -+#define LibName NX_Xp - #define SoRev SOXPREV - #define LibHeaders NO - --- a/nx-X11/lib/Xpm/Imakefile +++ b/nx-X11/lib/Xpm/Imakefile @@ -12,7 +12,7 @@ @@ -1156,50 +1029,6 @@ Last-Update: 2012-02-15 #define SoRev SOXPMREV #define IncSubdir X11 ---- a/nx-X11/lib/Xpm/Imakefile.NX.original -+++ b/nx-X11/lib/Xpm/Imakefile.NX.original -@@ -12,7 +12,7 @@ - #define DoDebugLib DebugLibXpm - #define DoProfileLib ProfileLibXpm - #define HasSharedData NO --#define LibName Xpm -+#define LibName NX_Xpm - #define SoRev SOXPMREV - #define IncSubdir X11 - ---- a/nx-X11/lib/Xpm/Imakefile.X.original -+++ b/nx-X11/lib/Xpm/Imakefile.X.original -@@ -8,7 +8,7 @@ - #define DoDebugLib DebugLibXpm - #define DoProfileLib ProfileLibXpm - #define HasSharedData NO --#define LibName Xpm -+#define LibName NX_Xpm - #define SoRev SOXPMREV - #define IncSubdir X11 - ---- a/nx-X11/lib/XprintAppUtil/Imakefile -+++ b/nx-X11/lib/XprintAppUtil/Imakefile -@@ -5,7 +5,7 @@ - #define DoDebugLib NO - #define DoProfileLib NO - #define HasSharedData NO --#define LibName XprintAppUtil -+#define LibName NX_XprintAppUtil - #define SoRev SOZLIBREV - #define IncSubdir X11 - #define IncSubSubdir XprintAppUtil ---- a/nx-X11/lib/XprintUtil/Imakefile -+++ b/nx-X11/lib/XprintUtil/Imakefile -@@ -5,7 +5,7 @@ - #define DoDebugLib NO - #define DoProfileLib NO - #define HasSharedData NO --#define LibName XprintUtil -+#define LibName NX_XprintUtil - #define SoRev SOZLIBREV - #define IncSubdir X11 - #define IncSubSubdir XprintUtil --- a/nx-X11/lib/Xrandr/Imakefile +++ b/nx-X11/lib/Xrandr/Imakefile @@ -5,7 +5,7 @@ @@ -1230,17 +1059,6 @@ Last-Update: 2012-02-15 Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ -Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ +Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ ---- a/nx-X11/lib/Xss/Imakefile -+++ b/nx-X11/lib/Xss/Imakefile -@@ -4,7 +4,7 @@ - #define DoExtraLib SharedLibXss - #define DoDebugLib DebugLibXss - #define DoProfileLib ProfileLibXss --#define LibName Xss -+#define LibName NX_Xss - #define SoRev SOXSSREV - #define LibHeaders NO - --- a/nx-X11/lib/Xtst/Imakefile +++ b/nx-X11/lib/Xtst/Imakefile @@ -10,7 +10,7 @@ @@ -1252,160 +1070,6 @@ Last-Update: 2012-02-15 #define SoRev SOXTESTREV #define LibHeaders NO ---- a/nx-X11/lib/Xv/Imakefile -+++ b/nx-X11/lib/Xv/Imakefile -@@ -4,7 +4,7 @@ - #define DoSharedLib SharedLibXv - #define DoDebugLib DebugLibXv - #define DoProfileLib ProfileLibXv --#define LibName Xv -+#define LibName NX_Xv - #define SoRev SOXVREV - #define LibHeaders NO - ---- a/nx-X11/lib/XvMC/Imakefile -+++ b/nx-X11/lib/XvMC/Imakefile -@@ -4,7 +4,7 @@ - #define DoSharedLib SharedLibXvMC - #define DoDebugLib DebugLibXvMC - #define DoProfileLib ProfileLibXvMC --#define LibName XvMC -+#define LibName NX_XvMC - #define SoRev SOXVMCREV - #define LibHeaders NO - ---- a/nx-X11/lib/XvMC/hw/i810/Imakefile -+++ b/nx-X11/lib/XvMC/hw/i810/Imakefile -@@ -3,7 +3,7 @@ - #define DoSharedLib SharedLibXvMC - #define DoDebugLib DebugLibXvMC - #define DoProfileLib ProfileLibXvMC --#define LibName I810XvMC -+#define LibName NX_I810XvMC - #define SoRev SOXVMCREV - #define LibHeaders NO - ---- a/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile -+++ b/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile -@@ -2,7 +2,7 @@ - #define DoSharedLib SharedLibXvMC - #define DoDebugLib DebugLibXvMC - #define DoProfileLib ProfileLibXvMC --#define LibName viaXvMC -+#define LibName NX_viaXvMC - #define SoRev SOXVMCREV - #define LibHeaders NO - ---- a/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile -+++ b/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile -@@ -2,7 +2,7 @@ - #define DoSharedLib SharedLibXvMC - #define DoDebugLib DebugLibXvMC - #define DoProfileLib ProfileLibXvMC --#define LibName viaXvMCPro -+#define LibName NX_viaXvMCPro - #define SoRev SOXVMCREV - #define LibHeaders NO - ---- a/nx-X11/lib/XvMC/wrapper/Imakefile -+++ b/nx-X11/lib/XvMC/wrapper/Imakefile -@@ -3,7 +3,7 @@ - #define DoSharedLib SharedLibXvMC - #define DoDebugLib DebugLibXvMC - #define DoProfileLib ProfileLibXvMC --#define LibName XvMCW -+#define LibName NX_XvMCW - #define SoRev SOXVMCREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xxf86dga/Imakefile -+++ b/nx-X11/lib/Xxf86dga/Imakefile -@@ -6,7 +6,7 @@ - #define DoExtraLib SharedLibXxf86dga - #define DoDebugLib DebugLibXxf86dga - #define DoProfileLib ProfileLibXxf86dga --#define LibName Xxf86dga -+#define LibName NX_Xxf86dga - #define SoRev SOXXF86DGAREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xxf86misc/Imakefile -+++ b/nx-X11/lib/Xxf86misc/Imakefile -@@ -6,7 +6,7 @@ - #define DoExtraLib SharedLibXxf86misc - #define DoDebugLib DebugLibXxf86misc - #define DoProfileLib ProfileLibXxf86misc --#define LibName Xxf86misc -+#define LibName NX_Xxf86misc - #define SoRev SOXXF86MISCREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xxf86rush/Imakefile -+++ b/nx-X11/lib/Xxf86rush/Imakefile -@@ -3,7 +3,7 @@ - #define DoSharedLib SharedLibXxf86rush - #define DoDebugLib DebugLibXxf86rush - #define DoProfileLib ProfileLibXxf86rush --#define LibName Xxf86rush -+#define LibName NX_Xxf86rush - #define SoRev SOXXF86RUSHREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xxf86vm/Imakefile -+++ b/nx-X11/lib/Xxf86vm/Imakefile -@@ -6,7 +6,7 @@ - #define DoExtraLib SharedLibXxf86vm - #define DoDebugLib DebugLibXxf86vm - #define DoProfileLib ProfileLibXxf86vm --#define LibName Xxf86vm -+#define LibName NX_Xxf86vm - #define SoRev SOXXF86VMREV - #define LibHeaders NO - ---- a/nx-X11/lib/apple/Imakefile -+++ b/nx-X11/lib/apple/Imakefile -@@ -5,7 +5,7 @@ - #define DoSharedLib SharedLibAppleWM - #define DoDebugLib DebugLibAppleWM - #define DoProfileLib ProfileLibAppleWM --#define LibName AppleWM -+#define LibName NX_AppleWM - #define SoRev SOAPPLEWMREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/dmx/Imakefile -+++ b/nx-X11/lib/dmx/Imakefile -@@ -5,7 +5,7 @@ - #define DoDebugLib DebugLibDmx - #define DoProfileLib ProfileLibDmx - --#define LibName dmx -+#define LibName NX_dmx - #define SoRev SODMXREV - #define LibHeaders NO - ---- a/nx-X11/lib/dps/Imakefile -+++ b/nx-X11/lib/dps/Imakefile -@@ -5,7 +5,7 @@ - #define DoExtraLib SharedLibDps - #define DoDebugLib DebugLibDps - #define DoProfileLib ProfileLibDps --#define LibName dps -+#define LibName NX_dps - #define SoRev SODPSREV - #define IncSubdir DPS - ---- a/nx-X11/lib/dpstk/Imakefile -+++ b/nx-X11/lib/dpstk/Imakefile -@@ -5,7 +5,7 @@ - #define DoExtraLib SharedLibDpsTk - #define DoDebugLib DebugLibDpsTk - #define DoProfileLib ProfileLibDpsTk --#define LibName dpstk -+#define LibName NX_dpstk - #define SoRev SODPSTKREV - #define LibHeaders NO - --- a/nx-X11/lib/font/Imakefile +++ b/nx-X11/lib/font/Imakefile @@ -31,7 +31,7 @@ @@ -1428,28 +1092,6 @@ Last-Update: 2012-02-15 #define SoRev SOOLDXREV #define IncSubdir X11 ---- a/nx-X11/lib/psres/Imakefile -+++ b/nx-X11/lib/psres/Imakefile -@@ -5,7 +5,7 @@ - #define DoExtraLib SharedLibPSRes - #define DoDebugLib DebugLibPSRes - #define DoProfileLib ProfileLibPSRes --#define LibName psres -+#define LibName NX_psres - #define SoRev SOPSRESREV - #define LibHeaders NO - ---- a/nx-X11/lib/windows/Imakefile -+++ b/nx-X11/lib/windows/Imakefile -@@ -2,7 +2,7 @@ - #define DoSharedLib SharedLibWindowsWM - #define DoDebugLib DebugLibWindowsWM - #define DoProfileLib ProfileLibWindowsWM --#define LibName WindowsWM -+#define LibName NX_WindowsWM - #define SoRev SOWINDOWSWMREV - #define IncSubdir X11 - #define IncSubSubdir extensions --- a/nx-X11/lib/xkbfile/Imakefile +++ b/nx-X11/lib/xkbfile/Imakefile @@ -11,7 +11,7 @@ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 8b05e191862cfe3ef369723429072dac1d71dcb8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 19:39:16 2015 +0100 Update .spec file to meet changes in tarball size reduction and restructuring. --- debian/changelog | 2 + nx-libs.spec | 110 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ba82f4..30b2797 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * nx-libs.spec: + The gpg-offline bin:package is not available in our SLE repo. We can do without. + + Update .spec file to meet changes in tarball size reduction and + restructuring. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, diff --git a/nx-libs.spec b/nx-libs.spec index bdd4c34..a7a5ebd 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -544,13 +544,38 @@ mkdir etc/ cp -v debian/keystrokes.cfg etc/keystrokes.cfg cp -v debian/Makefile.nx-libs Makefile cp -v debian/Makefile.replace.sh replace.sh -cp -v debian/rgb rgb +cp -v debian/rgb etc/rgb +cp -v debian/nxagent.keyboard etc/nxagent.keyboard +cp -v debian/x2goagent.keyboard etc/x2goagent.keyboard cp -v debian/VERSION VERSION.x2goagent cp -v debian/VERSION nxcomp/VERSION -# remove bundled libraries (also taken from roll-tarball.sh) -rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib} -rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib} -rm -Rf nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu} + +### remove bundled libraries (also taken from roll-tarball.sh) +UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` +CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` +UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` +PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` +PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` +PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` +mkdir -p .preserve/ +for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do + if [ ! -d $path ]; then + path_dirname=$(dirname "$path") + else + path_dirname="$path" + fi + mkdir -vp ".preserve/$path_dirname" + cp -av "$path" ".preserve/$path" +done +for path in ${UNUSED_FOLDERS} ${CLEAN_FOLDERS} ${UNNEEDED_BACKUPS}; do + rm -R "$path" +done + +# re-create the to-be-preserved files +cp -a .preserve/* ./ +rm -Rf .preserve/ +### end of remove bundle libraries + # remove build cruft that is in Git (also taken from roll-tarball.sh) rm -Rf nx*/configure nx*/autom4te.cache* # Install into /usr @@ -587,19 +612,20 @@ chmod a+x my_configure; # The RPM macro for the linker flags does not exist on EPEL %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} export SHLIBGLOBALSFLAGS="%{__global_ldflags}" +export LOCAL_LDFLAGS="%{__global_ldflags}" make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx %install make install \ DESTDIR=%{buildroot} \ PREFIX=%{_prefix} \ - USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx \ + USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} \ INSTALL_DIR="install -dm0755" \ INSTALL_FILE="install -pm0644" \ INSTALL_PROGRAM="install -pm0755" # Remove static libs -rm %{buildroot}%{_libdir}/nx/*.a +rm %{buildroot}%{_libdir}/*.a # Make sure x2goagent is linked relative and on 64-bit mkdir -p %{buildroot}%{_libdir}/x2go/bin @@ -608,11 +634,6 @@ ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent # Fix permissions on shared libraries chmod 755 %{buildroot}%{_libdir}/nx/{,X11/}lib*.so* -# Linker -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ -echo %{_libdir}/nx > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -echo %{_libdir}/nx/X11 >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf - #Remove extras, GL, and other unneeded headers rm -r %{buildroot}%{_includedir}/nx/GL rm -r %{buildroot}%{_includedir}/nx/X11/bitmaps @@ -665,19 +686,16 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files %defattr(-,root,root) %doc nx-X11/{COPYING,LICENSE,README} -%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%dir %{_libdir}/nx %dir %{_datadir}/nx %{_datadir}/nx/SecurityPolicy %files -n libNX_X11 %defattr(-,root,root) -%dir %{_libdir}/nx/X11 %{_libdir}/nx/X11/libNX_X11.so.6* %files -n libNX_X11-devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_X11.so +%{_libdir}/libNX_X11.so %dir %{_includedir}/nx %dir %{_includedir}/nx/X11 %{_includedir}/nx/X11/ImUtil.h @@ -694,33 +712,33 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libNX_Xau-devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xau.so +%{_libdir}/libNX_Xau.so %{_includedir}/nx/X11/Xauth.h %files -n libNX_Xau %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xau.so.6* +%{_libdir}/libNX_Xau.so.6* %files -n libNX_Xcomposite %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xcomposite.so.1* +%{_libdir}/libNX_Xcomposite.so.1* %files -n libNX_Xdamage %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xdamage.so.1* +%{_libdir}/libNX_Xdamage.so.1* %files -n libNX_Xdmcp-devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xdmcp.so +%{_libdir}/libNX_Xdmcp.so %{_includedir}/nx/X11/Xdmcp.h %files -n libNX_Xdmcp %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xdmcp.so.6* +%{_libdir}/libNX_Xdmcp.so.6* %files -n libNX_Xext-devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xext.so +%{_libdir}/libNX_Xext.so %dir %{_includedir}/nx/X11/extensions %{_includedir}/nx/X11/extensions/MITMisc.h %{_includedir}/nx/X11/extensions/XEVI.h @@ -751,20 +769,20 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libNX_Xext %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xext.so.6* +%{_libdir}/libNX_Xext.so.6* %files -n libNX_Xfixes-devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xfixes.so +%{_libdir}/libNX_Xfixes.so %{_includedir}/nx/X11/extensions/Xfixes.h %files -n libNX_Xfixes %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xfixes.so.3* +%{_libdir}/libNX_Xfixes.so.3* %files -n libNX_Xinerama %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xinerama.so.1* +%{_libdir}/libNX_Xinerama.so.1* %dir %{_libdir}/nx/X11/Xinerama/ %{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 %{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 @@ -772,33 +790,33 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libNX_Xpm-devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xpm.so +%{_libdir}/libNX_Xpm.so %{_includedir}/nx/X11/xpm.h %files -n libNX_Xpm %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xpm.so.4* +%{_libdir}/libNX_Xpm.so.4* %files -n libNX_Xrandr %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xrandr.so.2* +%{_libdir}/libNX_Xrandr.so.2* %files -n libNX_Xrender-devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xrender.so +%{_libdir}/libNX_Xrender.so %{_includedir}/nx/X11/extensions/Xrender.h %files -n libNX_Xrender %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xrender.so.1* +%{_libdir}/libNX_Xrender.so.1* %files -n libNX_Xtst %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xtst.so.6* +%{_libdir}/libNX_Xtst.so.6* %files -n libXcomp-devel %defattr(-,root,root) -%_libdir/nx/libXcomp.so +%_libdir/libXcomp.so %{_includedir}/nx/MD5.h %{_includedir}/nx/NX.h %{_includedir}/nx/NXalert.h @@ -811,22 +829,22 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libXcomp %defattr(-,root,root) %doc nxcomp/{COPYING,LICENSE,README} -%_libdir/nx/libXcomp.so.3* +%_libdir/libXcomp.so.3* %files -n libXcompext-devel %defattr(-,root,root) -%_libdir/nx/libXcompext.so +%_libdir/libXcompext.so %{_includedir}/nx/NXlib.h %{_includedir}/nx/NXlibint.h %files -n libXcompext %defattr(-,root,root) %doc nxcompext/{COPYING,LICENSE,README} -%_libdir/nx/libXcompext.so.3* +%_libdir/libXcompext.so.3* %files -n libXcompshad-devel %defattr(-,root,root) -%_libdir/nx/libXcompshad.so +%_libdir/libXcompshad.so %{_includedir}/nx/Core.h %{_includedir}/nx/Input.h %{_includedir}/nx/Logger.h @@ -842,15 +860,15 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libXcompshad %defattr(-,root,root) %doc nxcompshad/{CHANGELOG,COPYING,LICENSE} -%_libdir/nx/libXcompshad.so.3* +%_libdir/libXcompshad.so.3* %files devel %defattr(-,root,root) -%{_libdir}/nx/X11/libNX_Xcomposite.so -%{_libdir}/nx/X11/libNX_Xdamage.so -%{_libdir}/nx/X11/libNX_Xinerama.so -%{_libdir}/nx/X11/libNX_Xrandr.so -%{_libdir}/nx/X11/libNX_Xtst.so +%{_libdir}/libNX_Xcomposite.so +%{_libdir}/libNX_Xdamage.so +%{_libdir}/libNX_Xinerama.so +%{_libdir}/libNX_Xrandr.so +%{_libdir}/libNX_Xtst.so %{_includedir}/nx/X11/X10.h %dir %{_includedir}/nx/X11/extensions %{_includedir}/nx/X11/extensions/XRes.h @@ -964,6 +982,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %defattr(-,root,root) %dir %{_sysconfdir}/nxagent %config(noreplace) %{_sysconfdir}/nxagent/keystrokes.cfg +%config(noreplace) %{_sysconfdir}/nxagent/nxagent.keyboard +%config(noreplace) %{_sysconfdir}/nxagent/rgb %{_bindir}/nxagent %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxagent @@ -986,6 +1006,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %dir %{_libdir}/x2go %dir %{_libdir}/x2go/bin %config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg +%config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard +%config(noreplace) %{_sysconfdir}/x2go/rgb %{_bindir}/x2goagent %{_libdir}/x2go/bin/x2goagent %{_datadir}/pixmaps/x2go.xpm -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git