[X2Go-Commits] [nx-libs] 07/29: Description: Fix build on Debian (004_nx-X11_fix-nxcompshad-build.full.patch) By an unknown reason this patch currently is needed to build nx-X11, nxcomp, nxcompshad and nxcompext with dpkg-buildpackage and debuild.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit dd20ab5e6222bb415245829af8915259da4eae3f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 9 11:56:14 2015 +0100

    Description: Fix build on Debian (004_nx-X11_fix-nxcompshad-build.full.patch)
     By an unknown reason this patch currently is needed to
     build nx-X11, nxcomp, nxcompshad and nxcompext with
     dpkg-buildpackage and debuild.
---
 .../004_nx-X11_fix-nxcompshad-build.full.patch     |   18 ------------------
 debian/patches/series                              |    1 -
 nx-X11/programs/Xserver/Imakefile                  |    2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch b/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch
deleted file mode 100644
index f65fb78..0000000
--- a/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix build on Debian
- By an unknown reason this patch currently is needed to
- build nx-X11, nxcomp, nxcompshad and nxcompext with 
- dpkg-buildpackage and debuild.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- 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 3dfca5e..fef5467 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-004_nx-X11_fix-nxcompshad-build.full.patch
 005_nxcomp_gcc43.full+lite.patch
 006_nxcomp_libpng15.full+lite.patch
 007_nxcompshad_clean-gch-files.full.patch
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 6bf7801..1d12173 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1047,7 +1047,7 @@ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
 #else
 $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
 	cd $(NX_XSHADOWLIBDIR) && \
-	make
+	rm -f *.o && make
 #endif
 
 ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git