[X2go-Commits] nx-libs.git - master (branch) updated: e603345464ad97bcbd214a4baf2b3129c500f8aa

[X2go dev team]

The branch, master has been updated
       via  e603345464ad97bcbd214a4baf2b3129c500f8aa (commit)
       via  1234d1b898a0d8862595ad4cc58bcfbd0fbead1b (commit)
      from  85be77cb3987999186be52686043c3f666d168dc (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 e603345464ad97bcbd214a4baf2b3129c500f8aa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 19 17:40:48 2011 +0100

    changelog maintenance

commit 1234d1b898a0d8862595ad4cc58bcfbd0fbead1b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 19 17:40:33 2011 +0100

    Add patch: 004_nx-x11-fix-nxcompshad-build.patch.

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

Summary of changes:
 debian/changelog                                   |    5 +++--
 .../patches/004_nx-x11-fix-nxcompshad-build.patch  |   11 +++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/004_nx-x11-fix-nxcompshad-build.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cd45040..460ba6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
   * Use NX adapted LD_LIBRARY_PATH in debian/rules.
   * Add quilt as build dependency.
   * Add main Makefile via patch: 001_add-main-makefile.patch.
-  * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
-  * Add patch: 003_nxcompshad-gcc43.patch
+  * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch.
+  * Add patch: 003_nxcompshad-gcc43.patch.
+  * Add patch: 004_nx-x11-fix-nxcompshad-build.patch.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/004_nx-x11-fix-nxcompshad-build.patch b/debian/patches/004_nx-x11-fix-nxcompshad-build.patch
new file mode 100644
index 0000000..386dfef
--- /dev/null
+++ b/debian/patches/004_nx-x11-fix-nxcompshad-build.patch
@@ -0,0 +1,11 @@
+--- a/nx-X11/programs/Xserver/Imakefile
++++ b/nx-X11/programs/Xserver/Imakefile
+@@ -1047,7 +1047,7 @@
+ #else
+ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
+ 	cd $(NX_XSHADOWLIBDIR) && \
+-	make
++	rm -f *.o && make
+ #endif
+ 
+ ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
diff --git a/debian/patches/series b/debian/patches/series
index 615573a..38a6041 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 001_add-main-makefile.patch
 002_nxcompshad-build-against-nx-x11-only.patch
 003_nxcompshad-gcc43.patch
+004_nx-x11-fix-nxcompshad-build.patch


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

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 libraries).