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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit bd09d71b52cb5e3632e6e823846281fa97d0e8f0
Merge: bfeaa5a608d570d232f4dc8d65852e2c1fd62cce 0c115a87bfd09526f906afce4a0ca109d0be978c
Author: Iain Lane <laney at debian.org>
Date:   Tue Jul 26 13:53:32 2011 +0100

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 8d44c7c,d11de95..d0a67a4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,24 @@@
+ sparkleshare (0.2.5-1) experimental; urgency=low
+ 
+   * [f320fef] Imported Upstream version 0.2.5
+     + Reimplement notes to be less buggy and backend independent. Polish
+       about dialog and event log html. Fix a bug where large collections of
+       files weren't being synced when adding them at the same time. The
+       event log now collapses huge change sets and squashes events together
+       by day when they are on the same day and in the same folder.
+   * [8f862d6] Require mono 2.10 and cli-common-dev 0.8.
+     New upstream release uses some CLR 4.0 APIs and so we need to bump the
+     BDs
+ 
+  -- Iain Lane <laney at debian.org>  Tue, 26 Jul 2011 09:32:28 +0100
+ 
 +sparkleshare (0.2.4-1ubuntu1) oneiric; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Add BD on libappindicator# to enable app indicator support
 +
 + -- Iain Lane <laney at debian.org>  Sat, 16 Jul 2011 19:11:17 +0100
 +
  sparkleshare (0.2.4-1) experimental; urgency=low
  
    * [7aa8901] Imported Upstream version 0.2.4
@@@ -16,15 -23,6 +30,15 @@@
  
   -- Iain Lane <laney at debian.org>  Sat, 16 Jul 2011 18:57:00 +0100
  
 +sparkleshare (0.2.2-1ubuntu1) oneiric; urgency=low
 +
 +  * [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, 23 Jun 2011 21:06:17 +0100
 +
  sparkleshare (0.2.2-1) experimental; urgency=low
  
    * Initial upload to Debian, adapted from packages by Andrea Colangelo
diff --combined debian/control
index ab4a2f3,7a56cce..b476b40
--- a/debian/control
+++ b/debian/control
@@@ -3,14 -3,13 +3,14 @@@ Section: util
  Priority: optional
  Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
  Uploaders: Iain Lane <laney at debian.org>
- Build-Depends: cli-common-dev (>= 0.5.7~), debhelper (>= 7.0.50~)
+ Build-Depends: cli-common-dev (>= 0.8~), debhelper (>= 7.0.50~)
  Build-Depends-Indep: intltool,
 +                     libappindicator0.1-cil-dev (>= 0.0.7),
                       libglib2.0-cil-dev (>= 2.12.2),
                       libgtk2.0-cil-dev (>= 2.12.2),
                       libnotify-cil-dev,
                       libwebkit-cil-dev,
-                      mono-devel,
+                      mono-devel (>= 2.10.1),
                       python-nautilus
  Standards-Version: 3.9.2
  Homepage: http://sparkleshare.org/

-- 
sparkleshare