[Pkg-cli-apps-commits] [SCM] sparkleshare branch, ubuntu, updated. debian/0.9.0-2ubuntu1
Iain Lane
laney at debian.org
Tue Jul 24 12:57:21 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 208199dcdf473828162888f7a1c7db50406ad641
Merge: 93c18f81644a99cb19b156a87d4aa29cbe26274e 33b229272463fb9e9145e5795af1262012ebecb4
Author: Iain Lane <laney at debian.org>
Date: Tue Jul 24 13:41:13 2012 +0100
Merge tag 'debian/0.9.0-2' into ubuntu
Debian release 0.9.0-2
diff --combined debian/changelog
index f739849,af4a6b3..77fd86c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,19 +1,29 @@@
+ sparkleshare (0.9.0-2) unstable; urgency=low
+
+ [ Chow Loong Jin ]
+ * [bcdc7ef] Fix watch file
+
+ [ Iain Lane ]
+ * [40dd1a8] Add missing epoch to git versioned dependency
+
+ [ Carlos Martín Nieto ]
+ * [1cf4989] debian/patches: add
+ 0001-linux-statusicon-Fix-statusicon-animation.-Closes-84.patch. Fill the
+ status icon array correctly so the in-progress animation gets shown
+ instead of blinking.
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Mon, 23 Jul 2012 21:43:27 +0100
+
+sparkleshare (0.9.0-1ubuntu1) quantal; urgency=low
+
+ * Merge with Debian unstable, 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 debian.org> Fri, 06 Jul 2012 18:34:30 +0100
+
sparkleshare (0.9.0-1) unstable; urgency=low
* [50bd5da] Imported Upstream version 0.9.0
@@@ -17,16 -23,6 +33,16 @@@
-- Carlos Martín Nieto <carlos at cmartin.tk> Sat, 30 Jun 2012 04:31:27 +0800
+sparkleshare (0.8.4-1ubuntu1) quantal; urgency=low
+
+ * Merge with Debian unstable, 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 debian.org> Mon, 11 Jun 2012 14:26:57 +0100
+
sparkleshare (0.8.4-1) unstable; urgency=low
[ Jo Shields ]
@@@ -45,16 -41,6 +61,16 @@@
-- Carlos Martín Nieto <carlos at cmartin.tk> Mon, 11 Jun 2012 14:13:52 +0100
+sparkleshare (0.8.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 debian.org> Fri, 24 Feb 2012 11:20:26 +0000
+
sparkleshare (0.8.2-1) unstable; urgency=low
* [272b12a] Imported Upstream version 0.8.2
@@@ -75,16 -61,6 +91,16 @@@ sparkleshare (0.6.0-2) unstable; urgenc
-- Chow Loong Jin <hyperair at debian.org> Thu, 19 Jan 2012 04:19:03 +0800
+sparkleshare (0.6.0-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> Sat, 14 Jan 2012 09:20:47 +0000
+
sparkleshare (0.6.0-1) unstable; urgency=low
[ Carlos Martín Nieto ]
@@@ -100,16 -76,6 +116,16 @@@
-- 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
@@@ -120,16 -86,6 +136,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.
@@@ -151,16 -107,6 +167,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
@@@ -172,16 -118,6 +188,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
@@@ -196,13 -132,6 +212,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
@@@ -214,15 -143,6 +230,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 e1997a3,51f73c9..1f3020e
--- a/debian/control
+++ b/debian/control
@@@ -5,7 -5,6 +5,7 @@@ Maintainer: Debian CLI Applications Tea
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,
@@@ -20,7 -19,7 +20,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
Package: sparkleshare
Architecture: all
Depends: gnome-icon-theme,
- git (>= 1.7.1),
+ git (>= 1:1.7.1),
gvfs (>= 1.3),
libjs-jquery,
${cli:Depends},
--
sparkleshare
More information about the Pkg-cli-apps-commits
mailing list