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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 5311ee91cd561d3ab6b4ffd88ed48dfadd1ff40b
Author: Iain Lane <laney at debian.org>
Date:   Mon Jun 11 14:27:55 2012 +0100

    Update & finalise changelog
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index fabcd6d..8cadaca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sparkleshare (0.8.4-1ubuntu1) quantal; urgency=low
+
+  * Merge with Debian unstable, 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 debian.org>  Mon, 11 Jun 2012 14:26:57 +0100
+
 sparkleshare (0.8.4-1) unstable; urgency=low
 
   [ Jo Shields ]

-- 
sparkleshare