diff -u vde2-2.2.2/debian/changelog vde2-2.2.2/debian/changelog
--- vde2-2.2.2/debian/changelog
+++ vde2-2.2.2/debian/changelog
@@ -1,3 +1,12 @@
+vde2 (2.2.2-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, Ubuntu remaining changes (LP: #255637):
+    - src/{k,}vde_switch/{consmgmt.c,datasock.c},
+      src/{vde_plug2tap.c,wirefilter.c}:
+      include limits.h, fix FTBFS.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 07 Aug 2008 09:58:00 +0200
+
 vde2 (2.2.2-1) unstable; urgency=low
 
   [ Filippo Giunchedi ]
@@ -8,6 +17,16 @@
 
  -- Ludovico Gardenghi <garden@acheronte.it>  Tue, 08 Jul 2008 16:43:49 +0200
 
+vde2 (2.2.1-1ubuntu1) intrepid; urgency=low
+
+  * src/{k,}vde_switch/{consmgmt.c,datasock.c},
+    src/{vde_plug2tap.c,wirefilter.c}:
+    - Include limits.h, fix FTBFS.
+  * debian/control:
+    - Update Maintainer field as per spec.
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Thu, 10 Jul 2008 00:53:52 +0200
+
 vde2 (2.2.1-1) unstable; urgency=low
 
   * New upstream release
diff -u vde2-2.2.2/debian/control vde2-2.2.2/debian/control
--- vde2-2.2.2/debian/control
+++ vde2-2.2.2/debian/control
@@ -1,7 +1,8 @@
 Source: vde2
 Section: net
 Priority: optional
-Maintainer: Debian VSquare Team <pkg-vsquare-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VSquare Team <pkg-vsquare-devel@lists.alioth.debian.org>
 Uploaders: Ludovico Gardenghi <garden@acheronte.it>, Guido Trotter <ultrotter@debian.org>, Piotr Roszatycki <dexter@debian.org>, Filippo Giunchedi <filippo@debian.org>
 Build-Depends: debhelper (>= 5), libssl-dev, libpcap-dev
 Vcs-Svn: svn://svn.debian.org/pkg-vsquare/vde2/trunk
only in patch2:
unchanged:
--- vde2-2.2.2.orig/src/vde_plug2tap.c
+++ vde2-2.2.2/src/vde_plug2tap.c
@@ -16,6 +16,7 @@
 #include <stdarg.h>
 #include <syslog.h>
 #include <libgen.h>
+#include <limits.h>
 #define _GNU_SOURCE
 #include <getopt.h>
 
only in patch2:
unchanged:
--- vde2-2.2.2.orig/src/wirefilter.c
+++ vde2-2.2.2/src/wirefilter.c
@@ -31,6 +31,7 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <limits.h>
 
 #include <config.h>
 #include <vde.h>
only in patch2:
unchanged:
--- vde2-2.2.2.orig/src/kvde_switch/datasock.c
+++ vde2-2.2.2/src/kvde_switch/datasock.c
@@ -24,6 +24,7 @@
 #include <net/if.h>
 #include <stdarg.h>
 #include <grp.h>
+#include <limits.h>
 #define _GNU_SOURCE
 #include <getopt.h>
 
only in patch2:
unchanged:
--- vde2-2.2.2.orig/src/kvde_switch/consmgmt.c
+++ vde2-2.2.2/src/kvde_switch/consmgmt.c
@@ -24,6 +24,7 @@
 #include <getopt.h>
 #include <dlfcn.h>
 #include <time.h>
+#include <limits.h>
 
 #include <config.h>
 #include <vde.h>
only in patch2:
unchanged:
--- vde2-2.2.2.orig/src/vde_switch/datasock.c
+++ vde2-2.2.2/src/vde_switch/datasock.c
@@ -24,6 +24,7 @@
 #include <net/if.h>
 #include <stdarg.h>
 #include <grp.h>
+#include <limits.h>
 #define _GNU_SOURCE
 #include <getopt.h>
 
only in patch2:
unchanged:
--- vde2-2.2.2.orig/src/vde_switch/consmgmt.c
+++ vde2-2.2.2/src/vde_switch/consmgmt.c
@@ -23,6 +23,7 @@
 #include <stdarg.h>
 #include <getopt.h>
 #include <dlfcn.h>
+#include <limits.h>
 
 #include <config.h>
 #include <vde.h>