diff -u libsyncml-0.5.4/debian/changelog libsyncml-0.5.4/debian/changelog
--- libsyncml-0.5.4/debian/changelog
+++ libsyncml-0.5.4/debian/changelog
@@ -1,3 +1,12 @@
+libsyncml (0.5.4-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libopenobex2-dev. (Closes: #811300)
+    Add patches/fix_build_with_libopenobex2.patch.
+  * Change B-D from libopenobex1-dev to libopenobex2-dev.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Mon, 01 Feb 2016 02:48:04 +0900
+
 libsyncml (0.5.4-2.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u libsyncml-0.5.4/debian/control libsyncml-0.5.4/debian/control
--- libsyncml-0.5.4/debian/control
+++ libsyncml-0.5.4/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Michael Banck <mbanck@debian.org>
-Build-Depends: debhelper (>= 7.0.0), quilt, doxygen, cmake, check, libopenobex1-dev (>= 1.2), libxml2-dev (>= 2.6.16), libglib2.0-dev (>= 2.6.0), libsoup2.4-dev, libwbxml2-dev (>= 0.9.2-2), libxml2-dev
+Build-Depends: debhelper (>= 7.0.0), quilt, doxygen, cmake, check, libopenobex2-dev (>= 1.7), libxml2-dev (>= 2.6.16), libglib2.0-dev (>= 2.6.0), libsoup2.4-dev, libwbxml2-dev (>= 0.9.2-2), libxml2-dev
 Standards-Version: 3.8.3
 
 Package: libsyncml2
diff -u libsyncml-0.5.4/debian/patches/series libsyncml-0.5.4/debian/patches/series
--- libsyncml-0.5.4/debian/patches/series
+++ libsyncml-0.5.4/debian/patches/series
@@ -2,0 +3 @@
+fix_build_with_libopenobex2.patch
only in patch2:
unchanged:
--- libsyncml-0.5.4.orig/debian/patches/fix_build_with_libopenobex2.patch
+++ libsyncml-0.5.4/debian/patches/fix_build_with_libopenobex2.patch
@@ -0,0 +1,53 @@
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/811300
+Forwarded: not-yet
+Last-Update: <2016-02-01>
+
+--- libsyncml-0.5.4.orig/libsyncml/transports/obex_client.c
++++ libsyncml-0.5.4/libsyncml/transports/obex_client.c
+@@ -881,8 +881,8 @@
+ 
+ 	} else if (env->type == SML_TRANSPORT_CONNECTION_TYPE_USB) {
+ 		smlTrace(TRACE_INTERNAL, "%s: connecting to usb interface %i", __func__, env->port);
+-		
+-		obex_intf_cnt = OBEX_FindInterfaces(env->obexhandle, &obex_intf);
++	
++		obex_intf_cnt = OBEX_EnumerateInterfaces(env->obexhandle);
+ 		smlTrace(TRACE_INTERNAL, "%s: found %i interfaces", __func__, obex_intf_cnt);
+ 		
+ 		if (obex_intf_cnt <= 0) {
+only in patch2:
+unchanged:
+--- libsyncml-0.5.4.orig/tools/syncml-obex-client.c
++++ libsyncml-0.5.4/tools/syncml-obex-client.c
+@@ -418,7 +418,7 @@
+ 	if (geteuid() != 0)
+ 		fprintf(stderr, "Superuser privileges are required to access complete USB information.\n");
+ 
+-	interfaces_number = OBEX_FindInterfaces(handle, &obex_intf);
++	interfaces_number = OBEX_EnumerateInterfaces(handle);
+ 	printf("Found %d USB OBEX interfaces\n", interfaces_number);
+ 	
+ 	for (i = 0; i < interfaces_number; i++)
+--- libsyncml-0.5.4.orig/libsyncml/transports/obex_client.c
++++ libsyncml-0.5.4/libsyncml/transports/obex_client.c
+@@ -716,7 +716,7 @@
+ 			env->obexhandle = OBEX_Init(OBEX_TRANS_BLUETOOTH, smlTransportObexClientEvent, 0);
+ 			break;
+ 		case SML_TRANSPORT_CONNECTION_TYPE_SERIAL:
+-			env->obexhandle = OBEX_Init(OBEX_TRANS_CUST, smlTransportObexClientEvent, 0);	
++			env->obexhandle = OBEX_Init(OBEX_TRANS_CUSTOM, smlTransportObexClientEvent, 0);	
+ 			break;
+ 		case SML_TRANSPORT_CONNECTION_TYPE_USB:
+ 			env->obexhandle = OBEX_Init(OBEX_TRANS_USB, smlTransportObexClientEvent, 0);
+--- libsyncml-0.5.4.orig/tools/syncml-ds-tool.c
++++ libsyncml-0.5.4/tools/syncml-ds-tool.c
+@@ -761,7 +761,7 @@
+ 	if (geteuid() != 0)
+ 		fprintf(stderr, "Superuser privileges are required to access complete USB information.\n");
+ 
+-	interfaces_number = OBEX_FindInterfaces(handle, &obex_intf);
++	interfaces_number = OBEX_EnumerateInterfaces(handle);
+ 	printf("Found %d USB OBEX interfaces\n", interfaces_number);
+ 	
+ 	for (i = 0; i < interfaces_number; i++)