[X2Go-Commits] [nx-libs] 02/19: Base Debian packaging 100% on Makefile install.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 28 19:43:10 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit 7357f8c0e011e9549e5a7351c0e23a45cba511e7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jan 28 11:13:45 2015 +0100
Base Debian packaging 100% on Makefile install.
---
debian/Makefile.nx-libs | 14 +++++++++++---
debian/nx-x11-common.install | 2 +-
debian/nxagent.install | 7 ++++---
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 97b2b6e..06d5f80 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -76,9 +76,7 @@ install-full:
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
-
- $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go
- $(INSTALL_FILE) rgb $(DESTDIR)$(PREFIX)/share/x2go
+ $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx
$(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx
@@ -133,6 +131,16 @@ install-full:
$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)
$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/
$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_X2GO)/
+ $(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR_X2GO)/
+ $(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR_NX)/
+ $(INSTALL_FILE) etc/nxagent.keyboard $(DESTDIR)$(ETCDIR_NX)/
+ $(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR_X2GO)/
+
+ $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go
+ $(INSTALL_SYMLINK) $(DESTDIR)$(ETCDIR_X2GO)/rgb $(DESTDIR)$(PREFIX)/share/x2go/rgb
+
+ $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx
+ $(INSTALL_SYMLINK) $(DESTDIR)$(ETCDIR_NX)/rgb $(DESTDIR)$(PREFIX)/share/nx/rgb
uninstall:
$(MAKE) uninstall-lite
diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install
index 7474911..1131e72 100644
--- a/debian/nx-x11-common.install
+++ b/debian/nx-x11-common.install
@@ -1,2 +1,2 @@
-usr/share/nx/
+usr/share/nx/SecurityPolicy
usr/lib/nx/X11/
diff --git a/debian/nxagent.install b/debian/nxagent.install
index 90266c5..4556ee7 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,6 +1,7 @@
etc/nxagent/keystrokes.cfg
+etc/nxagent/rgb
+usr/share/nx/rgb
usr/lib/nx/bin/nxagent
usr/bin/nxagent
-debian/rgb usr/share/nx
-debian/nxagent.keyboard etc/nxagent
-nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps
+usr/share/pixmaps/nxagent.xpm
+etc/nxagent/nxagent.keyboard
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list