Merge lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/fix-ftbfs into lp:ubuntu/oneiric/ubuntuone-client-gnome

[dobey]

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-27 18:36:40 +0000
+++ debian/changelog	2011-10-02 23:11:24 +0000
@@ -1,3 +1,9 @@
+ubuntuone-client-gnome (2.0.0-0ubuntu2) oneiric; urgency=low
+
+  * debian/install: Remove the override file, fixes FTBFS.
+
+ -- Rodney Dawes <[e-mail]>  Sun, 02 Oct 2011 18:57:07 -0400
+
 ubuntuone-client-gnome (2.0.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
@@ -11,7 +17,7 @@
   * debian/ubuntuone.gschema.override:
     - Removed as is no longer necessary to support gsettings
 
- -- Rodney Dawes <dobey@lunatari>  Tue, 27 Sep 2011 14:30:53 -0400
+ -- Rodney Dawes <[e-mail]>  Tue, 27 Sep 2011 14:30:53 -0400
 
 ubuntuone-client-gnome (1.7.1-0ubuntu3) oneiric; urgency=low
 
 
=== modified file 'debian/install'
--- debian/install	2011-08-12 20:45:44 +0000
+++ debian/install	2011-10-02 23:11:24 +0000
@@ -1,5 +1,3 @@
 debian/*/usr/lib/gnome-settings-daemon-*/*
 debian/*/usr/lib/nautilus/extensions-*/libnautilus-ubuntuone.*
 
-debian/ubuntuone.gschema.override usr/share/glib-2.0/schemas/
-