diff -u mousepad-0.2.2/debian/changelog mousepad-0.2.2/debian/changelog
--- mousepad-0.2.2/debian/changelog
+++ mousepad-0.2.2/debian/changelog
@@ -1,3 +1,19 @@
+mousepad (0.2.2-2ubuntu5.1~proposed2) dapper-proposed; urgency=low
+
+  * Addressed issues raised by QA Team. (See Ubuntu: #56161)
+
+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com>  Sat, 20 Jan 2007 00:18:46 -0400
+
+mousepad (0.2.2-2ubuntu5.1~proposed) dapper-proposed; urgency=low
+
+  * Applied upstream svn revision 22299 to fix a segmentation 
+    fault when saving a file on 64bit pc. (Closes Ubuntu: #56161)
+  * SRU Request: 56161
+  * Reference: 
+   http://svn.xfce.org/listing.php?repname=xfce4&path=%2Fmousepad%2Ftrunk%2Fsrc%2F&rev=22299&sc=1
+
+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com>  Sat,  2 Dec 2006 20:32:59 -0400
+
 mousepad (0.2.2-2ubuntu5) dapper; urgency=low
 
   * Rebuild for new libxfce4util
only in patch2:
unchanged:
--- mousepad-0.2.2.orig/src/callback.c
+++ mousepad-0.2.2/src/callback.c
@@ -21,6 +21,7 @@
  */
 
 #include "mousepad.h"
+#include <glib.h>
 
 static gint check_text_modification(StructData *sd)
 {
@@ -123,7 +124,8 @@
 gint cb_file_save_as(StructData *sd)
 {
 	FileInfo *fi;
-	
+
+	g_return_val_if_fail (sd != NULL, -1);
 	fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, SAVE);
 	if (fi) {
 		if (file_save_real(sd->mainwin->textview, fi))
@@ -143,7 +145,7 @@
 {
 	GtkTextIter start, end;
 	gchar       *str;
-	gint        rbytes, wbytes;
+	gsize       rbytes, wbytes;
 
 	gint   xfprint_pipe;
 	GPid   child_pid;
only in patch2:
unchanged:
--- mousepad-0.2.2.orig/src/dnd.c
+++ mousepad-0.2.2/src/dnd.c
@@ -49,8 +49,8 @@
 	g_print("selection_data->length    = %d\n", selection_data->length);
 });	
 	
-	if (selection_data->data && g_strstr_len(selection_data->data, 5, "file:")) {
-		files = g_strsplit(selection_data->data, "\n" , 2);
+	if (selection_data->data && g_strstr_len((gchar *) selection_data->data, 5, "file:")) {
+		files = g_strsplit((gchar *) selection_data->data, "\n" , 2);
 		filename = g_filename_from_uri(files[0], NULL, NULL);
 		if (g_strrstr(filename, " ")) {
 			strs = g_strsplit(filename, " ", -1);
only in patch2:
unchanged:
--- mousepad-0.2.2.orig/src/selector.c
+++ mousepad-0.2.2/src/selector.c
@@ -418,8 +418,8 @@
 			g_free(selected_fi->charset);
 		if (selected_fi->manual_charset)
 			g_free(selected_fi->manual_charset);
-		selected_fi = NULL;
 		g_free(selected_fi);
+		selected_fi = NULL;
 	}
 	
 	gtk_widget_destroy(filesel);
only in patch2:
unchanged:
--- mousepad-0.2.2.orig/src/file.c
+++ mousepad-0.2.2/src/file.c
@@ -123,7 +123,7 @@
 	FILE *fp;
 	GtkTextIter start, end;
 	gchar *str;
-	gint rbytes, wbytes;
+	gsize rbytes, wbytes;
 	GError *err = NULL;
 	
 	GtkTextBuffer *textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));