=== modified file 'debian/changelog'
--- debian/changelog	2016-10-05 20:19:09 +0000
+++ debian/changelog	2016-10-05 20:19:17 +0000
@@ -1,3 +1,10 @@
+network-manager-openvpn (1.2.6-2ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian (LP: #1629132) Remaining changes:
+    - Allow the "udp6" and "tcp6" protocols to be passed through to OpenVPN.
+
+ -- Aron Xu <happyaron@ubuntu.com>  Thu, 06 Oct 2016 04:12:06 +0800
+
 network-manager-openvpn (1.2.6-2) unstable; urgency=medium
 
   * Don't run the tests in parallel for now until bgo#772464 is fixed.

=== modified file 'debian/control'
--- debian/control	2016-10-05 20:17:31 +0000
+++ debian/control	2016-10-05 20:19:17 +0000
@@ -1,7 +1,8 @@
 Source: network-manager-openvpn
 Section: net
 Priority: optional
-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper (>= 10),
                intltool,

=== added file 'debian/patches/Support-IPv6-Servers.patch'
--- debian/patches/Support-IPv6-Servers.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Support-IPv6-Servers.patch	2016-10-05 20:19:17 +0000
@@ -0,0 +1,31 @@
+This allows the user to set the udp6 and tcp6 protocols and have
+NetworkManager pass them through to OpenVPN.
+
+Index: network-manager-openvpn-1.2.6/properties/nm-openvpn-editor.c
+===================================================================
+--- network-manager-openvpn-1.2.6.orig/properties/nm-openvpn-editor.c
++++ network-manager-openvpn-1.2.6/properties/nm-openvpn-editor.c
+@@ -100,7 +100,7 @@ check_gateway_entry (const char *str)
+ 				goto out;
+ 		}
+ 		/* check proto */
+-		if (proto && strcmp (proto, "udp") && strcmp (proto, "tcp"))
++		if (proto && strcmp (proto, "udp") && strcmp (proto, "tcp") && strcmp (proto, "udp6") && strcmp (proto, "tcp6"))
+ 			goto out;
+ 	}
+ 	success = TRUE;
+Index: network-manager-openvpn-1.2.6/src/nm-openvpn-service.c
+===================================================================
+--- network-manager-openvpn-1.2.6.orig/src/nm-openvpn-service.c
++++ network-manager-openvpn-1.2.6/src/nm-openvpn-service.c
+@@ -1229,6 +1229,10 @@ nm_openvpn_start_openvpn_binary (NMOpenv
+ 					add_openvpn_arg (args, proto);
+ 				else if (!strcmp (proto, "tcp"))
+ 					add_openvpn_arg (args, "tcp-client");
++				else if (!strcmp (proto, "udp6"))
++					add_openvpn_arg (args, proto);
++				else if (!strcmp (proto, "tcp6"))
++					add_openvpn_arg (args, proto);
+ 				else {
+ 					g_set_error (error,
+ 					             NM_VPN_PLUGIN_ERROR,

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-10-05 20:17:31 +0000
+++ debian/patches/series	2016-10-05 20:19:17 +0000
@@ -0,0 +1,1 @@
+Support-IPv6-Servers.patch