Merge pull request #649 from git-for-windows/special-case-msys-assuan-0.dll

make-file-list: special-case `msys-assuan-0.dll`

Author: dscho

make-file-list.sh

@@ -193,6 +193,11 @@ if test i686 = "$ARCH" && ! grep msys-uuid-1 /usr/bin/msys-apr-1-0.dll 2>&1 >/de
 then
 	I686_EXCLUDE='uuid\|lzma\|'
 fi
+ASSUAN_0_EXCLUDE=
+if ! grep msys-assuan-0 /usr/bin/gpg.exe 2>&1 >/dev/null
+then
+	ASSUAN_0_EXCLUDE='\|assuan-0'
+fi
 
 pacman_list $packages "$@" |
 
@@ -244,7 +249,7 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
 	-e '^/usr/bin/msys-\('"$I686_EXCLUDE"'fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|xml2\|xslt\|exslt\)-.*\.dll$' \
 	-e '^/usr/bin/msys-\(hdb\|history8\|kadm5\|kdc\|otp\|sl\).*\.dll$' \
 	-e '^/usr/bin/msys-\(atomic\|blkid\|charset\|gthread\|metalink\|nghttp2\|ssh2\|kafs\)-.*\.dll$' \
-	-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \
+	-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*'"$ASSUAN_0_EXCLUDE"'\)\.dll$' \
 	-e '^/usr/bin/msys-\(formw6\|menuw6\|panelw6\)\.dll$' \
 	-e '^/usr/bin/msys-svn_swig_\(py\|ruby\)-.*\.dll$' \
 	-e '^/usr/bin/\(dumper\|sasl.*\|sshd\)\.exe$' \