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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit d73ef995ecd79c08b7d691f28f55d7a1e5e59f99
Author: Iain Lane <laney at debian.org>
Date:   Fri Dec 2 17:14:32 2011 +0000

    Update & finalise changelog
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index c2e4261..2177a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sparkleshare (0.4.2-1ubuntu1) 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>  Fri, 02 Dec 2011 17:14:04 +0000
+
 sparkleshare (0.4.2-1) experimental; urgency=low
 
   * [f4116ff] Imported Upstream version 0.4.0

-- 
sparkleshare