The branch, build-baikal has been updated 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../patches/004_nx-x11-fix-nxcompshad-build.patch | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 13 insertions(+) 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..b52f854 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,5 +6,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low * 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: 004_nx-x11-fix-nxcompshad-build.patch. -- Mike Gabriel <mike.gabriel@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 (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)).