[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.17-6-g258902b

[X2Go dev team]

The branch, master has been updated
       via  258902bec76cc4828ab7453df7406957ce93048a (commit)
      from  d439556ff1b83aecb10991cf0f031fd4da23494e (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 258902bec76cc4828ab7453df7406957ce93048a
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Feb 12 08:32:30 2013 +0100

    Avoid building of libxcomp1 (which actually is identical to libxcomp3, just with a wrong name). (Fixes: #104).

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

Summary of changes:
 debian/changelog                                   |    2 ++
 .../053_nx-X11_no-xcomp1-install-target.full.patch |   29 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 32 insertions(+)
 create mode 100644 debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e437dc2..7260164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
 
   [ Orion Poplawski ]
   * Fix wrong symlink direction of libNX_* files. (Fixes: #107).
+  * Avoid building of libxcomp1 (which actually is identical to libxcomp3,
+    just with a wrong name). (Fixes: #104).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 04 Jan 2013 13:27:05 +0100
 
diff --git a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
new file mode 100644
index 0000000..eca4200
--- /dev/null
+++ b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
@@ -0,0 +1,29 @@
+--- a/nx-X11/lib/X11/Imakefile	2013-01-04 05:25:49.000000000 -0700
++++ b/nx-X11/lib/X11/Imakefile	2013-01-15 15:26:07.969167259 -0700
+@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR    = $(XTOP)/../nxcomp
+ NX_XCOMPLIBLINK   = Xcomp
+ NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
+ NX_REQUIREDLIBS   = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
+-NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
+ NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status
+ 
+ NX_XCOMPEXTLIBDIR    = $(XTOP)/../nxcompext
+@@ -1181,17 +1180,9 @@ lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOM
+ 
+ all:: $(NX_XCOMPLIBTARGET)
+ 
+-$(NX_XCOMPDEPTARGET):
+-	ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
+-	ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
+-
+ depend:: $(NX_XCOMPLIBTARGET)
+ 
+-all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET) 
+-
+-clean::
+-	rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
+-	rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
++all:: $(NX_XCOMPEXTLIBTARGET) 
+ 
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5099b99..82977ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@
 031_nx-X11_parallel-make.full.patch
 051_nxcomp_macos105-fdisset.full+lite.patch
 052_nxcomp_macos10-nxauth-location.full+lite.patch
+053_nx-X11_no-xcomp1-install-target.full.patch
 101_nxagent_set-rgb-path.full.patch
 102_xserver-xext_set-securitypolicy-path.full.patch
 103_nxagent_set-X0-config-path.full.patch


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

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 "nx-libs.git" (NX (redistributed)).