aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 11:31:41 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 12:58:56 +0100
commit100276175195da4d507e4498b8d0901c7a19d2ba (patch)
treefac689f590b0fe0e53a98885f8c275fc380c812d
parenta7a4246f46bc8464314e51fdda347fba7acb64d0 (diff)
downloadnx-libs-100276175195da4d507e4498b8d0901c7a19d2ba.tar.gz
nx-libs-100276175195da4d507e4498b8d0901c7a19d2ba.tar.bz2
nx-libs-100276175195da4d507e4498b8d0901c7a19d2ba.zip
debian/roll-tarball.sh: Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, x2goagent.keyboard).
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/roll-tarballs.sh7
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index be0d47204..cdbec3ff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
* Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow
separate .keyboard files for x2goagent and nxagent.
+ * debian/roll-tarball.sh:
+ + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard,
+ x2goagent.keyboard).
+
[ Horst Schirmeier ]
* Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that
prevented the /etc/nxagent/keystrokes.cfg file from being parsed. (Fixes:
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 92cc7f04d..ae550f8b1 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -87,7 +87,10 @@ if [ "x$MODE" = "xfull" ]; then
cp -v $file doc/applied-patches
echo ${file##*/} >> doc/applied-patches/series
done
- cp -v debian/rgb ./
+ mkdir -p ./etc/
+ cp -v debian/rgb ./etc/
+ cp -v debian/nxagent.keyboard ./etc/
+ cp -v debian/x2goagent.keyboard ./etc/
cp -v debian/VERSION ./VERSION.x2goagent
else
rm -Rf "nxcompshad"*
@@ -101,6 +104,8 @@ else
fi
cp -v debian/VERSION ./nxcomp/VERSION
cp -v debian/COPYING.full+lite COPYING
+cp -v debian/nxagent.keyboard nxagent.keyboard
+cp -v debian/x2goagent.keyboard x2goagent.keyboard
# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball
if [ -s "doc/applied-patches/series" ]; then