diff -u dvswitch-0.8.3.1/debian/control dvswitch-0.8.3.1/debian/control
--- dvswitch-0.8.3.1/debian/control
+++ dvswitch-0.8.3.1/debian/control
@@ -1,5 +1,6 @@
 Source: dvswitch
-Maintainer: Ben Hutchings <ben@decadent.org.uk>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Section: video
 Priority: extra
 Build-Depends: debhelper (>= 5), libasound2-dev, libavcodec-dev, pkg-config, libgtkmm-2.4-dev, libboost-dev, libboost-thread-dev, libxv-dev, cmake
diff -u dvswitch-0.8.3.1/debian/changelog dvswitch-0.8.3.1/debian/changelog
--- dvswitch-0.8.3.1/debian/changelog
+++ dvswitch-0.8.3.1/debian/changelog
@@ -1,3 +1,11 @@
+dvswitch (0.8.3.1-1ubuntu1) maverick; urgency=low
+
+  * Build with -D__STDC_CONSTANT_MACROS to fix FTBFS (LP: #598118)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 24 Jun 2010 20:24:07 +0530
+
 dvswitch (0.8.3.1-1build1) lucid; urgency=low
 
   * rebuild for ffmpeg versioned symbols
diff -u dvswitch-0.8.3.1/debian/rules dvswitch-0.8.3.1/debian/rules
--- dvswitch-0.8.3.1/debian/rules
+++ dvswitch-0.8.3.1/debian/rules
@@ -6,7 +6,7 @@
 else
 CFLAGS += -O2
 endif
-export CXXFLAGS := $(CFLAGS)
+export CXXFLAGS := $(CFLAGS) -D__STDC_CONSTANT_MACROS
 
 build : build/Makefile
 	make -C build