Imported Upstream version 14.07
update source so it works with git-buildpackage