diff -u libopenobex-1.5/debian/changelog libopenobex-1.5/debian/changelog
--- libopenobex-1.5/debian/changelog
+++ libopenobex-1.5/debian/changelog
@@ -1,15 +1,10 @@
-libopenobex (1.5-2build2) quantal; urgency=low
+libopenobex (1.5-2.1) unstable; urgency=low
 
-  * Rebuild for new armel compiler default of ARMv5t.
+  * Non-maintainer upload.
+  * Fix segfault when transferring files, closes: #699740.
+  * Update debian/watch, closes: #717458.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Fri, 05 Oct 2012 00:11:18 +0100
-
-libopenobex (1.5-2build1) lucid; urgency=low
-
-  * rebuild rest of main for armel armv7/thumb2 optimization;
-    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
-
- -- Alexander Sack <asac@ubuntu.com>  Sat, 06 Mar 2010 13:36:13 +0100
+ -- Joe Nahmias <jello@debian.org>  Tue, 23 Jul 2013 15:15:37 -0400
 
 libopenobex (1.5-2) unstable; urgency=low
 
diff -u libopenobex-1.5/debian/watch libopenobex-1.5/debian/watch
--- libopenobex-1.5/debian/watch
+++ libopenobex-1.5/debian/watch
@@ -4,2 +4,2 @@
-http://sf.net/openobex/openobex-([[:digit:]]*\.[[:digit:]]*)\.tar\.gz
-http://www.kernel.org/pub/linux/bluetooth/openobex-([[:digit:]]*\.[[:digit:]]*)\.tar\.[bg]z
+http://sf.net/openobex/openobex-(.+)-Source\.(?:zip|tar\.gz)  debian  uupdate
+http://sf.net/openobex/openobex-([0-9\.]+)\.tar\.gz  debian  uupdate
diff -u libopenobex-1.5/debian/patches/series libopenobex-1.5/debian/patches/series
--- libopenobex-1.5/debian/patches/series
+++ libopenobex-1.5/debian/patches/series
@@ -4,0 +5 @@
+fix-segfault_699740.patch
only in patch2:
unchanged:
--- libopenobex-1.5.orig/debian/patches/fix-segfault_699740.patch
+++ libopenobex-1.5/debian/patches/fix-segfault_699740.patch
@@ -0,0 +1,33 @@
+Description: Fix segfault when transferring files to smartphone
+ Handles when send() returns EAGAIN
+Author: z7z8th <ybzhao1989@gmail.com>
+Bug-Debian: http://bugs.debian.org/699740
+Reviewed-by: Joe Nahmias <jello@debian.org>
+Last-Update: 2013-07-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- libopenobex-1.5.orig/lib/obex_transport.c
++++ libopenobex-1.5/lib/obex_transport.c
+@@ -45,6 +45,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <errno.h>
+ 
+ #if defined(_WIN32)
+ #include <io.h>
+@@ -379,8 +380,12 @@
+ 		DEBUG(1, "sending %d bytes\n", size);
+ 
+ 		actual = write_func(fd, msg->data, size);
+-		if (actual <= 0)
+-			return actual;
++		if (actual <= 0) {
++			if (errno == EAGAIN)
++				actual = 0;
++			else
++				return actual;
++		}
+ 
+ 		/* Hide sent data */
+ 		buf_remove_begin(msg, actual);