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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 667b088800875fad7a5b97a910310cf8cbf48a04
Merge: d73ef995ecd79c08b7d691f28f55d7a1e5e59f99 fcc845e73baec8301e619f822d2a0656fe493649
Author: Iain Lane <laney at debian.org>
Date:   Sat Jan 14 09:20:28 2012 +0000

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 2177a93,f0c99d1..2011853
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,18 +1,28 @@@
+ sparkleshare (0.6.0-1) unstable; urgency=low
+ 
+   [ Carlos Martín Nieto ]
+   * [e7facf8] Imported Upstream version 0.6.0
+   * [3605835] Don't install README, it's no longer in the tarball
+   * [c33134b] Do run distcheck, it works now
+ 
+   [ Motiejus Jakštys ]
+   * [db5b74e] Add gawk to build-depends
+ 
+   [ Chow Loong Jin ]
+   * [62b82a9] Replace Iain Lane with Carlos Martin Nieto in Uploaders
+ 
+  -- Carlos Martín Nieto <carlos at cmartin.tk>  Sat, 14 Jan 2012 06:02:24 +0800
+ 
 +sparkleshare (0.4.2-1ubuntu1) 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>  Fri, 02 Dec 2011 17:14:04 +0000
 +
  sparkleshare (0.4.2-1) experimental; urgency=low
  
    * [f4116ff] Imported Upstream version 0.4.0
@@@ -18,16 -23,6 +33,16 @@@
  
   -- 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.
@@@ -49,16 -44,6 +64,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
@@@ -70,16 -55,6 +85,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
@@@ -94,13 -69,6 +109,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
@@@ -112,15 -80,6 +127,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 190cbbd,4f559cf..950d794
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,9 +2,10 @@@ Source: sparkleshar
  Section: utils
  Priority: optional
  Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
- Uploaders: Iain Lane <laney at debian.org>
+ Uploaders: Carlos Martín Nieto <carlos at cmartin.tk>
  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,

-- 
sparkleshare