[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu, updated. ubuntu/2.25.92-1ubuntu1-11-gd2c69fc
Laurent Bigonville
bigon at bigon.be
Wed Mar 18 12:45:10 UTC 2009
The following commit has been merged in the ubuntu branch:
commit d03286f9ce2fe4b4873255ce89b8fef81c7ba5fb
Merge: 6e7e4f9aa9193cad1c6b618bbc6c36cc1abcf18e c8eb84ffa15676133e867e4f804162de423f2981
Author: Laurent Bigonville <bigon at bigon.be>
Date: Wed Mar 18 13:26:06 2009 +0100
Merge branch 'debian' into ubuntu
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 17a80e5,09e786b..857dbb7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,24 @@@
+ empathy (2.26.0-1) unstable; urgency=low
+
+ * New Upstream Version
+ - Bump libtelepathy-glib-dev build-dependency
+ - Bump libempathy soname and adjust .symbols file
+ * debian/control:
+ - Bump Standards-Version to 3.8.1 (no further changes)
+ - Remove telepathy-stream-engine recommends and conflicts
+ * python-empathy.install: Fix FTBFS with python >= 2.6
+
+ -- 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 experimental, 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
@@@ -47,16 -50,6 +59,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 ]
@@@ -89,16 -82,6 +101,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:
@@@ -106,16 -89,6 +118,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.
@@@ -124,47 -97,18 +136,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
@@@ -173,14 -117,6 +185,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
@@@ -199,72 -135,6 +211,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 ]
@@@ -295,22 -165,6 +307,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 ]
@@@ -490,19 -344,6 +502,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 ]
@@@ -535,28 -376,6 +547,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
@@@ -597,71 -416,12 +609,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 1c99836,285601f..a30db46
--- 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>,
@@@ -18,7 -17,7 +18,7 @@@ Build-Depends: cdbs
libglade2-dev (>= 2.0.0),
libpanel-applet2-dev (>= 2.10.0),
libgconf2-dev (>= 1.2.0),
- libtelepathy-glib-dev (>= 0.7.21),
+ libtelepathy-glib-dev (>= 0.7.23),
libmissioncontrol-client-dev (>= 4.61),
intltool,
libenchant-dev (>= 1.2.0),
@@@ -33,7 -32,7 +33,7 @@@
libtelepathy-farsight-dev (>= 0.0.4),
libgstreamer0.10-dev,
libgstreamer-plugins-base0.10-dev
- Standards-Version: 3.8.0
+ Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
@@@ -44,12 -43,7 +44,10 @@@ Depends: ${shlibs:Depends}
dbus-x11
Recommends: telepathy-gabble,
telepathy-salut,
+ telepathy-butterfly,
+ telepathy-haze,
- telepathy-stream-engine,
gvfs-backends
+Suggests: telepathy-idle
- Conflicts: telepathy-stream-engine (<< 0.5.2)
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
@@@ -78,7 -72,7 +76,7 @@@ Description: High-level library and use
This packet contains common files for libempathy
- Package: libempathy22
+ Package: libempathy23
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@@ -121,7 -115,7 +119,7 @@@ Depends: ${shlibs:Depends}
libglib2.0-dev,
libxml2-dev,
libtelepathy-dev,
- libempathy22 (= ${binary:Version})
+ libempathy23 (= ${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
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list