[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 6350d44ceb6fb822db4b5eb5f30b2ef94507846d
Merge: 96f3269847a69118f16307552ecf35efd3419ef0 836b8e88ce83a42a97402315f9775dc90990015b
Author: Iain Lane <laney at debian.org>
Date:   Thu Jul 28 11:23:35 2011 +0100

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 181af92,326c1fe..7c80faf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,14 +1,24 @@@
+ sparkleshare (0.2.5-2) experimental; urgency=low
+ 
+   * [c19513a] New patch to use SparkleHelpers method instead of 4.0 only
+     library one. This restores compatibility with older Mono versions.
+   * [173ef62] Rename patch to
+     0001-Add-missing-shebang-to-nautilus-extension.patch.
+   * [47aa816] Relax mono and cli-common versioned BDs now that we don't need
+     them any more
+ 
+  -- Iain Lane <laney at debian.org>  Thu, 28 Jul 2011 11:02:32 +0100
+ 
 +sparkleshare (0.2.5-1ubuntu1) 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>  Tue, 26 Jul 2011 13:54:11 +0100
 +
  sparkleshare (0.2.5-1) experimental; urgency=low
  
    * [f320fef] Imported Upstream version 0.2.5
@@@ -22,13 -23,6 +33,13 @@@
  
   -- 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
@@@ -40,15 -34,6 +51,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 b476b40,bff021d..491d849
--- 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.8~), debhelper (>= 7.0.50~)
+ Build-Depends: cli-common-dev (>= 0.5.7~), 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 (>= 2.10.1),
+                      mono-devel (>= 2.4.3),
                       python-nautilus
  Standards-Version: 3.9.2
  Homepage: http://sparkleshare.org/

-- 
sparkleshare