[X2Go-Commits] [nx-libs] 04/08: debian/rules: symlink and remove new debian/x2goagent.options file into/from build environment.

git-admin at x2go.org git-admin at x2go.org
Thu Jun 30 11:30:42 CEST 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 112f0f8169427142da0ad7eeb5f55f81b7e1964f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jun 30 10:27:31 2016 +0200

    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 316d704..ceba303 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 2cd77b3..10a0798 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

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list