aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-02-14 17:07:21 -0500
committerMike DePaulo <mikedep333@gmail.com>2015-02-14 17:07:21 -0500
commit7b0c8a2acdb866f23c0569b4ba549e9e8c94428e (patch)
treec95e7b4fa036af105df53a2dc9cb12d22a64e256
parent4587881130db36125c6b800e8f7e3fa0a3c5c9fb (diff)
downloadnx-libs-7b0c8a2acdb866f23c0569b4ba549e9e8c94428e.tar.gz
nx-libs-7b0c8a2acdb866f23c0569b4ba549e9e8c94428e.tar.bz2
nx-libs-7b0c8a2acdb866f23c0569b4ba549e9e8c94428e.zip
Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx
-rw-r--r--debian/Makefile.nx-libs2
-rw-r--r--debian/changelog2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 3aeda739b..52326fb22 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 a85cdec64..39105b082 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.