Here is the final debdiff. I changed ftplugin/debchangelog.vim to use already "production" (even if it really works with the next LP rollout on 2010-01-27) and replace my temporarily hack with a proper fix. vim (2:7.2.330-1ubuntu1) lucid; urgency=low [Michael Bienia] * Merge with Debian unstable (lp: #509900). Remaining changes: - debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim. - runtime/syntax/debcontrol.vim: + Add "metapackages" to the list of valid sections. - runtime/syntax/grub.vim: + Add Ubuntu-specific 'quiet' keyword. - Drop vim-lesstif package and lesstif2-dev build-dependency. - Enable Python interpreter on basic builds. - Rename Vcs-* to XS-Debian-Vcs-*. * Apply patch from Ted Gould to highlight Breaks in debian/control (lp: #498303). * runtime/ftplugin/debchangelog.vim: Use python-launchpadlib (and LP API) instead of python-launchpad-bugs for bug completion for Ubuntu (forwarded to Debian as bug #566841). * src/configure.in, src/auto/configure: As MODLIBS from python's config/Makefile includes LOCALMODLIBS which shouldn't be used and breaks the build with newer python versions, use BASEMODLIBS instead of MODLIBS (forwarded to Debian as bug #566842). [Colin Watson] * Add Launchpad integration to the Help menu if launchpad-integration is installed (lp: #453103). -- Michael Bienia