diff -u meanwhile-1.0.2/config.guess meanwhile-1.0.2/config.guess
diff -u meanwhile-1.0.2/config.sub meanwhile-1.0.2/config.sub
diff -u meanwhile-1.0.2/debian/changelog meanwhile-1.0.2/debian/changelog
--- meanwhile-1.0.2/debian/changelog
+++ meanwhile-1.0.2/debian/changelog
@@ -1,3 +1,10 @@
+meanwhile (1.0.2-3ubuntu1) intrepid; urgency=low
+
+  * src/st_list.c: apply patch from Martin Schwenke to avoid NULL pointer
+    dereference. (LP: #261695) 
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Wed, 17 Sep 2008 15:09:58 +0100
+
 meanwhile (1.0.2-3) unstable; urgency=low
 
   * updated standards version to 3.7.2
diff -u meanwhile-1.0.2/debian/control meanwhile-1.0.2/debian/control
--- meanwhile-1.0.2/debian/control
+++ meanwhile-1.0.2/debian/control
@@ -1,7 +1,8 @@
 Source: meanwhile
 Section: net
 Priority: optional
-Maintainer: Chris Vanden Berghe <chrisvdb@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Chris Vanden Berghe <chrisvdb@debian.org>
 Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, doxygen
 Standards-Version: 3.7.2
 
only in patch2:
unchanged:
--- meanwhile-1.0.2.orig/src/st_list.c
+++ meanwhile-1.0.2/src/st_list.c
@@ -662,7 +662,9 @@
   g_return_if_fail(b != NULL);
 
   mwString_get(b, &str);
-  list_get(str, l);
-  g_free(str);
+  if (str) {
+	  list_get(str, l);
+	  g_free(str);
+  }
 }