diff -u notification-daemon-0.3.7/debian/changelog notification-daemon-0.3.7/debian/changelog
--- notification-daemon-0.3.7/debian/changelog
+++ notification-daemon-0.3.7/debian/changelog
@@ -1,3 +1,14 @@
+notification-daemon (0.3.7-1ubuntu11) hardy; urgency=low
+
+  * 06_fix_default_theme_size.patch:
+    - Fix the display of certain long lines. (LP: #40379).
+      The patch is by BobMauchin, taken from
+      http://trac.galago-project.org/ticket/162
+  * 01_ubuntu_theme.patch
+    - Patch adapted and applied to the ubuntu theme as well.
+
+ -- James Westby <james.westby@canonical.com>  Fri, 04 Apr 2008 13:03:42 +0100
+
 notification-daemon (0.3.7-1ubuntu10) hardy; urgency=low
 
   [ Alex Jones ]
diff -u notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch
--- notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch
+++ notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch
@@ -544,7 +544,7 @@
 +
 +	update_content_hbox_visibility(windata);
 +
-+      gtk_widget_set_size_request(((body != NULL && *body == '\0') ? 
++      gtk_widget_set_size_request(((body != NULL && *body != '\0') ? 
 +                                 windata->body_label : windata->summary_label), 
 +				 WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10,
 +				 -1);
only in patch2:
unchanged:
--- notification-daemon-0.3.7.orig/debian/patches/06_fix_default_theme_size.patch
+++ notification-daemon-0.3.7/debian/patches/06_fix_default_theme_size.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' notification-daemon-0.3.7/src/themes/standard/theme.c notification-daemon-0.3.7.new/src/themes/standard/theme.c
+--- notification-daemon-0.3.7/src/themes/standard/theme.c	2007-01-26 04:20:15.000000000 +0000
++++ notification-daemon-0.3.7.new/src/themes/standard/theme.c	2008-04-04 13:12:08.000000000 +0100
+@@ -884,7 +884,7 @@
+ 	update_content_hbox_visibility(windata);
+ 
+ 	gtk_widget_set_size_request(
+-		((body != NULL && *body == '\0')
++		((body != NULL && *body != '\0')
+ 		 ? windata->body_label : windata->summary_label),
+ 		WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10,
+ 		-1);