diff -u gdb-6.8/debian/patches/series gdb-6.8/debian/patches/series
--- gdb-6.8/debian/patches/series
+++ gdb-6.8/debian/patches/series
@@ -15,0 +16 @@
+handle-nodebuginfo-better.patch -p0
diff -u gdb-6.8/debian/changelog gdb-6.8/debian/changelog
--- gdb-6.8/debian/changelog
+++ gdb-6.8/debian/changelog
@@ -1,3 +1,11 @@
+gdb (6.8-1ubuntu2) hardy; urgency=low
+
+  * Add patch from Michael Matz	to handle debug_info less frames better.
+    Origin of patch: https://bugzilla.novell.com/show_bug.cgi?id=390722#c25
+    (LP: #111869).
+
+ -- Robert Collins <robertc@robertcollins.net>  Sun, 25 May 2008 03:25:35 +1000
+
 gdb (6.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian; remaining changes:
only in patch2:
unchanged:
--- gdb-6.8.orig/debian/patches/handle-nodebuginfo-better.patch
+++ gdb-6.8/debian/patches/handle-nodebuginfo-better.patch
@@ -0,0 +1,17 @@
+--- gdb/i386-tdep.c.orig	2008-03-05 06:49:39.000000000 +1100
++++ gdb/i386-tdep.c	2008-05-25 04:05:15.000000000 +1000
+@@ -1023,11 +1023,13 @@
+ 	  /* This will be added back below.  */
+ 	  cache->saved_regs[I386_EIP_REGNUM] -= cache->base;
+ 	}
+-      else
++      else if (cache->pc)
+ 	{
+ 	  frame_unwind_register (next_frame, I386_ESP_REGNUM, buf);
+ 	  cache->base = extract_unsigned_integer (buf, 4) + cache->sp_offset;
+ 	}
++      else
++	cache->saved_regs[I386_EBP_REGNUM] = 0;
+     }
+ 
+   /* Now that we have the base address for the stack frame we can