[Pkg-cli-apps-commits] [SCM] sparkleshare branch, ubuntu, updated. debian/0.4.0-2ubuntu1

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 61ab4e775231f777f042950961b96e385ac3915b
Author: Iain Lane <laney at debian.org>
Date:   Mon Nov 28 14:52:04 2011 +0000

    Update & finalise changelog for merge
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index cd00368..4805368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sparkleshare (0.4.0-2ubuntu1) precise; urgency=low
+
+  * Merge with Debian experimental, remaining changes:
+    + Add gbp.conf for Ubuntu branch.  Ubuntu sources are stored as a branch
+    in Debian's git repository. Please try to use this if possible (contact
+    the Debian maintainers for merges).
+    + Add BD on libappindicator# to enable app indicator support
+
+ -- Iain Lane <laney at ubuntu.com>  Mon, 28 Nov 2011 14:51:11 +0000
+
 sparkleshare (0.4.0-2) experimental; urgency=low
 
   * [2ac5762] Depend on gnome-icon-theme.

-- 
sparkleshare