ZZMerge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --cc appimage/build_appimage.sh
index b52ee9a28920773683e21a3fe1eebe953f60f56f,a1675de11e03ee95c51b753b88aff27add487cac..8613f4a21cb80c0b78430cd7a0b40fda625f1f52
--- 1/appimage/build_appimage.sh
--- 2/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@@ -39,10 -39,9 +39,10 @@@ mkdir -p citadel.AppDir/usr/bi
  mkdir -p citadel.AppDir/usr/lib
  
  # Copy over all the libraries we used
- for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate
+ for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate `which gdb`
  do
 -      for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
 +      #for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
 +      for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' `
        do
                cp -v -L $x citadel.AppDir/usr/lib/
        done