Adapt source to build from launchpad
Add saucy2