Merge lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.33.3-0ubuntu1 into lp:~ubuntu-desktop/empathy/ubuntu

[Brian Curtis]

empathy (2.33.3-0ubuntu1) natty; urgency=low

  * New Upstream Release
  * debian/control
    -bumped dep for tp-glib
  * debian/patches/23_idomessagedialog_for_voip_and_ft.patch
    - fixed a fuzz issue with build by refreshing patch

 -- Brian Curtis <email address hidden> Wed, 09 Mar 2011 10:46:13 -0500

[lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.33.3-0ubuntu1]

173. By Brian Curtis on 2011-03-09

add bug # to changelog

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-24 18:21:05 +0000
+++ debian/changelog	2011-03-09 16:23:07 +0000
@@ -1,3 +1,13 @@
+empathy (2.33.3-0ubuntu1) natty; urgency=low
+
+  * New Upstream Release (LP: #732077)
+  * debian/control
+    -bumped dep for tp-glib
+  * debian/patches/23_idomessagedialog_for_voip_and_ft.patch
+    - fixed a fuzz issue with build by refreshing patch
+
+ -- Brian Curtis <[e-mail]>  Wed, 09 Mar 2011 10:46:13 -0500
+
 empathy (2.33.2-0ubuntu1) natty; urgency=low
 
   * New upstream release
 
=== modified file 'debian/control'
--- debian/control	2011-02-24 18:21:05 +0000
+++ debian/control	2011-03-09 16:23:07 +0000
@@ -18,7 +18,7 @@
                libglib2.0-dev (>= 2.25.9),
                libgtk2.0-dev (>= 2.21.2),
                libgconf2-dev (>= 1.2.0),
-               libtelepathy-glib-dev (>= 0.13.14),
+               libtelepathy-glib-dev (>= 0.13.16),
                libtelepathy-logger-dev (>= 0.2.0),
                libebook1.2-dev,
                intltool,
 
=== modified file 'debian/patches/23_idomessagedialog_for_voip_and_ft.patch'
--- debian/patches/23_idomessagedialog_for_voip_and_ft.patch	2011-02-24 18:21:05 +0000
+++ debian/patches/23_idomessagedialog_for_voip_and_ft.patch	2011-03-09 16:23:07 +0000
@@ -1,8 +1,10 @@
 === modified file 'configure.ac'
---- old/configure.ac	2011-02-24 17:04:31 +0000
-+++ new/configure.ac	2011-02-24 17:06:00 +0000
+Index: empathy-2.33.3/configure.ac
+===================================================================
+--- empathy-2.33.3.orig/configure.ac	2011-03-09 11:01:14.506578013 -0500
++++ empathy-2.33.3/configure.ac	2011-03-09 11:01:18.206578003 -0500
 @@ -43,6 +43,7 @@
- TELEPATHY_GLIB_REQUIRED=0.13.12
+ TELEPATHY_GLIB_REQUIRED=0.13.16
  TELEPATHY_LOGGER=0.2.0
  UNIQUE_REQUIRED=1.1.2
 +IDO_REQUIRED=0.1.14
@@ -17,10 +19,10 @@
     x11
     launchpad-integration
  ])
-
-=== modified file 'src/empathy-event-manager.c'
---- old/src/empathy-event-manager.c	2011-02-24 17:01:06 +0000
-+++ new/src/empathy-event-manager.c	2011-02-24 17:05:32 +0000
+Index: empathy-2.33.3/src/empathy-event-manager.c
+===================================================================
+--- empathy-2.33.3.orig/src/empathy-event-manager.c	2011-03-09 05:10:22.000000000 -0500
++++ empathy-2.33.3/src/empathy-event-manager.c	2011-03-09 11:01:18.216578004 -0500
 @@ -48,6 +48,9 @@
  #include <libempathy-gtk/empathy-contact-dialogs.h>
  #include <libempathy-gtk/empathy-sound.h>
@@ -199,10 +201,10 @@
  
    /* FIXME better sound for incoming file transfers ?*/
    empathy_sound_play (window, EMPATHY_SOUND_CONVERSATION_NEW);
-
-=== modified file 'src/empathy-indicator-manager.c'
---- old/src/empathy-indicator-manager.c	2011-02-24 17:05:22 +0000
-+++ new/src/empathy-indicator-manager.c	2011-02-24 17:05:32 +0000
+Index: empathy-2.33.3/src/empathy-indicator-manager.c
+===================================================================
+--- empathy-2.33.3.orig/src/empathy-indicator-manager.c	2011-03-09 11:01:16.446578024 -0500
++++ empathy-2.33.3/src/empathy-indicator-manager.c	2011-03-09 11:01:18.216578004 -0500
 @@ -144,6 +144,10 @@
      EmpathyEvent *event,
      EmpathyIndicatorManager *manager)
@@ -214,10 +216,10 @@
    EmpathyIndicator *indicator = NULL;
    EmpathyIndicatorManagerPriv *priv;
    IndicatorEvent *indicator_event;
-
-=== modified file 'src/empathy-status-icon.c'
---- old/src/empathy-status-icon.c	2011-02-24 17:04:31 +0000
-+++ new/src/empathy-status-icon.c	2011-02-24 17:05:32 +0000
+Index: empathy-2.33.3/src/empathy-status-icon.c
+===================================================================
+--- empathy-2.33.3.orig/src/empathy-status-icon.c	2011-03-09 11:01:14.506578013 -0500
++++ empathy-2.33.3/src/empathy-status-icon.c	2011-03-09 11:01:18.216578004 -0500
 @@ -193,6 +193,10 @@
  	}
  
@@ -229,4 +231,3 @@
  		gchar *message_esc = NULL;
  		gboolean has_x_canonical_append;
  		NotifyNotification *notification = priv->notification;
-