Fixes after more tests

pkg/ubuntu/README.md

@@ -6,7 +6,7 @@ work as a first step towards packaging, but should be usable as is.
 ### Synopsis
 
 Bootstrap the distribution from git:
-    sudo apt-get install git
+    sudo apt-get install git-core
     git clone git://github.com/diaspora/diaspora.git
     cd diaspora/pkg/ubuntu
 
@@ -27,9 +27,6 @@ Initiate and start the server;
     ./script/server
 
 ### Upgrading
-Once diaspora ins installed ,makedist.sh et. al. are available in
-/usr/share/diaspora/master/pkg/ubuntu, so there's no need to checkout
-the stuff using git in this case.
 
 The normal procedure to update is to just
     $ sudo su - diaspora

pkg/ubuntu/diaspora-install-deps

@@ -13,8 +13,9 @@ grep -v '^#' /etc/apt/sources.list | grep -q universe || {
 }
 
 sudo apt-get update
-sudo apt-get install -qy build-essential libxslt1-dev libxml2 ruby-full mongodb \
-     rake python-software-properties git imagemagick libmagick9-dev
+sudo apt-get install -qy --ignore-missing build-essential libxslt1-dev \
+     libxml2 ruby-full mongodb rake python-software-properties git-core \
+     imagemagick libmagick9-dev
 sudo add-apt-repository ppa:maco.m/ruby
 sudo apt-get update
 sudo apt-get install -qy rubygems