aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/roll-tarballs.sh11
2 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 69c7f0308..e2fbcc4bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -179,6 +179,9 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
* Security fixes:
- X.Org CVE-2015-3418:
1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch
+ * debian/roll-tarball.sh:
+ + Make sure *.keyboard, debian/**, nx-libs.spec, .pc/** don't end up
+ in tarball (special focuse on the nx-libs-lite tarball).
[ Nito Martinez ]
* nxcomp: fix DEBUG, TEST, DUMP, FLUSH, TOKEN, PING, MIXED et al builds.
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index d091b9071..e5dd8e6b3 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -104,8 +104,6 @@ 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
@@ -149,10 +147,6 @@ if [ "x$MODE" = "xfull" ]; then
PRESERVE_INCLUDED_FILES="$(cat "debian/CODE-REDUCTION_PRESERVE-INCLUDED")"
PRESERVE_NEEDED_FILES="$(cat "debian/CODE-REDUCTION_PRESERVE-NEEDED")"
- # remove folders that we do not want to roll into the tarball
- rm -Rf ".pc/"
- rm -Rf "debian/"
-
mkdir -p ".preserve/"
for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do
if [ ! -d "$path" ]; then
@@ -173,6 +167,11 @@ if [ "x$MODE" = "xfull" ]; then
rm -Rf ".preserve/"
fi
+# remove files/folders that we do not want to roll into the tarball
+rm -Rf ".pc/"
+rm -Rf "debian/"
+rm -f "nx-libs.spec"
+
# remove files, that we do not want in the tarballs (build cruft)
rm -Rf nx*/configure nx*/autom4te.cache*