aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorX2Go Release Manager <git-admin@x2go.org>2015-03-13 16:13:36 +0100
committerX2Go Release Manager <git-admin@x2go.org>2015-03-13 16:14:14 +0100
commit12a395aac60fe44ffadf80033de5854cc69e61fd (patch)
tree555cf982c943b72f951832ac32a53d14746ab461 /debian
parent8367380eb479e8cd6e917e814028703f95b2d2bf (diff)
downloadnx-libs-12a395aac60fe44ffadf80033de5854cc69e61fd.tar.gz
nx-libs-12a395aac60fe44ffadf80033de5854cc69e61fd.tar.bz2
nx-libs-12a395aac60fe44ffadf80033de5854cc69e61fd.zip
debian/roll-tarballs.sh: fix tarball creation in lite mode: do not try to fixup NX-X11 directory (it won't be there.)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/roll-tarballs.sh63
2 files changed, 40 insertions, 31 deletions
diff --git a/debian/changelog b/debian/changelog
index 90cb484a0..86abea192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nx-libs (2:3.5.0.30-0x2go1) UNRELEASED; urgency=low
+
+ * debian/roll-tarball.sh:
+ + Only clean up nx-X11 source tree if it is there (i.e., skip that
+ for the nx-libs-lite tarball generation).
+
+ -- X2Go Release Manager <git-admin@x2go.org> Fri, 13 Mar 2015 16:07:42 +0100
+
nx-libs (2:3.5.0.29-0x2go2) unstable; urgency=medium
[ Mike Gabriel ]
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index b8db6c618..4014c6127 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -140,37 +140,38 @@ test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-
test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh
-
-#### stuff we do not needed
-UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED`
-CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL`
-UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES`
-PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED`
-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
- path_dirname=$(dirname "$path")
- else
- path_dirname="$path"
- fi
- mkdir -vp ".preserve/$path_dirname"
- cp -av "$path" ".preserve/$path"
-done
-
-for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do
- rm -R "$path"
-done
-
-# re-create the to-be-preserved files
-cp -a .preserve/* ./
-rm -Rf .preserve/
+if [ "x$MODE" = "xfull" ]; then
+ #### stuff we do not needed
+ UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED`
+ CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL`
+ UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES`
+ PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED`
+ 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
+ path_dirname=$(dirname "$path")
+ else
+ path_dirname="$path"
+ fi
+ mkdir -vp ".preserve/$path_dirname"
+ cp -av "$path" ".preserve/$path"
+ done
+
+ for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do
+ rm -R "$path"
+ done
+
+ # re-create the to-be-preserved files
+ cp -a .preserve/* ./
+ rm -Rf .preserve/
+fi
# remove files, that we do not want in the tarballs (build cruft)
rm -Rf nx*/configure nx*/autom4te.cache*