[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu, updated. debian/2.27.91.1-2-44-g99c1a0c
Laurent Bigonville
bigon at bigon.be
Fri Aug 28 18:06:09 UTC 2009
The following commit has been merged in the ubuntu branch:
commit 8a85d300e33e70c2d22389a33b6822c8033aaf9b
Merge: f295387dee26fcdb7e57564d624bfe6837d3f2cc 7b360713478522ba97cc5cd392485540f2b7b81c
Author: Laurent Bigonville <bigon at bigon.be>
Date: Fri Aug 28 20:03:30 2009 +0200
Merge branch 'debian' into ubuntu
Conflicts:
debian/changelog
debian/control
debian/libempathy-gtk24.install
debian/libempathy-gtk25.install
debian/libempathy-gtk25.symbols
debian/libempathy-gtk27.install
debian/libempathy26.install
debian/libempathy27.install
debian/libempathy27.symbols
debian/libempathy29.install
debian/rules
diff --combined debian/changelog
index aed98f0,22e5a7d..75b7b7d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,122 -1,46 +1,165 @@@
+ empathy (2.27.91.1-2) experimental; urgency=low
+
+ * debian/control:
+ + Remove libtelepathy-dev dependency from libempathy-dev
+ + Remove libmissioncontrol-dev dependency from libempathy-dev
+ * debian/patches/0001-Remove-libmissioncontrol-deps.patch:
+ * Remove missioncontrol deps from the pc files, patch from upstream git
+
+ -- Sjoerd Simons <sjoerd at debian.org> Thu, 27 Aug 2009 10:20:15 +0100
+
+ empathy (2.27.91.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Upped dependencies as appropriate for the new release.
+ + Upped Standards-Version. (no changes)
+ + Upped sonames as appropriate.
+ + s/Gadu Gadu/Gadu-Gadu/g
+ + Change dep on libempathy29 to telepathy-mission-control-5.
+ * debian/rules:
+ + Use --with-connectivity instead of --enable-network-manager.
+ * Disable building with map as new enough clutter-gtk and champlain
+ packages aren't in the archive yet.
+ * debian/libempathy-common.install: Don't install profiles anymore.
+ * debian/empathy.install: Don't try to install omf files.
+ * debian/*.symbols: Updated.
+ * debian/{empathy,libempathy-common}.install: Update to include some new
+ files.
+
+ -- Jonny Lamb <jonny at debian.org> Wed, 26 Aug 2009 10:36:05 +0100
+
+ empathy (2.27.5-1) experimental; urgency=low
+
+ * New Upstream Version
+ - Bump libraries soname and adjust .symbols files
+ * debian/control:
+ - Add geoclue-yahoo recommends for libempathy-gtk
+ - Use more meaningful desctiptions (LP: #259788)
+ * debian/update-patches.mk: Update script to work with recent git version
+ * Enable network manager support
+
+ -- Laurent Bigonville <bigon at debian.org> Tue, 04 Aug 2009 11:20:18 +0200
+
+empathy (2.27.5-0ubuntu1) karmic; urgency=low
+
+ * New upstream version:
+ Bugs fixed:
+ - Fixed #459161, Remove should be insensitive for salut contact
+ - Fixed #494007, Empathy should conform to the XDG directory specification
+ - Fixed #545282, [accessibility] the names of items in friends list are not correct
+ - Fixed #547327, Wrongly sized dialog
+ - Fixed #579724, Enable building with shave
+ - Fixed #579940, Show a notification when a buddy goes to offline or online
+ - Fixed #584120, "Video call" button shouldn't be sensitive in Contact menu if contact supports only audio
+ - Fixed #584122, "Send Video" should be disable if contact doesn't support video
+ - Fixed #586967, Remeber chat window size and configuration
+ - Fixed #588498, Mark muc tabs in which you are highlighted differently
+ - Fixed #588662, Add gconf option to enable usage of the WebKit inspector, for adium themes.
+ - Fixed #588810, respect the button-images setting
+ - Fixed #588886, crash when selecting an image and clicking "open link" in adium
+ - Fixed #589091, Feature Share My Desktop for Empathy
+ - Fixed #589830, Online status combo box items are not correctly spoken with the Orca screen reader.
+ - Fixed #589846, wrap text in contact label status
+ * debian/patches/01_autoconf_forgot_by_upstream.patch:
+ - the change is in the new version
+ * debian/libempathy27.symbols, debian/libempathy-gtk25.symbols:
+ - new version update
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Thu, 30 Jul 2009 10:02:28 +0200
+
+empathy (2.27.4-0ubuntu1) karmic; urgency=low
+
+ * New upstream release: (LP: #399878)
+ - Segfault when the contact selector dispose
+ - Remove should be insensitive for salut contact
+ - empathy should be able to take colours from the GTK theme
+ - IRC widget is cut (Matthias Clasen)
+ - Add option to hide muc roster
+ - time banner is added at each sentence when the remote contact is offline
+ - Should take a well-known bus name (Jonny Lamb)
+ - Contact list view options are scattered over "Chat" menu and "General" Preferences
+ - Doesn't poke block devices to figure out their file size. (Frédéric Péters)
+ - Remove libgnomevfs include in megaphone-applet.c
+ - "Video preview" menu item doesn't do anything
+ - Use call-stop icon (Frédéric Péters)
+ - Should play a sound when calling
+ - Favourite Chat Room tickybox doesn't work. (Abner Silva)
+ - Adds an Adium theme parsing to have a nicer theme selector
+ - EmpathyProfileChooser should extend GtkComboBox
+ - Show a notification when a buddy goes to offline or online
+ - Implement o.fd.Tp.Debug to publish debug messages (Jonny Lamb)
+ - Shouldn't be able to send video and enable preview if no webcam is plugged
+ - Call window: "send video" widgets should be enabled according the state of the call
+ - we should not see the last video frame.
+ - Crash when starting if status-presets.xml contains an 'unset' presence (Guillaume Desmottes)
+ - Crash when trying to add an 'unset' status as favorite (Guillaume Desmottes)
+ - Contact list doesn't appear in windows list when respawned
+ - %service% is not replaced in adium themes (Patryk Zawadzki)
+ - Use libchamplain 0.3.3's API
+ - Adium theme is not reloaded on /clear or Ctrl+L or clear menu item
+ - Empathy does not import from Pidgin on start
+ - Capitalisation incorrect
+ - Can't easily copy URL's when using Adium themes
+ - Lines are not smashed together when using Adium themes (Patryk Zawadzki)
+ - "Publish my location" causes a crash
+ - Remove markup from translatable strings
+ - Remove "new message from" from notification message (Guillaume Desmottes)
+ - don't autoscroll on new messages
+ - Display part reasons and messages.
+ - Imported Google account (from Pidgin) not connecting (LP: #388522)
+ - Adium theme should only join messages if time delta is less than 5 minutes (Patryk Zawadzki)
+ - Use themed avatar as fallback if provided
+ - "history" messageClasses is not set for backlogs
+ - We are not using Info.plist settings for adium themes (Patryk Zawadzki)
+ - telepathy-idle IRC chat window has no users or chat content
+ - Status icon not updated when going offline (Guillaume Desmottes)
+ - Modules linking cleanup
+ - empaty crashs whenever a file trasnfert request is received
+ - NM integration doesn't work if NM is started after empathy (Sjoerd Simons)
+ - Don't use McAccount (Sjoerd Simons)
+ - Crash when trying to add a contact while connecting (Guillaume Desmottes)
+ - Labels with RTL control code don't right-align
+ - please add bug-database to doap (Guillaume Desmottes)
+ - typo for enable_network_manager in configure.ac (Ken VanDine)
+ - Crasher: click on the microphone once disconnected
+ * debian/control.in:
+ - bump soname for libempathy26 -> 27 (and associated {.install,.symbols files})
+ - bump soname for libempathy-gtk24 -> 25 (and associated {.install,.symbols files})
+ - add build-dep libx11-dev (old missing one), libgstfarsight0.10-dev,
+ libdbus-glib-1-dev and libnm-glib-dev
+ - add Vcs-Bzr tag
+ * add debian/patches/01_autoconf_forgot_by_upstream.patch to update configure
+ from configure.ac
+ * update libempathy27.symbols and libempathy-gtk25.symbols
+
+ -- Didier Roche <didrocks at ubuntu.com> Thu, 16 Jul 2009 18:34:37 +0200
+
+empathy (2.27.3-2ubuntu3) karmic; urgency=low
+
+ * debian/control: Temporarily drop telepathy-butterfly recommends. The pymsn
+ replacement is still being sorted out, and in the meantime, -haze provides
+ support for MSN. (See LP #388898 for status). This will be added back
+ later.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 14 Jul 2009 19:15:56 +0200
+
+empathy (2.27.3-2ubuntu2) karmic; urgency=low
+
+ * Drop geoclue dependencies, really
+
+ -- Laurent Bigonville <bigon at ubuntu.com> Mon, 06 Jul 2009 09:48:10 +0200
+
+empathy (2.27.3-2ubuntu1) karmic; urgency=low
+
+ * Merge from debian experimental, remaining changes:
+ - Add Suggests on telepathy-idle
+ - Bump telepathy-butterfly and telepathy-haze to recommends
+ * Drop libindicate support for now
+ * Drop geoloc support, dependencies not in main (yet)
+
+ -- Laurent Bigonville <bigon at ubuntu.com> Thu, 25 Jun 2009 10:02:52 +0200
+
empathy (2.27.3-2) experimental; urgency=low
* debian/rules: Remove duplicate include
@@@ -138,17 -62,6 +181,17 @@@
-- Laurent Bigonville <bigon at debian.org> Tue, 23 Jun 2009 11:10:25 +0200
+empathy (2.27.3-1ubuntu1) karmic; urgency=low
+
+ * Merge from debian experimental, remaining changes: (LP: #388590)
+ - Add Suggests on telepathy-idle
+ - Bump telepathy-butterfly and telepathy-haze to recommends
+ * debian/patches/001_add_indicator.patch:
+ - Add libindicate support (LP: #340180)
+ * debian/patches/099_autoreconf.patch: Run autoreconf
+
+ -- Laurent Bigonville <bigon at ubuntu.com> Tue, 23 Jun 2009 11:43:15 +0200
+
empathy (2.27.3-1) experimental; urgency=low
* New upstream release.
@@@ -158,14 -71,6 +201,14 @@@
-- Laurent Bigonville <bigon at debian.org> Wed, 17 Jun 2009 20:38:21 +0200
+empathy (2.27.2-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> Sun, 31 May 2009 19:05:28 +0200
+
empathy (2.27.2-1) experimental; urgency=low
* New upstream release
@@@ -173,14 -78,6 +216,14 @@@
-- 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
@@@ -205,14 -102,6 +248,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
@@@ -220,20 -109,6 +263,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
@@@ -246,15 -121,6 +289,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
@@@ -295,16 -161,6 +338,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 ]
@@@ -337,16 -193,6 +380,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:
@@@ -354,16 -200,6 +397,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.
@@@ -372,47 -208,18 +415,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
@@@ -421,14 -228,6 +464,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
@@@ -447,72 -246,6 +490,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 ]
@@@ -543,22 -276,6 +586,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 ]
@@@ -738,19 -455,6 +781,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 ]
@@@ -783,28 -487,6 +826,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
@@@ -845,71 -527,12 +888,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 df89029,6b9d77a..5e40cda
--- 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>,
@@@ -17,8 -16,7 +17,7 @@@ Build-Depends: cdbs
libgtk2.0-dev (>= 2.16.0),
libpanel-applet2-dev (>= 2.10.0),
libgconf2-dev (>= 1.2.0),
- libtelepathy-glib-dev (>= 0.7.31),
- libmissioncontrol-client-dev (>= 4.61),
+ libtelepathy-glib-dev (>= 0.7.34),
intltool,
libenchant-dev (>= 1.2.0),
iso-codes,
@@@ -26,21 -24,21 +25,24 @@@
python-gtk2-dev,
python-support (>= 0.3),
xsltproc,
- gnome-doc-utils (>= 0.3.2),
+ gnome-doc-utils (>= 0.17.3),
libcanberra-gtk-dev (>= 0.4),
libnotify-dev (>= 0.4.4),
+ libx11-dev,
+ libgstfarsight0.10-dev,
+ libdbus-glib-1-dev,
libtelepathy-farsight-dev (>= 0.0.4),
libgstreamer0.10-dev,
libgstreamer-plugins-base0.10-dev,
- libnm-glib-dev (>= 0.7.0),
- libwebkit-dev (>= 1.1.7)
- Standards-Version: 3.8.2
+ libnm-glib-dev (>= 0.7),
+ libnm-util-dev (>= 0.7),
+ libwebkit-dev (>= 1.1.7),
- libgeoclue-dev (>= 0.11),
+ libgnome-keyring-dev (>= 2.22),
+ libunique-dev
+ Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/empathy/ubuntu
Homepage: http://live.gnome.org/Empathy
Package: empathy
@@@ -50,17 -48,14 +52,15 @@@ Depends: ${shlibs:Depends}
dbus-x11
Recommends: telepathy-gabble,
telepathy-salut,
+ telepathy-haze,
gvfs-backends
-Suggests: telepathy-haze,
+Suggests: telepathy-idle,
telepathy-butterfly
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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This packet contains the empathy IM application and account manager.
@@@ -70,30 -65,26 +70,25 @@@ Section: mis
Depends: ${shlibs:Depends},
${misc:Depends}
Description: High-level library and user-interface for Telepathy (library common 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This packet contains common files for libempathy
--
- Package: libempathy27
+ Package: libempathy29
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
libempathy-common (= ${source:Version}),
- telepathy-mission-control
+ telepathy-mission-control-5
Description: High-level library and user-interface for Telepathy (low-level library)
- 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This packages contains the low-level empathy library
@@@ -103,12 -94,10 +98,10 @@@ Section: do
Depends: ${shlibs:Depends},
${misc:Depends}
Description: High-level library and user-interface for Telepathy (library documentation)
- 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This package contains documentation for libempathy
@@@ -117,18 -106,14 +110,14 @@@ Architecture: an
Section: libdevel
Depends: ${shlibs:Depends},
${misc:Depends},
- libmissioncontrol-client-dev,
libglib2.0-dev,
libxml2-dev,
- libtelepathy-dev,
- libempathy27 (= ${binary:Version})
+ libempathy29 (= ${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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This package contains development files for libempathy
@@@ -138,12 -123,10 +127,10 @@@ Section: do
Depends: ${shlibs:Depends},
${misc:Depends}
Description: High-level library and user-interface for Telepathy (GTK documentation)
- 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This package contains documentation for libempathy-gtk
@@@ -154,28 -137,29 +141,24 @@@ Depends: ${shlibs:Depends}
${misc:Depends},
gnome-icon-theme
Description: High-level library and user-interface for Telepathy (GTK common 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This package contains common files for libempathy-gtk
- Package: libempathy-gtk25
+ Package: libempathy-gtk27
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
libempathy-gtk-common (= ${source:Version}),
- geoclue
-Recommends: geoclue-hostip,
- geoclue-localnet,
- geoclue-yahoo,
- geoclue-manual
Description: High-level library and user-interface for Telepathy (GTK library)
- 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This package contains a library of widgets for use in IM applications.
@@@ -185,15 -169,13 +168,13 @@@ Section: libdeve
Depends: ${shlibs:Depends},
${misc:Depends},
libempathy-dev,
- libempathy-gtk25 (= ${binary:Version}),
+ libempathy-gtk27 (= ${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
- GNOME client using those widgets. It uses Telepathy and Nokia's Mission
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This package contains development files for libempathy-gtk
@@@ -206,12 -188,10 +187,10 @@@ Depends: ${shlibs:Depends}
${python:Depends}
XB-Python-Version: ${python:Versions}
Description: High-level library and user-interface for Telepathy (python bindings)
- 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This package contains Python bindings for libempathy and libempathy-gtk
@@@ -220,12 -200,10 +199,10 @@@ Architecture: an
Depends: ${shlibs:Depends},
${misc:Depends}
Description: High-level library and user-interface for Telepathy (megaphone applet)
- 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
- Control, and reuses Gossip's UI. The main goal is to permit desktop
- integration by providing libempathy and libempathy-gtk libraries.
- libempathy-gtk is a set of powerful widgets that can be embeded into any
- GNOME application.
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
.
This packet contains the megaphone applet
.
diff --combined debian/rules
index 6fe2965,1bcee6c..4463dc3
--- a/debian/rules
+++ b/debian/rules
@@@ -18,7 -18,9 +18,8 @@@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-s
--enable-python \
--enable-megaphone \
--disable-tests \
+ --with-connectivity=nm \
- --enable-webkit \
- --enable-location
+ --enable-webkit
binary-install/python-empathy::
dh_pysupport -p$(cdbs_curpkg)
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list