[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:58 UTC 2012


The following commit has been merged in the ubuntu branch:
commit ee9cec56e055988952c59da1e3b69228c039de83
Merge: 786dfeff140f8e3b7e9264503a6c10d835bb66c3 fde087a197c72797c7e1d2aea9e39304808d2c87
Author: Iain Lane <laney at debian.org>
Date:   Mon Jun 11 14:26:38 2012 +0100

    Merge tag 'debian/0.8.4-1' into ubuntu
    
    Debian release 0.8.4-1

diff --combined debian/changelog
index fe488f2,068708f..fabcd6d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,21 +1,31 @@@
+ sparkleshare (0.8.4-1) unstable; urgency=low
+ 
+   [ Jo Shields ]
+   * [9a423ce] Imported Upstream version 0.8.4
+ 
+   [ Carlos Martín Nieto ]
+   * [bd3c9bd] There's no autogen anymore, use ./configure as usual.
+     It looks like we do have tarball releases again.
+   * [264b24c] Add
+     0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
+   * [7ff3ad5] Remove README.md and add TRADEMARK to the installed docs
+   * [2661826] Add patch
+     0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch
+   * [f9780f2] Use the packaged jquery
+   * [4dbf480] Bump Standards-Version to 3.9.3
+ 
+  -- 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
@@@ -28,16 -36,6 +46,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 ]
@@@ -53,16 -51,6 +71,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
@@@ -73,16 -61,6 +91,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.
@@@ -104,16 -82,6 +122,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
@@@ -125,16 -93,6 +143,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
@@@ -149,13 -107,6 +167,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
@@@ -167,15 -118,6 +185,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 db13393,1aa9536..e1997a3
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,15 +3,16 @@@ 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~), dh-autoreconf
+ 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
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
  Homepage: http://sparkleshare.org/
  Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/sparkleshare.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/sparkleshare.git
@@@ -22,6 -21,7 +22,7 @@@ Architecture: al
  Depends: gnome-icon-theme,
           git (>= 1.7.1),
           gvfs (>= 1.3),
+          libjs-jquery,
           ${cli:Depends},
           ${misc:Depends},
           ${shlibs:Depends}

-- 
sparkleshare



More information about the Pkg-cli-apps-commits mailing list