[Pkg-cli-apps-commits] [SCM] sparkleshare branch, ubuntu, updated. debian/0.8.4-1ubuntu1
Iain Lane
laney at debian.org
Tue Jun 26 21:52:57 UTC 2012
The following commit has been merged in the ubuntu branch:
commit dc156cbb8bc8237e35da5c010500a866583d3251
Merge: 683a8451d03641d8d40e9ed915045c7a567f51a0 24513d914e0c0c5982aeaebce16ab99d777cfb72
Author: Iain Lane <laney at debian.org>
Date: Fri Feb 24 11:19:55 2012 +0000
Merge branch 'master' into ubuntu
diff --combined debian/changelog
index e11a2d8,1fa815a..12c25fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,23 +1,33 @@@
+ sparkleshare (0.8.2-1) unstable; urgency=low
+
+ * [272b12a] Imported Upstream version 0.8.2
+ + No longer messes with SSH config (Closes: #656107)
+ * [96a15af] Re-add README.md to debian/docs. It's in the tarball again.
+ * [770c73b] Use dh-autoreconf to call ./autogen.sh.
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Thu, 23 Feb 2012 22:47:40 +0000
+
+ sparkleshare (0.6.0-2) unstable; urgency=low
+
+ * Team upload.
+ * Rebuild for CLR 4.0 transition
+ * [52a530b] Re-add python-nautilus build-dependency.
+ This reverts commit f19ee730334cfa69de74f5373c960d8317f1b9a9.
+ (Closes: #645858)
+ * [873e9f1] Drop deprecated cli.make
+
+ -- 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 ]
@@@ -23,16 -33,6 +43,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
@@@ -43,16 -43,6 +63,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.
@@@ -74,16 -64,6 +94,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
@@@ -95,16 -75,6 +115,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
@@@ -119,13 -89,6 +139,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
@@@ -137,15 -100,6 +157,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 950d794,3ac1136..db13393
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,14 +3,15 @@@ Section: util
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.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: cli-common-dev (>= 0.5.7~), debhelper (>= 7.0.50~), dh-autoreconf
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),
- # See #649910
- # python-nautilus
+ python-nautilus
Standards-Version: 3.9.2
Homepage: http://sparkleshare.org/
Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/sparkleshare.git
@@@ -26,7 -24,7 +25,7 @@@ Depends: gnome-icon-theme
${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
More information about the Pkg-cli-apps-commits
mailing list