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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 4e3385aca5b33f827adb5352f0e549d4058646ad
Author: Iain Lane <laney at debian.org>
Date:   Thu Jul 28 11:25:45 2011 +0100

    Update & finalise changelog

diff --git a/debian/changelog b/debian/changelog
index 7c80faf..b0b5747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sparkleshare (0.2.5-2ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian experimental, remaining changes:
+    + [3c55d25] 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).
+    + [a25c5e9] Add BD on libappindicator# to enable app indicator support
+
+ -- Iain Lane <laney at debian.org>  Thu, 28 Jul 2011 11:24:06 +0100
+
 sparkleshare (0.2.5-2) experimental; urgency=low
 
   * [c19513a] New patch to use SparkleHelpers method instead of 4.0 only

-- 
sparkleshare