From 112f0f8169427142da0ad7eeb5f55f81b7e1964f Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 30 Jun 2016 10:27:31 +0200 Subject: debian/rules: symlink and remove new debian/x2goagent.options file into/from build environment. --- debian/changelog | 3 +++ debian/rules | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 316d7049a..ceba30335 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low - Copy new debian/x2goagent.options file into real tarball environment. * debian/Makefile.nx-libs: - Install/destroot new x2goagent.options file. + * debian/rules: + - Symlink and remove new debian/x2goagent.options file into/from build + environment. [ Mike Gabriel ] * debian/libxinerama1.postinst.in: diff --git a/debian/rules b/debian/rules index 2cd77b383..10a079872 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ override_dh_clean: rm -f nx-X11/programs/nxauth/changelog if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard + rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard etc/x2goagent.options rm -f debian/nxagent.postinst rm -fR .preserve/ if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi @@ -114,6 +114,7 @@ override_dh_auto_build: ln -s ../debian/rgb etc/rgb ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard + ln -s ../debian/x2goagent.options etc/x2goagent.options mkdir -p doc/ ln -s ../debian/changelog doc/changelog ln -sf debian/VERSION VERSION.x2goagent -- cgit v1.2.3