nxcompext.git - master (branch) updated: 3.5.0-1-2-gfc96513 - x2go-commits

13 Oct 2011

The branch, master has been updated
       via  fc965130aee523a6f03f1e5497e488a6e18213c5 (commit)
       via  7d44b63770b27d3c662ad71cbcc80db5805937a4 (commit)
      from  ddc02af9bdf8119132d7b38eb249d8e5e33a1d0c (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 fc965130aee523a6f03f1e5497e488a6e18213c5
Author: Reinhard Tartler <siretart@tauware.de>
Date:   Thu Oct 13 22:52:46 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 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.

commit 7d44b63770b27d3c662ad71cbcc80db5805937a4
Author: Reinhard Tartler <siretart@tauware.de>
Date:   Thu Oct 13 22:17:19 2011 +0200

    build against NX X11 replacement headers

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in    |    2 +-
 debian/control |    7 +++----
 debian/rules   |   14 ++++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

The diff of changes is:

diff --git a/Makefile.in b/Makefile.in
index 99170b3..d43f7d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
 CCINCLUDES  = -I. -I/usr/include/nx
 CCDEFINES   =
 
-LDFLAGS     = @LDFLAGS@
+LDFLAGS     = @LDFLAGS@ -L.
 LIBS        = @LIBS@ -lz -lX11 -lXcomp
 
 #
diff --git a/debian/control b/debian/control
index 63de454..47eedbc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Build-Depends:
  debhelper (>= 7.0.50),
  libjpeg-dev,
  libpng-dev,
- libx11-dev,
+ libx11-6,
  libxcomp-dev (>= 3.4.0),
  libz-dev,
  pkg-config,
- xserver-xorg-dev
+ x11proto-nx-dev
 Standards-Version: 3.9.2
 Homepage: http://code.x2go.org/releases/source/nxcompext
 Vcs-Git: git://code.x2go.org/nxcompext.git
@@ -41,8 +41,7 @@ Depends:
  libxcompext3 (=${binary:Version}),
  ${misc:Depends},
  libxcomp-dev,
- x11proto-core-dev,
- libx11-dev
+ x11proto-nx-dev,
 Breaks: nxcompext-dev
 Replaces: nxcompext-dev
 Description: NX X11 protocol compression extensions library
diff --git a/debian/rules b/debian/rules
index 5feb4d5..1cd59cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,22 @@
 #!/usr/bin/make -f
 
+DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+
 %:
 	dh --with autoreconf --parallel $@
 
+override_dh_auto_build:
+	if test  -f /usr/lib/$(DEB_BUILD_MULTIARCH)/libX11.so.6; then \
+	  ln -s /usr/lib/$(DEB_BUILD_MULTIARCH)/libX11.so.6 libX11.so; \
+	else \
+	  ln -s /usr/lib/libX11.so.6 libX11.so ;\
+	fi
+	dh_auto_build
+
+override_dh_clean:
+	dh_clean
+	rm -f libX11.so
+
 override_dh_auto_install:
 
 override_dh_strip:


hooks/post-receive
-- 
nxcompext.git (NX compext 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 "nxcompext.git" (NX compext library).

    