The branch, master has been updated via cae6a347cda7e42f976a39aecd902d6d423ed50c (commit) from b38269fdd9b966f694c71da88447aecb1cc109d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cae6a347cda7e42f976a39aecd902d6d423ed50c Author: Reinhard Tartler <siretart@tauware.de> Date: Thu Oct 13 23:22:54 2011 +0200 Workaround linking against libx11 without libx11-dev the package x11proto-nx-dev conflicts against x11proto-core-dev, which in turn is a dependency of libx11-dev. Normally, we need libx11-dev (and similar packages) for linking for the actual headers (which we want to replace) and the symlink in /usr/lib. We provide the headers in x11proto-nx-dev, and the symlink is hacked in on the fly. ----------------------------------------------------------------------- Summary of changes: Makefile.in | 2 +- debian/control | 8 ++++---- debian/rules | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/Makefile.in b/Makefile.in index e93c896..71f7026 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ CCFLAGS = @X_CFLAGS@ @DEFS@ \ CCINCLUDES = CCDEFINES = -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L. LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 -lXext # diff --git a/debian/control b/debian/control index 46143f4..11c2862 100644 --- a/debian/control +++ b/debian/control @@ -6,11 +6,11 @@ Uploaders: Build-Depends: dh-autoreconf, debhelper (>= 7.0.50), - libxtst-dev, - libxdamage-dev, - libxrandr-dev, + libxext6, + libxdamage1, + libxrandr2, automake, - libxi-dev + libxcompext-dev, Section: x11 Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/nxcompshad diff --git a/debian/rules b/debian/rules index c32641f..87006da 100755 --- a/debian/rules +++ b/debian/rules @@ -5,5 +5,26 @@ override_dh_auto_install: +define link_library + if test -f /usr/lib/$(DEB_BUILD_MULTIARCH)/$(1); then \ + ln -sf /usr/lib/$(DEB_BUILD_MULTIARCH)/$(1) $(2); \ + elif test -f /usr/lib/$(1); then \ + ln -sf /usr/lib/$(1) $(2) ;\ + else echo $(1) not found; false ;\ + fi +endef + +override_dh_auto_build: + $(call link_library,libX11.so.6,libX11.so) + $(call link_library,libXext.so.6,libXext.so) + $(call link_library,libXtst.so.6,libXtst.so) + $(call link_library,libXrandr.so.2,libXrandr.so) + $(call link_library,libXdamage.so.1,libXdamage.so) + dh_auto_build + +override_dh_clean: + dh_clean + rm -f *.so + override_dh_strip: dh_strip --dbg-package=libxcompshad-dbg hooks/post-receive -- nxcompshad.git (NX compshad library) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nxcompshad.git" (NX compshad library).