diff -u crack-attack-1.1.14/debian/changelog crack-attack-1.1.14/debian/changelog
--- crack-attack-1.1.14/debian/changelog
+++ crack-attack-1.1.14/debian/changelog
@@ -1,3 +1,12 @@
+crack-attack (1.1.14-6ubuntu1.1) gutsy-proposed; urgency=low
+
+  * debian/patches/clicking-X-quits.patch:
+    Exit crack-attack, if "x" is clicked, patch from upstream CVS (LP: #114883)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Sun, 28 Oct 2007 01:48:10 +0200
+
 crack-attack (1.1.14-6ubuntu1) feisty; urgency=low
 
   * Merge from Debian unstable. Remaining Ubuntu change:
diff -u crack-attack-1.1.14/debian/control crack-attack-1.1.14/debian/control
--- crack-attack-1.1.14/debian/control
+++ crack-attack-1.1.14/debian/control
@@ -1,7 +1,8 @@
 Source: crack-attack
 Section: games
 Priority: optional
-Maintainer: Chris Boyle <cmb@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Chris Boyle <cmb@debian.org>
 Build-Depends: cdbs, debhelper (>= 4.1.0), x-dev, libxmu-dev, xlibmesa-gl-dev, glutg3-dev, xmlto, libxml2-utils, libgtk2.0-dev, libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.7.2
 
only in patch2:
unchanged:
--- crack-attack-1.1.14.orig/debian/patches/clicking-X-quits.patch
+++ crack-attack-1.1.14/debian/patches/clicking-X-quits.patch
@@ -0,0 +1,30 @@
+--- src/gtk-gui/gui_main.cxx	2005/05/01 03:04:12	1.10
++++ src/gtk-gui/gui_main.cxx	2005/05/24 04:33:53	1.11
+@@ -50,6 +50,18 @@
+ int glut_argc;
+ char **glut_argv;
+ 
++/* 
++ * Call this when the window is unexpectedly destroyed to make sure the
++ * hidden gui process doesn't hang around in the background.
++ */
++static void destroy_window(GtkObject *object, gpointer data) {
++#ifdef DEVELOPMENT
++	g_print("\nOh no! We've been nexpectedly destroyed! :(\n");
++#endif
++	gtk_main_quit();
++}
++
++
+ /*
+  * Documentation
+  *   html tables don't work right in explorer
+@@ -76,6 +88,8 @@
+     winCrackAttackSplash = create_winCrackAttackSplash ();
+ 		gui_data_read(winCrackAttackSplash);
+     gtk_widget_show (winCrackAttackSplash);
++		g_signal_connect(GTK_OBJECT(winCrackAttackSplash), "destroy",
++				G_CALLBACK(destroy_window), NULL);
+     gtk_main ();
+ 
+   return 0;