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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 98b777e0eb88a63029cbbb2875946a603c2dab73
Merge: 4e3385aca5b33f827adb5352f0e549d4058646ad e528fe4c1b82ca23c3a3365880b01c6f4c01d678
Author: Iain Lane <laney at debian.org>
Date:   Mon Nov 28 14:50:54 2011 +0000

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index b0b5747,fa44961..cd00368
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,24 +1,34 @@@
+ sparkleshare (0.4.0-2) experimental; urgency=low
+ 
+   * [2ac5762] Depend on gnome-icon-theme.
+     SparkleShare unconditionally uses GNOME icons and crashes when they are
+     not available. (Closes: #650209)
+   * [21c88c5] Fix syntax errors in d/copyright, thanks Lintian
+   * [f19ee73] Remove BD on nautlius-python since it is currently broken in Debian.
+     When #649910 is fixed we can look at enabling it again.
+ 
+  -- Iain Lane <laney at debian.org>  Mon, 28 Nov 2011 14:43:14 +0000
+ 
+ sparkleshare (0.4.0-1) experimental; urgency=low
+ 
+   * [8a32190] Imported Upstream version 0.4.0
+   * [53a5447] Remove 
+     0002-Use-SparkleHelpers-method-instead-of-4.0-only-librar.patch
+   * [e9f220f] Don't run 'make check'
+   * [d6970b8] Add shebang to the nautilus3 extension
+ 
+  -- Carlos Martín Nieto <carlos at cmartin.tk>  Wed, 23 Nov 2011 22:23:41 +0000
+ 
 +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
@@@ -19,16 -30,6 +40,16 @@@
  
   -- 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
@@@ -43,13 -44,6 +64,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
@@@ -61,15 -55,6 +82,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 491d849,53c5717..190cbbd
--- a/debian/control
+++ b/debian/control
@@@ -5,13 -5,13 +5,14 @@@ Maintainer: Debian CLI Applications Tea
  Uploaders: Iain Lane <laney at debian.org>
  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.4.3),
-                      python-nautilus
+ #                     See #649910
+ #                     python-nautilus
  Standards-Version: 3.9.2
  Homepage: http://sparkleshare.org/
  Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/sparkleshare.git
@@@ -19,12 -19,13 +20,13 @@@ Vcs-Browser: http://git.debian.org/?p=p
  
  Package: sparkleshare
  Architecture: all
- Depends: git (>= 1.7.1),
+ Depends: gnome-icon-theme,
+          git (>= 1.7.1),
           gvfs (>= 1.3),
           ${cli:Depends},
           ${misc:Depends},
           ${shlibs:Depends}
- Recommends: python, python-nautilus
+ # Recommends: python, python-nautilus
  Description: distributed collaboration and sharing tool
   SparkleShare is a collaboration and sharing tool that is designed to keep
   things simple and to stay out of your way. It allows you to instantly sync

-- 
sparkleshare