Comment 2 for bug 1310173

Reviewing the files from your upgrade attempt you seem to have enabled the xorg-edgers-ppa. This will prevent the upgrade as that PPA contains different versions of packages essential to Ubuntu. The page, https://launchpad.net/~xorg-edgers/+archive/ppa, contains details on to how to revert to the official Xorg packages.