Ubuntu
ubuntuone-client-gnome package

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

  1. Oneiric (11.10)
  2. fix-ftbfs
  3. Merge into oneiric
Proposed by dobey
Status: Merged
Merged at revision: 6
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/fix-ftbfs
Merge into: lp:ubuntu/oneiric/ubuntuone-client-gnome
Diff against target: 32 lines (+7/-3)
2 files modified
debian/changelog (+7/-1)
debian/install (+0/-2)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/fix-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+77842@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-27 18:36:40 +0000
3+++ debian/changelog 2011-10-02 23:11:24 +0000
4@@ -1,3 +1,9 @@
5+ubuntuone-client-gnome (2.0.0-0ubuntu2) oneiric; urgency=low
6+
7+ * debian/install: Remove the override file, fixes FTBFS.
8+
9+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Sun, 02 Oct 2011 18:57:07 -0400
10+
11 ubuntuone-client-gnome (2.0.0-0ubuntu1) oneiric; urgency=low
12
13 * New upstream release.
14@@ -11,7 +17,7 @@
15 * debian/ubuntuone.gschema.override:
16 - Removed as is no longer necessary to support gsettings
17
18- -- Rodney Dawes <dobey@lunatari> Tue, 27 Sep 2011 14:30:53 -0400
19+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 27 Sep 2011 14:30:53 -0400
20
21 ubuntuone-client-gnome (1.7.1-0ubuntu3) oneiric; urgency=low
22
23
24=== modified file 'debian/install'
25--- debian/install 2011-08-12 20:45:44 +0000
26+++ debian/install 2011-10-02 23:11:24 +0000
27@@ -1,5 +1,3 @@
28 debian/*/usr/lib/gnome-settings-daemon-*/*
29 debian/*/usr/lib/nautilus/extensions-*/libnautilus-ubuntuone.*
30
31-debian/ubuntuone.gschema.override usr/share/glib-2.0/schemas/
32-

Subscribers

People subscribed via source and target branches

to all changes: