Upgrading to VLC 2.0 on Ubuntu 11.04 with checkinstall

There doesn't seem to be an official Debian package yet (at least I couldn't find a natty ppa), so I installed from source with checkinstall.
Checkinstall (instead of make install) creates a local .deb package, which can be uninstalled via dpkg -s vlc when the official repositories catch up.
The configure script kept popping up with missing packages, so I posted a list here. It's probably not complete (depending on what I had installed already) and might include a few unnecessary dev packages. Anyway, missing packages can usually be resolved by  aptitude search <keyword>.
Checkinstall failed at first being unable to create /usr/local/include/vlc and not finding vlc-cache-gen  (source). Afterwards, vlc crashed at startup missing some libraries, which had ended up in /usr/local/lib instead of /usr/lib, so I had to create a few symbolic links (source).

Install log:
Sudo edit /etc/checkinstallrc with your favourite text editor. Set TRANSLATE=0.
Command line log:
$ wget http://download.videolan.org/pub/videolan/vlc/2.0.0/vlc-2.0.0.tar.xz 
$ unxz vlc-2.0.0.tar.xz
$ tar -xvf vlc-2.0.0.tar 
$ cd vlc-2.0.0/ 
$ sudo apt-get install libavcodec-dev libpostproc-dev libmpeg2-4-dev libdbus-1-dev lua5.1 libmad0-dev libavformat-dev libswscale-dev libxcb-composite0 libxcb-composite0-dev libxcb-xv0-dev libgcrypt-dev 
$ sudo mkdir /usr/local/include/vlc #this might not be necessary 
$ ./configure #install whatever checkinstall complains about and repeat
$ make
$ sudo checkinstall 
$ sudo ln -s /usr/local/lib/libvlc* /usr/lib/ 
$ sudo ln -s /usr/local/lib/libx264.a /usr/lib/ 
$ sudo ln -s /usr/local/lib/vlc /usr/lib/vlc