=== removed file 'VERSION'
--- VERSION	2009-01-31 14:57:15 +0000
+++ VERSION	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0.14

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-06 11:27:56 +0000
+++ debian/changelog	2009-03-19 01:48:00 +0000
@@ -1,3 +1,21 @@
+pidgin-libnotify (0.14-1ubuntu6) jaunty; urgency=low
+
+  * /debian/patches/indicate.patch:
+    * Updating the names of the append and truncation hints to
+      match the new version of the spec.  (LP: #341565)
+    * Change the IRC private messages to not have the same name
+      twice in the notification.
+    * Change the chat room notifications to tell you the person
+      first rather than the room first.
+    * Switch the protocol icons to use large icons instead of using
+      the smaller icons. (LP: #333497)
+    * Change the indicator types so that the count doesn't appear
+      in the indicator applet along with the items.
+    * Only block buddy list hiding when called from the indictor
+      applet. (LP: #333745)
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 18 Mar 2009 20:46:00 -0500
+
 pidgin-libnotify (0.14-1ubuntu5) jaunty; urgency=low
 
   * debian/rules:

=== modified file 'debian/patches/indicate.patch'
--- debian/patches/indicate.patch	2009-03-04 15:40:31 +0000
+++ debian/patches/indicate.patch	2009-03-19 01:51:17 +0000
@@ -41,8 +41,8 @@
 
 === modified file 'src/pidgin-libnotify.c'
 --- old/src/pidgin-libnotify.c	2009-01-31 14:57:15 +0000
-+++ new/src/pidgin-libnotify.c	2009-03-04 14:19:50 +0000
-@@ -35,15 +35,29 @@
++++ new/src/pidgin-libnotify.c	2009-03-19 01:50:59 +0000
+@@ -35,15 +35,31 @@
  
  /* for pidgin_create_prpl_icon */
  #include <gtkutils.h>
@@ -67,12 +67,14 @@
 +static gboolean  notify_supports_append = FALSE;
 +static gboolean  notify_supports_truncation = FALSE;
 +
++static gboolean  visibility_managed = FALSE;
++
 +static IndicateServer * indicate_server = NULL;
 +
  static PurplePluginPrefFrame *
  get_plugin_pref_frame (PurplePlugin *plugin)
  {
-@@ -177,7 +191,7 @@
+@@ -177,7 +193,7 @@
  	PurpleConversation *conv = NULL;
  
  	purple_debug_info (PLUGIN_ID, "action_cb(), "
@@ -81,7 +83,7 @@
  
  	buddy = (PurpleBuddy *)g_object_get_data (G_OBJECT(notification), "buddy");
  
-@@ -203,7 +217,7 @@
+@@ -203,7 +219,7 @@
  {
  	PurpleContact *contact;
  
@@ -90,7 +92,7 @@
  
  	contact = (PurpleContact *)g_object_get_data (G_OBJECT(notification), "contact");
  	if (contact)
-@@ -222,7 +236,7 @@
+@@ -222,7 +238,7 @@
  {
  	gchar *escaped_str;
  
@@ -99,7 +101,7 @@
  		gchar *truncated_str;
  		gchar *str2;
  
-@@ -257,31 +271,47 @@
+@@ -257,31 +273,47 @@
  static void
  notify (const gchar *title,
  		const gchar *body,
@@ -137,9 +139,9 @@
  	if (notification != NULL) {
 +		if (notify_supports_append) {
 +			if (append) {
-+				notify_notification_set_hint_string(notification, "append", "allow");
++				notify_notification_set_hint_string(notification, "x-canonical-append", "allow");
 +			} else {
-+				notify_notification_set_hint_string(notification, "append", "off");
++				notify_notification_set_hint_string(notification, "x-canonical-append", "off");
 +			}
 +		}
 +
@@ -155,7 +157,7 @@
  
  		g_free (tr_body);
  		return;
-@@ -289,27 +319,42 @@
+@@ -289,27 +321,42 @@
  	notification = notify_notification_new (title, tr_body, NULL, NULL);
  	purple_debug_info (PLUGIN_ID, "notify(), new: "
  					 "title: '%s', body: '%s', buddy: '%s'\n",
@@ -168,9 +170,9 @@
 -	if (buddy_icon) {
 +	if (notify_supports_append) {
 +		if (append) {
-+			notify_notification_set_hint_string(notification, "append", "allow");
++			notify_notification_set_hint_string(notification, "x-canonical-append", "allow");
 +		} else {
-+			notify_notification_set_hint_string(notification, "append", "off");
++			notify_notification_set_hint_string(notification, "x-canonical-append", "off");
 +		}
 +	}
 +
@@ -185,7 +187,7 @@
 -		icon = pidgin_create_prpl_icon (buddy->account, 1);
 -		purple_debug_info (PLUGIN_ID, "notify(), has a prpl icon.\n");
 +		if (buddy != NULL) {
-+			icon = pidgin_create_prpl_icon (buddy->account, 1);
++			icon = pidgin_create_prpl_icon (buddy->account, PIDGIN_PRPL_ICON_LARGE);
 +			purple_debug_info (PLUGIN_ID, "notify(), has a prpl icon.\n");
 +		}
  	}
@@ -205,7 +207,7 @@
  
  	g_object_set_data (G_OBJECT(notification), "contact", contact);
  
-@@ -317,7 +362,9 @@
+@@ -317,7 +364,9 @@
  
  	notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
  
@@ -216,7 +218,7 @@
  
  	if (!notify_notification_show (notification, NULL)) {
  		purple_debug_error (PLUGIN_ID, "notify(), failed to send notification\n");
-@@ -329,7 +376,7 @@
+@@ -329,7 +378,7 @@
  notify_buddy_signon_cb (PurpleBuddy *buddy,
  						gpointer data)
  {
@@ -225,7 +227,7 @@
  	gboolean blocked;
  
  	g_return_if_fail (buddy);
-@@ -349,19 +396,16 @@
+@@ -349,19 +398,16 @@
  
  	tr_name = truncate_escape_string (best_name (buddy), 25);
  
@@ -247,7 +249,7 @@
  	gboolean blocked;
  
  	g_return_if_fail (buddy);
-@@ -381,40 +425,56 @@
+@@ -381,40 +427,56 @@
  
  	tr_name = truncate_escape_string (best_name (buddy), 25);
  
@@ -295,10 +297,10 @@
 +		if (conv != NULL) {
 +			const gchar * temp = purple_conversation_get_title(conv);
 +			if (temp != NULL) {
-+				if (sender == NULL) {
++				if (sender == NULL || !g_strcmp0(sender, temp)) {
 +					tr_name = g_strdup(temp);
 +				} else {
-+					tr_name = g_strdup_printf("%s (%s)", temp, sender);
++					tr_name = g_strdup_printf("%s (%s)", sender, temp);
 +				}
 +			} else {
 +				if (sender != NULL) {
@@ -323,7 +325,7 @@
  	g_free (body);
  }
  
-@@ -434,20 +494,39 @@
+@@ -434,20 +496,39 @@
  
  #ifndef DEBUG /* in debug mode, always show notifications */
  	if (conv && purple_conversation_has_focus (conv)) {
@@ -366,7 +368,7 @@
  }
  
  static void
-@@ -463,10 +542,278 @@
+@@ -463,10 +544,285 @@
  	if (nick && !strcmp (sender, nick))
  		return;
  
@@ -550,7 +552,7 @@
 +		icon = pixbuf_from_buddy_icon(buddy_icon);
 +	} else {
 +		if (buddy != NULL) {
-+			icon = pidgin_create_prpl_icon(buddy->account, 1);
++			icon = pidgin_create_prpl_icon(buddy->account, PIDGIN_PRPL_ICON_LARGE);
 +		}
 +	}
 +
@@ -559,10 +561,10 @@
 +	} else {
 +		const gchar * temp = purple_conversation_get_title(conv);
 +		if (temp != NULL) {
-+			if (sender == NULL) {
++			if (sender == NULL || !g_strcmp0(sender, temp)) {
 +				tr_name = g_strdup(temp);
 +			} else {
-+				tr_name = g_strdup_printf("%s (%s)", temp, sender);
++				tr_name = g_strdup_printf("%s (%s)", sender, temp);
 +			}
 +		} else {
 +			if (sender != NULL) {
@@ -613,6 +615,11 @@
 +static void
 +indicate_server_display (IndicateServer * server, gpointer data)
 +{
++	if (visibility_managed == FALSE) {
++		pidgin_blist_visibility_manager_add();
++		visibility_managed = TRUE;
++	}
++
 +	pidgin_blist_toggle_visibility();
 +}
 +
@@ -627,10 +634,12 @@
 +		notify_supports_actions = TRUE;
 +	} else if (!strcmp(cap, "append")) {
 +		notify_supports_append = TRUE;
++	} else if (!strcmp(cap, "x-canonical-append")) {
++		notify_supports_append = TRUE;
 +	} else if (!strcmp(cap, "truncation")) {
 +		notify_supports_truncation = TRUE;
-+	} else if (!strcmp(cap, "canonical-private-2")) {
-+		notify_supports_append = TRUE;
++	} else if (!strcmp(cap, "x-canonical-truncation")) {
++		notify_supports_truncation = TRUE;
 +	}
 +
 +	return;
@@ -649,23 +658,22 @@
  }
  
  static gboolean
-@@ -479,6 +826,15 @@
+@@ -479,6 +835,14 @@
  		return FALSE;
  	}
  
 +	notify_check_caps();
 +
 +	indicate_server = indicate_server_ref_default();
-+	indicate_server_set_type(indicate_server, "messages.instant");
++	indicate_server_set_type(indicate_server, "message.instant");
 +	indicate_server_set_desktop_file(indicate_server, "/usr/share/applications/pidgin.desktop");
 +	g_signal_connect(G_OBJECT(indicate_server), INDICATE_SERVER_SIGNAL_SERVER_DISPLAY, G_CALLBACK(indicate_server_display), NULL);
-+	pidgin_blist_visibility_manager_add();
 +	indicate_server_show(indicate_server);
 +
  	conv_handle = purple_conversations_get_handle ();
  	blist_handle = purple_blist_get_handle ();
  	conn_handle = purple_connections_get_handle();
-@@ -497,6 +853,12 @@
+@@ -497,6 +861,12 @@
  	purple_signal_connect (conv_handle, "received-chat-msg", plugin,
  						PURPLE_CALLBACK(notify_chat_nick), NULL);
  
@@ -678,7 +686,7 @@
  	/* used just to not display the flood of guifications we'd get */
  	purple_signal_connect (conn_handle, "signed-on", plugin,
  						PURPLE_CALLBACK(event_connection_throttle), NULL);
-@@ -525,6 +887,12 @@
+@@ -525,6 +895,12 @@
  	purple_signal_disconnect (conv_handle, "received-chat-msg", plugin,
  							PURPLE_CALLBACK(notify_chat_nick));
  
@@ -691,12 +699,16 @@
  	purple_signal_disconnect (conn_handle, "signed-on", plugin,
  							PURPLE_CALLBACK(event_connection_throttle));
  
-@@ -532,6 +900,10 @@
+@@ -532,6 +908,14 @@
  
  	notify_uninit ();
  
 +	indicate_server_hide(indicate_server);
-+	pidgin_blist_visibility_manager_remove();
++
++	if (visibility_managed == TRUE) {
++		pidgin_blist_visibility_manager_remove();
++	}
++
 +	g_object_unref(G_OBJECT(indicate_server));
 +
  	return TRUE;