[X2Go-Dev] [X2Go-Commits] [nx-libs] 01/01: Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx
Mike Gabriel
mike.gabriel at das-netzwerkteam.de
Mon Feb 16 05:33:37 CET 2015
HI Michael,
On Sa 14 Feb 2015 23:07:49 CET, git-admin wrote:
> 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
>
For the record:
o this fixes builds for all jobs on jenkins.x2go.org
o it fixes the .deb packages
o it breaks the .rpm packages (the ELF executable is missing
in /usr/lib/nx/bin/nxproxy, whereas /usr/bin/nxproxy is
only the wrapper script).
/me is taking a deeper look at the different behaviours of
debian/rules and nx-libs.spec at build time.
Mike
--
DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digitale PGP-Signatur
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20150216/125bd8f3/attachment.pgp>
More information about the x2go-dev
mailing list