mv debian/emacsen-compat  debian/bbdb3.emacsen-compat
Merge branch 'debian-v3.x' into debian-uuid