quilt pop -a; use correct version of gnulib-tool and lib/uniname/gen-uninames.lisp