[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu, updated. ubuntu/2.27.1.1-1ubuntu1-6-g3cb7a90

Laurent Bigonville bigon at bigon.be
Sun May 31 17:01:56 UTC 2009


The following commit has been merged in the ubuntu branch:
commit 3cb7a903740cbc1c652e1a064c949703e8e1dc62
Merge: c4c0def3f0866c94d508da9fd0965db888828422 291bb51063341d8a4715733f0bc55cdb43a1d900
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun May 31 19:01:36 2009 +0200

    Merge commit 'debian/2.27.2-1' into ubuntu
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 9d15cc3,e717a10..a94e5a4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
+ empathy (2.27.2-1) experimental; urgency=low
+ 
+   * New upstream release
+     - Bump libraries soname and adjust .symbols files
+ 
+  -- Laurent Bigonville <bigon at debian.org>  Sun, 31 May 2009 16:52:39 +0200
+ 
 +empathy (2.27.1.1-1ubuntu1) karmic; urgency=low
 +
 +  * Merge from debian experimental, remaining changes:
 +    - Add Suggests on telepathy-idle
 +  * Bump telepathy-butterfly and telepathy-haze to recommends
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 20 May 2009 09:52:57 +0200
 +
  empathy (2.27.1.1-1) experimental; urgency=low
  
    * New upstream release
@@@ -30,14 -29,6 +37,14 @@@ empathy (2.26.2-1) unstable; urgency=lo
  
   -- Laurent Bigonville <bigon at debian.org>  Mon, 18 May 2009 21:43:25 +0200
  
 +empathy (2.26.1-1ubuntu1) jaunty; urgency=low
 +
 +  * Merge from debian unstable, remaining changes:
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Tue, 14 Apr 2009 12:03:23 +0200
 +
  empathy (2.26.1-1) unstable; urgency=low
  
    * New upstream release
@@@ -45,20 -36,6 +52,20 @@@
  
   -- Laurent Bigonville <bigon at debian.org>  Tue, 14 Apr 2009 11:44:14 +0200
  
 +empathy (2.26.0.1-0ubuntu1) jaunty; urgency=low
 +
 +  * New upstream release (LP: #351884)
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 01 Apr 2009 20:22:40 +0200
 +
 +empathy (2.26.0-1ubuntu1) jaunty; urgency=low
 +
 +  * Merge from debian unstable, remaining changes:
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 18 Mar 2009 13:43:01 +0100
 +
  empathy (2.26.0-1) unstable; urgency=low
  
    * New Upstream Version
@@@ -71,15 -48,6 +78,15 @@@
  
   -- Laurent Bigonville <bigon at debian.org>  Wed, 18 Mar 2009 13:18:54 +0100
  
 +empathy (2.25.92-1ubuntu1) jaunty; urgency=low
 +
 +  * Merge from debian unstable, remaining changes:
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +  * Fix FTBFS with python >= 2.6
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 11 Mar 2009 01:28:38 +0100
 +
  empathy (2.25.92-1) unstable; urgency=low
  
    * New Upstream Version
@@@ -120,16 -88,6 +127,16 @@@ empathy (2.25.91-1) experimental; urgen
  
   -- Jonny Lamb <jonny at debian.org>  Fri, 27 Feb 2009 15:20:03 +0000
  
 +empathy (2.25.4-1ubuntu1) jaunty; urgency=low
 +
 +  * Merge from debian experimental, remaining changes:
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +  * Drop debian/patches/01fixtabbehavour.diff: Upstream is not happy
 +    with this patch.
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Sun, 18 Jan 2009 14:31:56 +0100
 +
  empathy (2.25.4-1) experimental; urgency=low
  
    [ Simon McVittie ]
@@@ -162,16 -120,6 +169,16 @@@ empathy (2.25.3-1) experimental; urgenc
  
   -- Laurent Bigonville <bigon at debian.org>  Sat, 20 Dec 2008 21:45:15 +0100
  
 +empathy (2.25.2-2ubuntu1) jaunty; urgency=low
 +
 +  * Merge from debian experimental, remaining changes:
 +    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
 +      dialogs
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Thu, 04 Dec 2008 15:31:52 +0100
 +
  empathy (2.25.2-2) experimental; urgency=low
  
    * debian/patches/64bit-build-fix.patch:
@@@ -179,16 -127,6 +186,16 @@@
  
   -- Sjoerd Simons <sjoerd at debian.org>  Thu, 04 Dec 2008 00:46:53 +0000
  
 +empathy (2.25.2-1ubuntu1) jaunty; urgency=low
 +
 +  * Merge from debian experimental, remaining changes:
 +    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
 +      dialogs
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Mon, 01 Dec 2008 22:20:36 +0100
 +
  empathy (2.25.2-1) experimental; urgency=low
  
    * New upstream release.
@@@ -197,47 -135,18 +204,47 @@@
  
   -- Laurent Bigonville <bigon at debian.org>  Mon, 01 Dec 2008 21:35:56 +0100
  
 +empathy (2.24.1-1ubuntu1) intrepid; urgency=low
 +
 +  * Merge from debian experimental, remaining changes:
 +    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
 +      dialogs
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Mon, 20 Oct 2008 21:48:50 +0200
 +
  empathy (2.24.1-1) experimental; urgency=low
  
    * New upstream release.
  
   -- Laurent Bigonville <bigon at debian.org>  Mon, 20 Oct 2008 21:12:27 +0200
  
 +empathy (2.24.0-1ubuntu1) intrepid; urgency=low
 +
 +  * Merge from debian experimental, remaining changes:
 +    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
 +      dialogs
 +    - Add Recommends on telepathy-butterfly and telepathy-haze
 +    - Add Suggests on telepathy-idle
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Mon, 22 Sep 2008 23:32:45 +0200
 +
  empathy (2.24.0-1) experimental; urgency=low
  
    * New upstream release.
  
   -- Laurent Bigonville <bigon at debian.org>  Mon, 22 Sep 2008 21:37:47 +0200
  
 +empathy (2.23.92-1ubuntu1) intrepid; urgency=low
 +
 +  * Merge from debian unstable, remaining changes:
 +    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
 +      dialogs
 +  * Re-add lost recommends and suggests on tp-butterfly, tp-haze and tp-idle
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 10 Sep 2008 00:09:14 +0200
 +
  empathy (2.23.92-1) experimental; urgency=low
  
    * New upstream release
@@@ -246,14 -155,6 +253,14 @@@
  
   -- Laurent Bigonville <bigon at debian.org>  Tue, 09 Sep 2008 19:03:12 +0200
  
 +empathy (2.23.91-0ubuntu1) intrepid; urgency=low
 +
 +  * New upstream release
 +    - Adjust libempathy-gtk15.symbols
 +  * Put the telepathy team as maintainer of the package
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Tue, 02 Sep 2008 19:48:54 +0200
 +
  empathy (2.23.90-2) experimental; urgency=low
  
    * debian/libempathy14.symbols: Fix version of an exported symbol
@@@ -272,72 -173,6 +279,72 @@@ empathy (2.23.90-1) experimental; urgen
  
   -- Dafydd Harries <daf at debian.org>  Sun, 24 Aug 2008 22:03:36 +0100
  
 +empathy (2.23.90-0ubuntu1) intrepid; urgency=low
 +
 +  * New upstream release, adjust symbols files
 +  * Revert to cdbs instead of debhelper 7
 +  * Move Scott James Remnant <scott at ubuntu.com> patch to debian/patches
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 20 Aug 2008 19:00:04 +0200
 +
 +empathy (2.23.6-0ubuntu8) intrepid; urgency=low
 +
 +  * Finally got something like the effect I was after.
 +
 + -- Scott James Remnant <scott at ubuntu.com>  Mon, 18 Aug 2008 12:01:35 +0100
 +
 +empathy (2.23.6-0ubuntu7) intrepid; urgency=low
 +
 +  * Err, it wasn't a homogenous tabs problem, it was simply a packing
 +    problem.
 +
 + -- Scott James Remnant <scott at ubuntu.com>  Mon, 18 Aug 2008 11:42:55 +0100
 +
 +empathy (2.23.6-0ubuntu6) intrepid; urgency=low
 +
 +  * Don't use homogeneous tabs in the chat window.
 +
 + -- Scott James Remnant <scott at ubuntu.com>  Mon, 18 Aug 2008 10:32:43 +0100
 +
 +empathy (2.23.6-0ubuntu5) intrepid; urgency=low
 +
 +  * Install gnome help and omf files in empathy package (LP: #257189)
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Thu, 14 Aug 2008 18:53:35 +0200
 +
 +empathy (2.23.6-0ubuntu4) intrepid; urgency=low
 +
 +  * Demotte telepathy-idle to Suggests
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Mon, 11 Aug 2008 23:37:22 +0200
 +
 +empathy (2.23.6-0ubuntu3) intrepid; urgency=low
 +
 +  * Add telepathy-idle as recommends for the empathy package (LP: #256783)
 +
 + -- David Futcher <bobbo at ubuntu.com>  Mon, 11 Aug 2008 16:34:16 +0100
 +
 +empathy (2.23.6-0ubuntu2) intrepid; urgency=low
 +
 +  * Add telepathy-butterfly and telepathy-haze as recommends for the empathy
 +    package
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Fri, 08 Aug 2008 17:02:45 +0200
 +
 +empathy (2.23.6-0ubuntu1) intrepid; urgency=low
 +
 +  * New upstream release
 +  * Drop debian/patches/00_mark_unknown_presence_id_as_unset.patch: applied
 +    upstream
 +  * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep
 +  * Bump debhelper compat to 7
 +  * Use new dh mechanism instead of cdbs
 +  * Bump build-deps and remove libtelepathy-dev (not needed anymore)
 +  * Remove --enable-voip flags (voip enabled by default), rename
 +    --enable-aspell to --enable-spell
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Fri, 08 Aug 2008 16:15:17 +0200
 +
  empathy (0.23.4-1) experimental; urgency=low
  
    [ Laurent Bigonville ]
@@@ -368,22 -203,6 +375,22 @@@ empathy (0.23.3-2) unstable; urgency=lo
  
   -- Sjoerd Simons <sjoerd at debian.org>  Sat, 02 Aug 2008 19:56:46 +0100
  
 +empathy (0.23.3-1ubuntu2) intrepid; urgency=low
 +
 +  * Also pass --disable-scrollkeeper to configure.
 +    (fixes FTBFS, LP: #247720, #253295)
 +
 + -- Michael Bienia <geser at ubuntu.com>  Wed, 30 Jul 2008 16:36:27 +0200
 +
 +empathy (0.23.3-1ubuntu1) intrepid; urgency=low
 +
 +  * libempathy-gtk/empathy-ui-utils.c, src/empathy-status-icon.c:
 +    - Add format "%s" to function calls. Fixes FTBFS caused by default compiler
 +      flags (error: format not a string literal and no format arguments)
 +  * Modify Maintainer value to match the DebianMaintainerField specification.
 +
 + -- Albin Tonnerre <lutin at ubuntu.com>  Thu, 19 Jun 2008 12:33:47 +0200
 +
  empathy (0.23.3-1) unstable; urgency=low
  
    [ Sjoerd Simons ]
@@@ -563,19 -382,6 +570,19 @@@ empathy (0.21.2-1) unstable; urgency=lo
  
   -- Sjoerd Simons <sjoerd at debian.org>  Fri, 16 Nov 2007 11:03:08 +0100
  
 +empathy (0.14-1ubuntu1) hardy; urgency=low
 +
 +  * Merge from debian unstable, remaining changes: (LP: #89431)
 +    - Depends: telepathy-gabble | telepathy-connection-manager,
 +    - Suggests: telepathy-core.
 +    - Change Conflicts and Replaces accordingly
 +    - Change bzr url to the Ubuntu branch
 +  * Drop debian/patches/no-date-crash.patch and
 +    debian/patches/search-contact-list.patch: applied upstream
 +  * debian/patches/add-haze-profiles.patch: use debian one
 +
 + -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 24 Oct 2007 12:23:47 +0200
 +
  empathy (0.14-1) unstable; urgency=low
  
    [ Loic Minier ]
@@@ -608,28 -414,6 +615,28 @@@ empathy (0.13-1) unstable; urgency=lo
  
   -- Sjoerd Simons <sjoerd at debian.org>  Sat, 29 Sep 2007 18:41:39 +0200
  
 +empathy (0.12-2ubuntu2) gutsy; urgency=low
 +
 +  * debian/control: Fix typo => telepathy-core (LP: #146415)
 +
 + -- Laurent Bigonville <bigon at bigon.be>  Fri, 28 Sep 2007 20:28:26 +0200
 +
 +empathy (0.12-2ubuntu1) gutsy; urgency=low
 +
 +  * Merge from debian unstable, remaining Ubuntu changes: (LP: #138027)
 +    - Add profiles for haze support
 +    - Depends: telepathy-gabble | telepathy-connection-manager,
 +    - Suggests: telepaty-core.
 +  * Add debian/patches/no-date-crash.patch: Fix crash if there is no date in
 +    conversation (Taken from upstream)
 +  * Add debian/patches/search-contact-list.patch: Fix search function in
 +    contact list (Taken from upstream)
 +  * Fix typo in libempathy-dev description
 +  * Change Conflicts and Replaces accordingly
 +  * Change bzr url to the Ubuntu branch
 +
 + -- Laurent Bigonville <bigon at bigon.be>  Mon, 10 Sep 2007 17:12:54 +0200
 +
  empathy (0.12-2) unstable; urgency=low
  
    * debian/control: Let the -common packages conflict and replace the old
@@@ -670,71 -454,12 +677,71 @@@ empathy (0.12-1) unstable; urgency=lo
  
   -- Sjoerd Simons <sjoerd at debian.org>  Sat, 25 Aug 2007 18:41:08 +0200
  
 +empathy (0.12-0ubuntu2) gutsy; urgency=low
 +
 +  * debian/control:
 +    - Depends: telepathy-gabble | telepathy-connection-manager (LP: #137689),
 +    - Suggests: telepaty-core.
 +
 + -- Daniel Holbach <daniel.holbach at ubuntu.com>  Thu, 06 Sep 2007 09:18:01 +0200
 +
 +empathy (0.12-0ubuntu1) gutsy; urgency=low
 +
 +  * Fake sync with not yet published version
 +
 + -- Laurent Bigonville <bigon at bigon.be>  Sat, 25 Aug 2007 01:02:43 +0200
 +
 +empathy (0.10-0ubuntu2) gutsy; urgency=low
 +
 +  * Add profiles for haze support
 +
 + -- Matthew Garrett <mjg59 at srcf.ucam.org>  Tue, 21 Aug 2007 19:19:41 +0100
 +
 +empathy (0.10-0ubuntu1) gutsy; urgency=low
 +
 +  * New upstream release
 +
 + -- Baptiste Mille-Mathias <baptiste.millemathias at gmail.com>  Mon, 30 Jul 2007 18:49:02 +0200
 +
 +empathy (0.8-1ubuntu1) gutsy; urgency=low
 +
 +  * Merge from Debian unstable. Remaining Ubuntu changes:
 +    - debian/control: add libaspell-dev, iso-codes to Build-Depends
 +    - debian/rules: --enable-aspell
 +    - Update Maintainer field to match Debian-Maintainer-Spec
 +
 + -- Vincent Legout <bixente44 at gmail.com>  Tue,  3 Jul 2007 11:56:56 +0200
 +
  empathy (0.8-1) unstable; urgency=low
  
    * New upstream release
  
   -- Sjoerd Simons <sjoerd at debian.org>  Sat, 23 Jun 2007 14:45:31 +0100
  
 +empathy (0.8-0ubuntu1) gutsy; urgency=low
 +
 +  * New upstream release:
 +    - Fixed contact list handling.
 +    - Make use of NetworkManager to set presence to OFFILE when we are
 +      disconnected and restore presence once we are reconnected.
 +    - UI for searching in conversation history and to view all conversations
 +      with a given contact.
 +    - Do not use 2 different processes (empathy and empathy-chat), merge them
 +      into one client. This is easier for debugging and share data.
 +    - Do not create log directory for a chat if there is no messages to put
 +      in.
 +    - Do not set active contacts when creating the store, and when contact
 +      groups changed.
 +    - Fix warning when using command-line options.
 +    - Ignore ssl errors by default. This is needed to connect jabber accounts
 +      using ssl.
 +    - Adding spellcheck support using aspell.
 +    - Lots of bugs fixed.
 +  * debian/control: add libaspell-dev, iso-codes to Build-Depends.
 +  * debian/rules: --enable-aspell.
 +
 + -- Daniel Holbach <daniel.holbach at ubuntu.com>  Thu, 21 Jun 2007 22:43:45 +0200
 +
  empathy (0.7-1) unstable; urgency=low
  
    * New upstream release
diff --combined debian/control
index 8a2edbc,950fc1a..e21c8ed
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
  Source: empathy
  Section: gnome
  Priority: optional
 -Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
  Uploaders: Sjoerd Simons <sjoerd at debian.org>,
             Dafydd Harries <daf at debian.org>,
             Simon McVittie <smcv at debian.org>,
@@@ -44,10 -43,9 +44,10 @@@ Depends: ${shlibs:Depends}
           dbus-x11
  Recommends: telepathy-gabble,
              telepathy-salut,
 +            telepathy-butterfly,
 +            telepathy-haze,
              gvfs-backends
 -Suggests: telepathy-haze,
 -          telepathy-butterfly
 +Suggests: telepathy-idle
  Description: High-level library and user-interface for Telepathy
   Empathy consists of a rich set of reusable instant messaging widgets, and a
   GNOME client using those widgets. It uses Telepathy and Nokia's Mission
@@@ -76,7 -74,7 +76,7 @@@ Description: High-level library and use
   This packet contains common files for libempathy
  
  
- Package: libempathy24
+ Package: libempathy25
  Architecture: any
  Section: libs
  Depends: ${shlibs:Depends},
@@@ -119,7 -117,7 +119,7 @@@ Depends: ${shlibs:Depends}
           libglib2.0-dev,
           libxml2-dev,
           libtelepathy-dev,
-          libempathy24 (= ${binary:Version})
+          libempathy25 (= ${binary:Version})
  Description: High-level library and user-interface for Telepathy (library dev files)
   Empathy consists of a rich set of reusable instant messaging widgets, and a
   GNOME client using those widgets. It uses Telepathy and Nokia's Mission
@@@ -163,7 -161,7 +163,7 @@@ Description: High-level library and use
   .
   This package contains common files for libempathy-gtk
  
- Package: libempathy-gtk22
+ Package: libempathy-gtk23
  Architecture: any
  Section: libs
  Depends: ${shlibs:Depends},
@@@ -185,7 -183,7 +185,7 @@@ Section: libdeve
  Depends: ${shlibs:Depends},
           ${misc:Depends},
           libempathy-dev,
-          libempathy-gtk22 (= ${binary:Version}),
+          libempathy-gtk23 (= ${binary:Version}),
           libgtk2.0-dev (>= 2.16.0)
  Description: High-level library and user-interface for Telepathy (GTK dev files)
   Empathy consists of a rich set of reusable instant messaging widgets, and a

-- 
Empathy packaging



More information about the Pkg-telepathy-commits mailing list