[X2Go-Commits] [nx-libs] 01/01: Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx

[git-admin at x2go.org]

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

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

commit 7b0c8a2acdb866f23c0569b4ba549e9e8c94428e
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Feb 14 17:07:21 2015 -0500

    Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx
---
 debian/Makefile.nx-libs |    2 --
 debian/changelog        |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 3aeda73..52326fb 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -62,8 +62,6 @@ install-lite:
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 	for d in nxcomp nxproxy; do \
 	   $(MAKE) -C $$d install; done
-	mkdir -p $(DESTDIR)$(NXLIBDIR)/bin/
-	mv $(DESTDIR)$(BINDIR)/nxproxy $(DESTDIR)$(NXLIBDIR)/bin/
 	for f in nxproxy; do \
 	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
 
diff --git a/debian/changelog b/debian/changelog
index a85cdec..39105b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -187,6 +187,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
     - Security fixes with no assigned CVE:
         1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch
 
+    - Fix FTBFS due to the nxproxy executable already existing under
+      /usr/lib/nx/bin/nx/
 
   [ Mihai Moldovan ]
   * Change string "X2go" to "X2Go" where appropriate.

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