diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-28 11:34:05 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-28 11:38:57 +0100 |
| commit | a7a4246f46bc8464314e51fdda347fba7acb64d0 (patch) | |
| tree | 7e9eb8ce4c07904dadf84bceb008cabf2947a9e5 | |
| parent | 0956f0c7df13ffd5028843bdf4960709e049e168 (diff) | |
| download | nx-libs-a7a4246f46bc8464314e51fdda347fba7acb64d0.tar.gz nx-libs-a7a4246f46bc8464314e51fdda347fba7acb64d0.tar.bz2 nx-libs-a7a4246f46bc8464314e51fdda347fba7acb64d0.zip | |
debian/rules: Correctly link config files (etc/rgb, etc/nxagent.keyboard, etc/x2goagent.keyboard) before dh_auto_build.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
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 |