[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 adc7421f5e9d98028bc3b3d3b912009df1666841
Merge: 61ab4e775231f777f042950961b96e385ac3915b 8f111d80cd75938760afa435192dd4a036ade752
Author: Iain Lane <laney at debian.org>
Date:   Fri Dec 2 17:13:54 2011 +0000

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 4805368,9635f87..c2e4261
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,23 @@@
+ sparkleshare (0.4.2-1) experimental; urgency=low
+ 
+   * [f4116ff] Imported Upstream version 0.4.0
+   * [2e25c2c] Imported Upstream version 0.4.1
+   * [080f6f3] Remove 0001-Add-missing-shebang-to-nautilus-extension.patch.
+     Merged upstream
+   * [0ffa880] Imported Upstream version 0.4.2
+ 
+  -- Carlos Martín Nieto <carlos at cmartin.tk>  Fri, 02 Dec 2011 16:57:23 +0000
+ 
 +sparkleshare (0.4.0-2ubuntu1) 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>  Mon, 28 Nov 2011 14:51:11 +0000
 +
  sparkleshare (0.4.0-2) experimental; urgency=low
  
    * [2ac5762] Depend on gnome-icon-theme.
@@@ -29,16 -29,6 +39,16 @@@ sparkleshare (0.4.0-1) experimental; ur
  
   -- 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
@@@ -50,16 -40,6 +60,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
@@@ -74,13 -54,6 +84,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
@@@ -92,15 -65,6 +102,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

-- 
sparkleshare