diff -u nicotine-1.2.10+dfsg/debian/control nicotine-1.2.10+dfsg/debian/control
--- nicotine-1.2.10+dfsg/debian/control
+++ nicotine-1.2.10+dfsg/debian/control
@@ -1,7 +1,8 @@
 Source: nicotine
 Section: net
 Priority: optional
-Maintainer: Josselin Mouette <joss@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
 Build-Depends: debhelper (>= 5), gettext, python-support (>= 0.4), quilt
 Standards-Version: 3.8.0
 Homepage: http://www.nicotine-plus.org/
diff -u nicotine-1.2.10+dfsg/debian/changelog nicotine-1.2.10+dfsg/debian/changelog
--- nicotine-1.2.10+dfsg/debian/changelog
+++ nicotine-1.2.10+dfsg/debian/changelog
@@ -1,3 +1,10 @@
+nicotine (1.2.10+dfsg-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #317063), remaining changes:
+    - 15_no_crash_on_unknown_config.patch (updated)
+
+ -- Michael Terry <michael.terry@canonical.com>  Tue, 12 May 2009 08:52:40 -0400
+
 nicotine (1.2.10+dfsg-1) unstable; urgency=low
 
   * New upstream release.
@@ -12,6 +19,14 @@
 
  -- Josselin Mouette <joss@debian.org>  Fri, 13 Mar 2009 12:19:29 +0100
 
+nicotine (1.2.9+dfsg-3ubuntu1) jaunty; urgency=low
+
+  * Add 15_no_crash_on_unknown_config.patch: resolve a hang with unknown
+    config options.  Thanks to Alex Magaz for the original patch.  
+    (LP: #254992) 
+
+ -- Brian Murray <brian@ubuntu.com>  Thu, 09 Apr 2009 13:02:41 -0700
+
 nicotine (1.2.9+dfsg-3) unstable; urgency=low
 
   * 13_migrate_oldconfig.patch: migrate configuration to the new server
@@ -276,0 +292 @@
+
diff -u nicotine-1.2.10+dfsg/debian/patches/series nicotine-1.2.10+dfsg/debian/patches/series
--- nicotine-1.2.10+dfsg/debian/patches/series
+++ nicotine-1.2.10+dfsg/debian/patches/series
@@ -7,0 +8 @@
+15_no_crash_on_unknown_config.patch
only in patch2:
unchanged:
--- nicotine-1.2.10+dfsg.orig/debian/patches/15_no_crash_on_unknown_config.patch
+++ nicotine-1.2.10+dfsg/debian/patches/15_no_crash_on_unknown_config.patch
@@ -0,0 +1,13 @@
+Index: nicotine-1.2.10+dfsg-1ubuntu1/pynicotine/config.py
+===================================================================
+--- nicotine-1.2.10+dfsg-1ubuntu1.orig/pynicotine/config.py	2009-05-12 08:53:47.000000000 -0400
++++ nicotine-1.2.10+dfsg-1ubuntu1/pynicotine/config.py	2009-05-12 08:54:36.000000000 -0400
+@@ -377,7 +377,7 @@
+ 			for j in self.parser.options(i):
+ 				val = self.parser.get(i, j, raw = 1)
+ 				if i not in self.sections.keys():
+-					message = "Unknown config section:", i
++					message = "Unknown config section: %s" % i
+ 					print message
+ 					if self.frame:
+ 						self.frame.logMessage(message)