Skip to content

N
nx-libs
Commit b3d32ec5 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

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.
parent a3087eec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 345 additions and 247 deletions
debian/Makefile.nx-libs
View file @ b3d32ec5
...@@ -8,13 +8,16 @@ COPY_SYMLINK=cp -a ...@@ -8,13 +8,16 @@ COPY_SYMLINK=cp -a
RM_FILE=rm -f RM_FILE=rm -f
RM_DIR=rmdir -p --ignore-fail-on-non-empty RM_DIR=rmdir -p --ignore-fail-on-non-empty
ETCDIR_NX ?= /etc/nxagent ETCDIR_NX ?= /etc/nxagent
ETCDIR_X2GO ?= /etc/x2go ETCDIR_X2GO ?= /etc/x2go
PREFIX ?= /usr/local PREFIX ?= /usr/local
BINDIR=$(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
NXLIBDIR=$(PREFIX)/lib/nx LIBDIR ?= $(PREFIX)/lib
X2GOLIBDIR=$(PREFIX)/lib/x2go USRLIBDIR ?= $(LIBDIR)
CONFIGURE ?= ./configure INCLUDEDIR ?= $(PREFIX)/include
NXLIBDIR ?= $(PREFIX)/lib/nx
X2GOLIBDIR ?= $(PREFIX)/lib/x2go
CONFIGURE ?= ./configure
SHELL:=/bin/bash SHELL:=/bin/bash
...@@ -105,14 +108,14 @@ install-full: ...@@ -105,14 +108,14 @@ install-full:
cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \ cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \
done; done;
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)
$(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/ $(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" | \ . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
while read dirname; do \ 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 \ $(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; \ done; \
# Provide means for Xinerama support in NX/X2Go sessions. This # Provide means for Xinerama support in NX/X2Go sessions. This
...@@ -120,11 +123,11 @@ install-full: ...@@ -120,11 +123,11 @@ install-full:
# (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6 # (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 # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama $(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/* \ $(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_NX)
$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO) $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)
...@@ -153,7 +156,7 @@ uninstall-full: ...@@ -153,7 +156,7 @@ uninstall-full:
if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
if test -f nx-X11/Makefile; then \ if test -f nx-X11/Makefile; then \
if test -d $(PREFIX)/lib/nx; then rm -rf $(PREFIX)/lib/nx; fi; \ if test -d $(NXLIBDIR); then rm -rf $(NXLIBDIR); fi; \
if test -d $(PREFIX)/include/nx; then rm -rf $(PREFIX)/include/nx; fi; \ if test -d $(INCLUDEDIR)/nx; then rm -rf $(INCLUDEDIR)/nx; fi; \
fi; \ fi; \
fi fi
debian/changelog
View file @ b3d32ec5
nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
[ Paul Szabo ] [ Paul Szabo ]
* DISABLED:401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch. * 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 ...@@ -11,13 +11,6 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium
without. without.
* Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header * Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header
referring to keystrokes.cfg (plural), not keystroke.cfg. 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 * Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in
roll-tarball.sh and in debian/rules alike. roll-tarball.sh and in debian/rules alike.
* Stop shipping unused / very old xterm code. * Stop shipping unused / very old xterm code.
...@@ -29,12 +22,26 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium ...@@ -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/miext/shadow/
- nx-X11/programs/Xserver/XpConfig/ - nx-X11/programs/Xserver/XpConfig/
- nx-X11/programs/Xserver/Xprint/ - 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. * 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 ] [ Horst Schirmeier ]
* Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that
prevented the /etc/nxagent/keystrokes.cfg file from being parsed. (Fixes: prevented the /etc/nxagent/keystrokes.cfg file from being parsed. (Fixes:
......
debian/libnx-x11-6.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_X11.so.*
debian/libnx-x11-dev.install.in 0 → 100644
View file @ b3d32ec5
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
debian/libnx-x11.install deleted 100644 → 0
View file @ a3087eec
usr/lib/nx/X11
usr/share/nx
debian/libnx-x11.links deleted 100644 → 0
View file @ a3087eec
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
debian/libnx-x11.lintian-overrides deleted 100644 → 0
View file @ a3087eec
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
debian/libnx-xau-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xau.so
usr/include/*/nx/X11/Xauth.h
debian/libnx-xau6.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xau6.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xau.so.*
debian/libnx-xcomposite-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xcomposite.so
usr/include/*/nx/X11/extensions/Xcomposite.h
debian/libnx-xcomposite1.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xcomposite1.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xcomposite.so.*
debian/libnx-xdamage-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xdamage.so
usr/include/*/nx/X11/extensions/Xdamage.h
debian/libnx-xdamage1.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xdamage1.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xdamage.so.*
debian/libnx-xdmcp-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xdmcp.so
usr/include/*/nx/X11/Xdmcp.h
debian/libnx-xdmcp6.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xdmcp6.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xdmcp.so.*
debian/libnx-xext-dev.install.in 0 → 100644
View file @ b3d32ec5
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
debian/libnx-xext6.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xext6.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xext.so.*
debian/libnx-xfixes-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xfixes.so
usr/include/*/nx/X11/extensions/Xfixes.h
debian/libnx-xfixes3.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xfixes3.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xfixes.so.*
debian/libnx-xinerama-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xinerama.so
usr/include/*/nx/X11/extensions/Xinerama.h
usr/include/*/nx/X11/extensions/panoramiXext.h
debian/libnx-x11.dirs → debian/libnx-xinerama1.dirs
View file @ b3d32ec5
usr/lib/nx/X11/Xinerama usr/lib/nx/X11/Xinerama
usr/lib/nx/X11/Xrandr
usr/share/nx
debian/libnx-xinerama1.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xinerama1.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xinerama.so.*
debian/libnx-xpm-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xpm.so
usr/include/*/nx/X11/xpm.h
debian/libnx-xpm4.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xpm4.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xpm.so.*
debian/libnx-xrandr-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xrandr.so
usr/include/*/nx/X11/extensions/Xrandr.h
\ No newline at end of file
debian/libnx-xrandr2.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xrandr2.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xrandr.so.*
debian/libnx-xrender-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xrender.so
usr/include/*/nx/X11/extensions/Xrender.h
debian/libnx-xrender1.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xrender1.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xrender.so.*
debian/libnx-xtst-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xtst.so
usr/include/*/nx/X11/extensions/XTest.h
debian/libnx-xtst6.docs 0 → 100644
View file @ b3d32ec5
nx-X11/changelog
\ No newline at end of file
debian/libnx-xtst6.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libNX_Xtst.so.*
debian/libxcomp-dev.install deleted 100644 → 0
View file @ a3087eec
nxcomp/libXcomp.so usr/lib/nx
nxcomp/libXcomp.a usr/lib/nx
nxcomp/NX*.h usr/include/nx
nxcomp/MD5.h usr/include/nx
debian/libxcomp-dev.install.in 0 → 100644
View file @ b3d32ec5
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
debian/libxcomp-dev.lintian-overrides deleted 100644 → 0
View file @ a3087eec
libxcomp-dev: possible-new-upstream-release-without-new-version
libxcomp-dev: debian-revision-should-not-be-zero
debian/libxcomp3.install deleted 100644 → 0
View file @ a3087eec
nxcomp/libXcomp.so.3.* usr/lib/nx
nxcomp/libXcomp.so.3 usr/lib/nx
debian/libxcomp3.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libXcomp.so.*
debian/libxcomp3.links deleted 100644 → 0
View file @ a3087eec
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
debian/libxcomp3.lintian-overrides deleted 100644 → 0
View file @ a3087eec
libxcomp3: possible-new-upstream-release-without-new-version
libxcomp3: debian-revision-should-not-be-zero
debian/libxcompext-dev.install deleted 100644 → 0
View file @ a3087eec
nxcompext/libXcompext.so usr/lib/nx
nxcompext/NX*.h usr/include/nx
debian/libxcompext-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libXcompext.so
usr/include/*/nx/NXlib.h
usr/include/*/nx/NXlibint.h
debian/libxcompext-dev.lintian-overrides deleted 100644 → 0
View file @ a3087eec
libxcompext-dev: possible-new-upstream-release-without-new-version
libxcompext-dev: debian-revision-should-not-be-zero
debian/libxcompext3.install deleted 100644 → 0
View file @ a3087eec
nxcompext/libXcompext.so.* usr/lib/nx
debian/libxcompext3.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libXcompext.so.*
debian/libxcompext3.links deleted 100644 → 0
View file @ a3087eec
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
debian/libxcompext3.lintian-overrides deleted 100644 → 0
View file @ a3087eec
libxcompext3: possible-new-upstream-release-without-new-version
libxcompext3: debian-revision-should-not-be-zero
\ No newline at end of file
debian/libxcompshad-dev.install deleted 100644 → 0
View file @ a3087eec
nxcompshad/*.h usr/include/nx
nxcompshad/*.a usr/lib/nx/
nxcompshad/lib*.so usr/lib/nx/
nxcompshad/*.a usr/lib/nx/
debian/libxcompshad-dev.install.in 0 → 100644
View file @ b3d32ec5
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
debian/libxcompshad-dev.lintian-overrides deleted 100644 → 0
View file @ a3087eec
libxcompshad-dev: possible-new-upstream-release-without-new-version
libxcompshad-dev: debian-revision-should-not-be-zero
debian/libxcompshad3.install deleted 100644 → 0
View file @ a3087eec
nxcompshad/lib*.so.* usr/lib/nx
debian/libxcompshad3.install.in 0 → 100644
View file @ b3d32ec5
usr/lib/*/libXcompshad*.so.*
debian/libxcompshad3.links deleted 100644 → 0
View file @ a3087eec
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
debian/libxcompshad3.lintian-overrides deleted 100644 → 0
View file @ a3087eec
libxcompshad3: possible-new-upstream-release-without-new-version
libxcompshad3: debian-revision-should-not-be-zero
\ No newline at end of file
debian/nx-x11-common.install 0 → 100644
View file @ b3d32ec5
usr/share/nx/
usr/lib/nx/X11/
debian/nx-x11proto-composite-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/include/*/nx/X11/extensions/composite.h
usr/include/*/nx/X11/extensions/compositeproto.h
\ No newline at end of file
debian/nx-x11proto-core-dev.install.in 0 → 100644
View file @ b3d32ec5
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
debian/nx-x11proto-damage-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/include/*/nx/X11/extensions/damageproto.h
usr/include/*/nx/X11/extensions/damagewire.h
\ No newline at end of file
debian/nx-x11proto-randr-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/include/*/nx/X11/extensions/randr.h
usr/include/*/nx/X11/extensions/randrproto.h
debian/nx-x11proto-render-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/include/*/nx/X11/extensions/render.h
usr/include/*/nx/X11/extensions/renderproto.h
debian/nx-x11proto-xext-dev.install.in 0 → 100644
View file @ b3d32ec5
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
debian/nx-x11proto-xfixes-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/include/*/nx/X11/extensions/xfixeswire.h
usr/include/*/nx/X11/extensions/xfixesproto.h
debian/nx-x11proto-xinerama-dev.install.in 0 → 100644
View file @ b3d32ec5
usr/include/*/nx/X11/extensions/panoramiXproto.h
\ No newline at end of file
debian/nxagent.install
View file @ b3d32ec5
nx-X11/programs/Xserver/nxagent usr/lib/nx/bin etc/nxagent/keystrokes.cfg
bin/nxagent usr/bin usr/lib/nx/bin/nxagent
usr/bin/nxagent
debian/rgb usr/share/nx debian/rgb usr/share/nx
debian/nxagent.keyboard etc/nxagent debian/nxagent.keyboard etc/nxagent
nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps
etc/nxagent/keystrokes.cfg
debian/nxagent.lintian-overrides deleted 100644 → 0
View file @ a3087eec
nxagent: possible-new-upstream-release-without-new-version
nxagent: debian-revision-should-not-be-zero
\ No newline at end of file
debian/nxauth.lintian-overrides deleted 100644 → 0
View file @ a3087eec
nxauth: possible-new-upstream-release-without-new-version
nxauth: debian-revision-should-not-be-zero
\ No newline at end of file
debian/nxproxy.install
View file @ b3d32ec5
usr/lib/nx/bin/nxproxy usr/lib/nx/bin/nxproxy
usr/bin/nxproxy usr/bin/nxproxy
usr/share/man/man1/nxproxy.1
debian/nxproxy.lintian-overrides deleted 100644 → 0
View file @ a3087eec
nxproxy: possible-new-upstream-release-without-new-version
nxproxy: debian-revision-should-not-be-zero
\ No newline at end of file
debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
View file @ b3d32ec5
...@@ -36,12 +36,12 @@ Last-Update: 2012-02-14 ...@@ -36,12 +36,12 @@ Last-Update: 2012-02-14
install.bin: install.bin:
+install.lib: all +install.lib: all
+ ./mkinstalldirs $(DESTDIR)${libdir}/nx + ./mkinstalldirs $(DESTDIR)${libdir}
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true + echo "Running ldconfig tool, this may take a while..." && ldconfig || true
...@@ -53,10 +53,10 @@ Last-Update: 2012-02-14 ...@@ -53,10 +53,10 @@ Last-Update: 2012-02-14
+uninstall.bin: +uninstall.bin:
+ +
+uninstall.lib: +uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so + $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a + $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
......
debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
View file @ b3d32ec5
...@@ -37,11 +37,11 @@ Last-Update: 2012-02-14 ...@@ -37,11 +37,11 @@ Last-Update: 2012-02-14
install.bin: install.bin:
+install.lib: all +install.lib: all
+ ./mkinstalldirs $(DESTDIR)${libdir}/nx + ./mkinstalldirs $(DESTDIR)${libdir}
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true + echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+ +
...@@ -52,9 +52,9 @@ Last-Update: 2012-02-14 ...@@ -52,9 +52,9 @@ Last-Update: 2012-02-14
+uninstall.bin: +uninstall.bin:
+ +
+uninstall.lib: +uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so + $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true + echo "Running ldconfig tool, this may take a while..." && ldconfig || true
......
debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
View file @ b3d32ec5
...@@ -38,12 +38,12 @@ Last-Update: 2012-02-14 ...@@ -38,12 +38,12 @@ Last-Update: 2012-02-14
install.bin: install.bin:
+install.lib: all +install.lib: all
+ $(INSTALL_DIR) $(DESTDIR)${libdir}/nx + $(INSTALL_DIR) $(DESTDIR)${libdir}
+ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx + $(INSTALL_DIR) $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}
+ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) *.a $(DESTDIR)${libdir}
+ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true + echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+ +
...@@ -54,10 +54,10 @@ Last-Update: 2012-02-14 ...@@ -54,10 +54,10 @@ Last-Update: 2012-02-14
+uninstall.bin: +uninstall.bin:
+ +
+uninstall.lib: +uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so + $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a + $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
+ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done + for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
+ $(RM_DIR) $(DESTDIR)${libdir}/nx/ + $(RM_DIR) $(DESTDIR)${libdir}/nx/
+ $(RM_DIR) $(DESTDIR)${includedir}/nx/ + $(RM_DIR) $(DESTDIR)${includedir}/nx/
......
debian/patches/031_nx-X11_parallel-make.full.patch
View file @ b3d32ec5
...@@ -9,19 +9,13 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -9,19 +9,13 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
--- ---
nx-X11/Makefile | 64 +++++++++++++++++----------------- nx-X11/Makefile | 64 +++++++++++++++++-----------------
nx-X11/config/imake/Makefile.ini | 1 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 | 12 ++----
nx-X11/lib/X11/Imakefile.NX.original | 12 ++----
nx-X11/programs/Xserver/Imakefile | 4 +- nx-X11/programs/Xserver/Imakefile | 4 +-
10 files changed, 60 insertions(+), 69 deletions(-) 10 files changed, 60 insertions(+), 69 deletions(-)
--- a/nx-X11/Makefile --- a/nx-X11/Makefile
+++ b/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 VERSPROG = $(CONFIGSRC)/util/printver.exe
all: all:
...@@ -32,7 +26,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -32,7 +26,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
all-initial: all-initial:
@echo Please use make World, or on NT use nmake World.Win32. @echo Please use make World, or on NT use nmake World.Win32.
@@ -57,8 +57,8 @@ World: @@ -57,8 +57,8 @@
@date @date
@echo "" @echo ""
@if [ -f xmakefile ]; then \ @if [ -f xmakefile ]; then \
...@@ -43,7 +37,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -43,7 +37,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
$(RM) xmakefile; \ $(RM) xmakefile; \
fi fi
@if [ ! -f $(IRULESRC)/host.def ]; then \ @if [ ! -f $(IRULESRC)/host.def ]; then \
@@ -84,14 +84,14 @@ World: @@ -84,14 +84,14 @@
# fi # fi
cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
$(MAKE) $(MFLAGS) Makefile.boot $(MAKE) $(MFLAGS) Makefile.boot
...@@ -65,7 +59,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -65,7 +59,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
@echo "" @echo ""
@date @date
@echo "" @echo ""
@@ -154,15 +154,15 @@ World.Win32: @@ -154,15 +154,15 @@
-if exist xmakefile.bak del xmakefile.bak -if exist xmakefile.bak del xmakefile.bak
-if exist xmakefile ren xmakefile xmakefile.bak -if exist xmakefile ren xmakefile xmakefile.bak
$(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) $(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 ...@@ -87,7 +81,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
@echo : @echo :
@echo : @echo :
@echo Full build of $(RELEASE) complete. @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 # a copy of every rule that might be invoked at top level
clean: clean:
...@@ -143,7 +137,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -143,7 +137,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
+ ${MAKE} ${MAKE_OPTS} $@ + ${MAKE} ${MAKE_OPTS} $@
--- a/nx-X11/config/imake/Makefile.ini --- a/nx-X11/config/imake/Makefile.ini
+++ b/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 SHELL = /bin/sh
RM = rm -f RM = rm -f
MV = mv MV = mv
...@@ -151,83 +145,9 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -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 \ RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
tags TAGS make.log tags TAGS make.log
NPROC = 1 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 --- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile
@@ -1161,25 +1161,23 @@ $(NX_XCOMPEXTCONFIGTARGET): @@ -1161,25 +1161,23 @@
#ifdef SunArchitecture #ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
...@@ -261,9 +181,26 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -261,9 +181,26 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
all:: $(NX_XCOMPLIBTARGET) 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 --- a/nx-X11/lib/X11/Imakefile.NX.original
+++ b/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 #ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
...@@ -289,19 +226,3 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ...@@ -289,19 +226,3 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
#endif #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), \
debian/rules
View file @ b3d32ec5
...@@ -9,8 +9,11 @@ else ...@@ -9,8 +9,11 @@ else
CFLAGS += -O2 CFLAGS += -O2
endif 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) # before build, we will remove unused code / bundled libraries (keep this in sync with roll-tarball.sh)
UNUSED_FOLDERS = nx-X11/extras/drm/ \ UNUSED_FOLDERS = nx-X11/extras/drm/ \
...@@ -741,19 +744,65 @@ PRESERVE_SYMLINKED_FILES = nx-X11/extras/Mesa/include/GL/glext.h \ ...@@ -741,19 +744,65 @@ PRESERVE_SYMLINKED_FILES = nx-X11/extras/Mesa/include/GL/glext.h \
override_dh_auto_clean: override_dh_auto_clean:
rm -Rf nx-X11/.build-exports 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: override_dh_clean:
rm -f nx*/configure rm -f nx*/configure
rm -f nx*/changelog rm -f nx*/changelog
rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog
rm -f nx-X11/programs/nxauth/changelog rm -f nx-X11/programs/nxauth/changelog
rm -Rf replace.sh Makefile bin rgb VERSION.x2goagent etc/keystrokes.cfg if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi
rm -f debian/libnx-x11.postinst . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
rm -Rf .preserve/ 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 if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi
dh_clean 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: override_dh_auto_install:
PREFIX=/usr dh_auto_install -Smakefile PREFIX=/usr dh_auto_install -Smakefile
...@@ -777,8 +826,8 @@ override_dh_auto_build: ...@@ -777,8 +826,8 @@ override_dh_auto_build:
ln -sf debian/VERSION VERSION.x2goagent ln -sf debian/VERSION VERSION.x2goagent
ln -sf ../debian/VERSION nxcomp/VERSION 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 # let's prep the libnx-xinerama1.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 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 # make a copy of code to be preserved for build
mkdir -p .preserve mkdir -p .preserve
...@@ -793,7 +842,25 @@ override_dh_auto_build: ...@@ -793,7 +842,25 @@ override_dh_auto_build:
cp -av .preserve/* . cp -av .preserve/* .
rm -Rf .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: 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
debian/source.lintian-overrides deleted 100644 → 0
View file @ a3087eec
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
debian/wrappers/nxagent
View file @ b3d32ec5
...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx ...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp} NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP 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_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
export LD_LIBRARY_PATH
exec $NX_LIBS/bin/$NXAPP "$@" exec $NX_LIBS/bin/$NXAPP "$@"
debian/wrappers/nxauth
View file @ b3d32ec5
...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx ...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp} NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP 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_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
export LD_LIBRARY_PATH
exec $NX_LIBS/bin/$NXAPP "$@" exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file
debian/wrappers/nxproxy
View file @ b3d32ec5
...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx ...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp} NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP 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_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
export LD_LIBRARY_PATH
exec $NX_LIBS/bin/$NXAPP "$@" exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file
debian/wrappers/x2goagent
View file @ b3d32ec5
...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx ...@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp} NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP 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_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
export LD_LIBRARY_PATH
exec $NX_LIBS/../x2go/bin/$NXAPP "$@" exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
debian/x2goagent.lintian-overrides deleted 100644 → 0
View file @ a3087eec
x2goagent: debian-revision-should-not-be-zero
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment