[X2Go-Commits] [nx-libs] 08/19: debian/rules: Correctly link config files (etc/rgb, etc/nxagent.keyboard, etc/x2goagent.keyboard) before dh_auto_build.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 28 19:43:13 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 a7a4246f46bc8464314e51fdda347fba7acb64d0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jan 28 11:34:05 2015 +0100
debian/rules: Correctly link config files (etc/rgb, etc/nxagent.keyboard, etc/x2goagent.keyboard) before dh_auto_build.
---
debian/changelog | 2 ++
debian/rules | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ea97edd..be0d472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
+ Fix removal of unused code (that part of the code that we know of so
far). (The debian/rules file is a Makefile and Makefiles don't understand
shell globbing with curly braces).
+ + Correctly link config files (etc/rgb, etc/nxagent.keyboard,
+ etc/x2goagent.keyboard) before dh_auto_build.
* Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files.
* Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb
file shipped with x2goagent supersede rgb file shipped with nxagent.
diff --git a/debian/rules b/debian/rules
index db56f8a..a62bc68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -822,7 +822,9 @@ override_dh_auto_build:
ln -s debian/wrappers bin
mkdir -p etc/
ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg
- ln -s debian/rgb
+ ln -s ../debian/rgb etc/rgb
+ ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard
+ ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard
ln -sf debian/VERSION VERSION.x2goagent
ln -sf ../debian/VERSION nxcomp/VERSION
--
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