diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2007-05-12 16:41:35 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2007-05-12 16:41:35 +0000 |
| commit | 3f56c57d75ba7704426aadf576e8ac0788a478f9 (patch) | |
| tree | 5acc400d57bba23c956facd9bf83a7755484a403 /net-misc | |
| parent | Initial commit (diff) | |
| download | gentoo-2-3f56c57d75ba7704426aadf576e8ac0788a478f9.tar.gz gentoo-2-3f56c57d75ba7704426aadf576e8ac0788a478f9.tar.bz2 gentoo-2-3f56c57d75ba7704426aadf576e8ac0788a478f9.zip | |
Fixed a file collision (bug #178124)
(Portage version: 2.1.2.7)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/nxserver-2xterminalserver/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/net-misc/nxserver-2xterminalserver/ChangeLog b/net-misc/nxserver-2xterminalserver/ChangeLog index 62668f9bae60..20dc67b132b0 100644 --- a/net-misc/nxserver-2xterminalserver/ChangeLog +++ b/net-misc/nxserver-2xterminalserver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/nxserver-2xterminalserver # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-2xterminalserver/ChangeLog,v 1.4 2007/05/12 14:59:20 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-2xterminalserver/ChangeLog,v 1.5 2007/05/12 16:41:35 voyageur Exp $ + + 12 May 2007; Bernard Cafarelli <voyageur@gentoo.org> + nxserver-2xterminalserver-1.5.0.ebuild: + Fixed file collision with nxclient-2xterminalserver + Closes bug #178124 12 May 2007; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml: Fixed maintainer in metadata.xml diff --git a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild index d523fdbdf952..45ea746c02ed 100644 --- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild +++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild,v 1.3 2007/04/30 13:38:27 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild,v 1.4 2007/05/12 16:41:35 voyageur Exp $ inherit flag-o-matic eutils @@ -171,7 +171,13 @@ src_install() { done cp ${NODE_SRC}/node-gentoo.cfg.sample ${D}/usr/NX/etc/ || die - cp -R ${S}/server/nxnode/share ${D}/usr/NX || die + # share/keys/server.id_dsa.key is installed with the client + dodir /usr/NX/share/keys + for x in config fonts keymaps; do + cp -R ${S}/server/nxnode/share/${x} ${D}/usr/NX/share/ || die + done + cp ${S}/server/nxnode/share/keys/default.id_dsa.key \ + ${D}/usr/NX/share/keys/ ||die cp -R ${S}/server/nxnode/home ${D}/usr/NX || die keepdir /usr/NX/var/log keepdir /usr/NX/var/run |