[X2Go-Commits] [nx-libs] 04/08: Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in NX code tree.

[git-admin at x2go.org]

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

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

commit c70f524507f800cf3b032f84dd0b31146e84b9f9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 2 15:25:43 2015 +0100

    Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in NX code tree.
---
 debian/patches/031_nx-X11_parallel-make.full.patch |   28 --------------------
 1 file changed, 28 deletions(-)

diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch
index e87918a..4960205 100644
--- a/debian/patches/031_nx-X11_parallel-make.full.patch
+++ b/debian/patches/031_nx-X11_parallel-make.full.patch
@@ -198,31 +198,3 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
  
  ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
 
---- a/nx-X11/lib/X11/Imakefile.NX.original
-+++ b/nx-X11/lib/X11/Imakefile.NX.original
-@@ -1159,21 +1159,17 @@
- 
- #ifdef SunArchitecture
- $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
--	cd $(NX_XCOMPLIBDIR) && \
--	gmake
-+	${MAKE} -C $(NX_XCOMPLIBDIR)
- 
- $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
--	cd ../../../nxcompext && \
--	gmake
-+	${MAKE} -C ../../../nxcompext
- 
- #else
- $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
--	cd $(NX_XCOMPLIBDIR) && \
--	make
-+	${MAKE} -C $(NX_XCOMPLIBDIR)
- 
- $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
--	cd ../../../nxcompext && \
--	make
-+	${MAKE} -C ../../../nxcompext
- 
- #endif
- 

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