aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules4
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ea97eddf8..be0d47204 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 db56f8aa2..a62bc6803 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