diff -u xshodo-2.0/debian/control xshodo-2.0/debian/control
--- xshodo-2.0/debian/control
+++ xshodo-2.0/debian/control
@@ -1,9 +1,10 @@
 Source: xshodo
 Section: non-free/graphics
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 3.0.0), libx11-dev, libxmu-dev, libxt-dev, xutils, libxaw7-dev
-Standards-Version: 3.5.6
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Kenshi Muto <kmuto@debian.org>
+Build-Depends: debhelper (>> 3.0.0), libx11-dev, libxmu-dev, libxt-dev, xutils, libxaw7-dev, makedepend
+Standards-Version: 3.8.0
 
 Package: xshodo
 Architecture: any
diff -u xshodo-2.0/debian/changelog xshodo-2.0/debian/changelog
--- xshodo-2.0/debian/changelog
+++ xshodo-2.0/debian/changelog
@@ -1,9 +1,30 @@
+xshodo (2.0-13ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #297186)
+    - Add makedepend to Build-Depends.
+    - Bumped Standards-Version to 3.8.0
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 12 Nov 2008 19:04:18 +0530
+
 xshodo (2.0-13) unstable; urgency=low
 
   * Orphaned (#448112). Set maintainer to QA Group.
 
  -- Kenshi Muto <kmuto@debian.org>  Fri, 26 Oct 2007 15:29:22 +0900
 
+xshodo (2.0-12ubuntu2) intrepid; urgency=low
+
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification. (LP: #230350)
+
+ -- Andrea Colangelo <warp10@ubuntu.com>  Sun, 18 May 2008 01:52:51 +0200
+
+xshodo (2.0-12ubuntu1) dapper; urgency=low
+
+  * Add makedepend to Build-Depends.
+
+ -- Steve Kowalik <stevenk@debian.org>  Tue,  7 Feb 2006 23:24:45 +1100
+
 xshodo (2.0-12) unstable; urgency=medium
 
   * Fix FTBFS of xlibs-dev transition (closes: #346994)
@@ -78,0 +100 @@
+