[Pkg-telepathy-commits] ./packages/unstable/empathy r82: * New upstream release (0.21.5.2)
Laurent Bigonville
bigon at bigon.be
Wed Jan 16 19:45:48 UTC 2008
------------------------------------------------------------
revno: 82
committer: Laurent Bigonville <bigon at bigon.be>
branch nick: empathy
timestamp: Wed 2008-01-16 20:45:48 +0100
message:
* New upstream release (0.21.5.2)
* Bump libmissioncontrol-client-dev build-dep version
* Bump soname of libempathy-gtk
* Drop debian/msn-haze.profile: merged upstream
* debian/patches/fix-pyftbfs.patch: Fix FTBFS of the python binding
(taken from upstream)
* debian/patches/accounts-icons-path.patch: Fix search path for icons (taken
from upstream)
* debian/rules: remove installed test program
removed:
msn-haze.profile
patches/fix_setting_avatar.patch
patches/listen_to_presence_changed.patch
added:
patches/accounts-icons-path.patch
patches/fix-pyftbfs.patch
renamed:
libempathy-gtk7.install => libempathy-gtk9.install
modified:
changelog
control
rules
-------------- next part --------------
=== removed file 'msn-haze.profile'
--- a/msn-haze.profile 2007-11-14 20:48:42 +0000
+++ b/msn-haze.profile 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Profile]
-Manager=haze
-Protocol=msn
-DisplayName=MSN (Haze)
-IconName = im-msn
-ConfigurationUI = msn
-SupportsInvisible = 0
-Capabilities = chat-p2p
=== removed file 'patches/fix_setting_avatar.patch'
--- a/patches/fix_setting_avatar.patch 2008-01-05 15:55:10 +0000
+++ b/patches/fix_setting_avatar.patch 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: libempathy-gtk/empathy-avatar-chooser.c
-===================================================================
---- libempathy-gtk/empathy-avatar-chooser.c (revision 529)
-+++ libempathy-gtk/empathy-avatar-chooser.c (revision 530)
-@@ -558,7 +558,7 @@
- if (data) {
- *data = priv->image_data;
- }
-- if (*data_size) {
-+ if (data_size) {
- *data_size = priv->image_data_size;
- }
- if (mime_type) {
=== removed file 'patches/listen_to_presence_changed.patch'
--- a/patches/listen_to_presence_changed.patch 2008-01-05 19:06:28 +0000
+++ b/patches/listen_to_presence_changed.patch 1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-From: Xavier Claessens <xclaesse at gmail.com>
-Date: Wed, 2 Jan 2008 22:42:24 +0000 (+0100)
-Subject: Do not use deprecated PresenceStatusActual MC signal, use instead PresenceChanged.
-X-Git-Url: http://git.collabora.co.uk/?p=user%2Fxclaesse%2Fempathy.git;a=commitdiff_plain;h=1a084551cc58a3ed5db8af5d09fdaadf8e385a50;hp=17c0363b047ad8b7cbfb508f41fefead7b8a26bc
-
-Do not use deprecated PresenceStatusActual MC signal, use instead PresenceChanged.
----
-
-diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
-index 0239d14..b178257 100644
---- a/libempathy/empathy-idle.c
-+++ b/libempathy/empathy-idle.c
-@@ -81,6 +81,7 @@ static void idle_set_property (GObject *object,
- GParamSpec *pspec);
- static void idle_presence_changed_cb (MissionControl *mc,
- McPresence state,
-+ gchar *status,
- EmpathyIdle *idle);
- static void idle_session_idle_changed_cb (DBusGProxy *gs_proxy,
- gboolean is_idle,
-@@ -167,10 +168,10 @@ empathy_idle_init (EmpathyIdle *idle)
- priv->is_idle = FALSE;
- priv->mc = empathy_mission_control_new ();
- priv->state = mission_control_get_presence_actual (priv->mc, NULL);
-- idle_presence_changed_cb (priv->mc, priv->state, idle);
-+ priv->status = mission_control_get_presence_message_actual (priv->mc, NULL);
-
- dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
-- "PresenceStatusActual",
-+ "PresenceChanged",
- G_CALLBACK (idle_presence_changed_cb),
- idle, NULL);
-
-@@ -487,19 +488,21 @@ empathy_idle_set_use_nm (EmpathyIdle *idle,
- static void
- idle_presence_changed_cb (MissionControl *mc,
- McPresence state,
-+ gchar *status,
- EmpathyIdle *idle)
- {
- EmpathyIdlePriv *priv;
-
- priv = GET_PRIV (idle);
-
-+ empathy_debug (DEBUG_DOMAIN, "Presence changed to '%s' (%d)",
-+ status, state);
-+
- g_free (priv->status);
- priv->state = state;
-- priv->status = mission_control_get_presence_message_actual (priv->mc, NULL);
--
-- if (G_STR_EMPTY (priv->status)) {
-- g_free (priv->status);
-- priv->status = NULL;
-+ priv->status = NULL;
-+ if (!G_STR_EMPTY (status)) {
-+ priv->status = g_strdup (status);
- }
-
- g_object_notify (G_OBJECT (idle), "state");
=== added file 'patches/accounts-icons-path.patch'
--- a/patches/accounts-icons-path.patch 1970-01-01 00:00:00 +0000
+++ b/patches/accounts-icons-path.patch 2008-01-16 19:45:48 +0000
@@ -0,0 +1,22 @@
+commit d8148a90f77742490bc80dcd85df2dc2096829b1
+Author: xclaesse <xclaesse at 4ee84921-47dd-4033-b63a-18d7a039a3e4>
+Date: Wed Jan 16 18:15:01 2008 +0000
+
+ Icon location changed, forgot to change in empathy-account program.
+
+
+ git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@568 4ee84921-47dd-4033-b63a-18d7a039a3e4
+
+diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
+index f5d0b1b..b619171 100644
+--- a/src/empathy-accounts.c
++++ b/src/empathy-accounts.c
+@@ -45,7 +45,7 @@ main (int argc, char *argv[])
+ gtk_init (&argc, &argv);
+
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+- DATADIR G_DIR_SEPARATOR_S "empathy");
++ PKGDATADIR G_DIR_SEPARATOR_S "icons");
+ dialog = empathy_accounts_dialog_show (NULL);
+
+ g_signal_connect (dialog, "destroy",
=== added file 'patches/fix-pyftbfs.patch'
--- a/patches/fix-pyftbfs.patch 1970-01-01 00:00:00 +0000
+++ b/patches/fix-pyftbfs.patch 2008-01-16 19:45:48 +0000
@@ -0,0 +1,42 @@
+commit 540fb713e6e3efadc8dab0c6a7544515c2d198c4
+Author: xclaesse <xclaesse at 4ee84921-47dd-4033-b63a-18d7a039a3e4>
+Date: Wed Jan 16 19:05:23 2008 +0000
+
+ Remove not implemented and not used empathy_time_parse_format function.
+
+
+ git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@570 4ee84921-47dd-4033-b63a-18d7a039a3e4
+
+diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
+index 560b465..ce520cd 100644
+--- a/libempathy/empathy-time.h
++++ b/libempathy/empathy-time.h
+@@ -36,8 +36,6 @@ G_BEGIN_DECLS
+ time_t empathy_time_get_current (void);
+ time_t empathy_time_get_local_time (struct tm *tm);
+ time_t empathy_time_parse (const gchar *str);
+-time_t empathy_time_parse_format (const gchar *str,
+- const gchar *format);
+ gchar *empathy_time_to_string_utc (time_t t,
+ const gchar *format);
+ gchar *empathy_time_to_string_local (time_t t,
+diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
+index 8079911..56825ab 100644
+--- a/python/pyempathy/pyempathy.defs
++++ b/python/pyempathy/pyempathy.defs
+@@ -1415,15 +1415,6 @@
+ )
+ )
+
+-(define-function empathy_time_parse_format
+- (c-name "empathy_time_parse_format")
+- (return-type "time_t")
+- (parameters
+- '("const-gchar*" "str")
+- '("const-gchar*" "format")
+- )
+-)
+-
+ (define-function empathy_time_to_string_utc
+ (c-name "empathy_time_to_string_utc")
+ (return-type "gchar*")
=== renamed file 'libempathy-gtk7.install' => 'libempathy-gtk9.install'
=== modified file 'changelog'
--- a/changelog 2008-01-07 01:00:12 +0000
+++ b/changelog 2008-01-16 19:45:48 +0000
@@ -1,6 +1,15 @@
-empathy (0.21.4-2) UNRELEASED; urgency=low
+empathy (0.21.5.2-1) UNRELEASED; urgency=low
+ * New upstream release (0.21.5.2)
* Add XS-Dm-Upload-Allowed: yes, really
+ * Bump libmissioncontrol-client-dev build-dep version
+ * Bump soname of libempathy-gtk
+ * Drop debian/msn-haze.profile: merged upstream
+ * debian/patches/fix-pyftbfs.patch: Fix FTBFS of the python binding
+ (taken from upstream)
+ * debian/patches/accounts-icons-path.patch: Fix search path for icons (taken
+ from upstream)
+ * debian/rules: remove installed test program
-- Laurent Bigonville <bigon at bigon.be> Mon, 07 Jan 2008 01:58:46 +0100
=== modified file 'control'
--- a/control 2008-01-07 01:00:12 +0000
+++ b/control 2008-01-16 19:45:48 +0000
@@ -15,7 +15,7 @@
libpanel-applet2-dev (>= 2.10.0),
libgconf2-dev (>= 1.2.0),
libtelepathy-dev (>= 0.0.57),
- libmissioncontrol-client-dev (>= 4.37),
+ libmissioncontrol-client-dev (>= 4.53),
intltool,
libaspell-dev,
iso-codes,
@@ -148,7 +148,7 @@
.
This package contains common files for libempathy-gtk
-Package: libempathy-gtk7
+Package: libempathy-gtk9
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -170,7 +170,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libempathy-dev,
- libempathy-gtk7 (= ${binary:Version}),
+ libempathy-gtk9 (= ${binary:Version}),
libgtk2.0-dev (>= 2.10.0),
libglade2-dev (>= 2.0.0)
Description: High-level library and user-interface for Telepathy
=== modified file 'rules'
--- a/rules 2007-11-14 20:48:42 +0000
+++ b/rules 2008-01-16 19:45:48 +0000
@@ -17,8 +17,8 @@
DEB_CONFIGURE_EXTRA_FLAGS := --enable-aspell --enable-python --enable-megaphone
-binary-install/libempathy-common::
- install -p -m 644 $(DEB_SRCDIR)/debian/msn-haze.profile debian/libempathy-common/usr/share/mission-control/profiles
+binary-install/empathy::
+ -rm debian/empathy/usr/bin/contact-manager
binary-install/python-empathy::
dh_pysupport -p$(cdbs_curpkg)
More information about the Pkg-telepathy-commits
mailing list