aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2016-06-30 11:08:14 +0200
committerMihai Moldovan <ionic@ionic.de>2016-06-30 11:08:14 +0200
commitb8d8fdaad3dbfe8d59ae6d2bdb81eb6e1f829f6f (patch)
tree2f488a07630815cdb593556f58df2d0df42577dc
parentf3c5f881bfc5408ccda7725ae229943806a82022 (diff)
downloadnx-libs-b8d8fdaad3dbfe8d59ae6d2bdb81eb6e1f829f6f.tar.gz
nx-libs-b8d8fdaad3dbfe8d59ae6d2bdb81eb6e1f829f6f.tar.bz2
nx-libs-b8d8fdaad3dbfe8d59ae6d2bdb81eb6e1f829f6f.zip
nx-libs.spec: copy new debian/x2goagent.options file into build environment, analogous to what debian/roll-tarballs.sh does.
-rw-r--r--debian/changelog2
-rw-r--r--nx-libs.spec1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d031f06fd..90e414f15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
* nx-libs.spec:
- Add xkeyboard-config to nxagent's Requires. Should be a weak dependency,
but RPM doesn't support that too well yet.
+ - Copy new debian/x2goagent.options file into build environment, analogous
+ to what debian/roll-tarballs.sh does.
* debian/:
- Add x2goagent.options file for compatibility with x2goserver nightly.
* debian/roll-tarballs.sh:
diff --git a/nx-libs.spec b/nx-libs.spec
index 0fda99332..4dee24c1e 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -675,6 +675,7 @@ cp -v debian/Makefile.replace.sh replace.sh
cp -v debian/rgb etc/rgb
cp -v debian/nxagent.keyboard etc/nxagent.keyboard
cp -v debian/x2goagent.keyboard etc/x2goagent.keyboard
+cp -v debian/x2goagent.options etc/x2goagent.options
cp -v debian/VERSION VERSION.x2goagent
cp -v debian/VERSION nxcomp/VERSION