diff -u xaw3d-1.5+E/debian/changelog xaw3d-1.5+E/debian/changelog
--- xaw3d-1.5+E/debian/changelog
+++ xaw3d-1.5+E/debian/changelog
@@ -1,9 +1,9 @@
-xaw3d (1.5+E-18.1ubuntu1) precise; urgency=low
+xaw3d (1.5+E-18.2) unstable; urgency=low
 
-  * Merge from Debian testing, remaining changes:
-    - build for multiarch.
+  * Non-maintainer upload with permission of Francesco Paolo Lovergine.
+  * Apply Multi-Arch patch.  Closes: #646194.
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 18 Dec 2011 14:06:09 -0800
+ -- Mark Hymers <mhy@debian.org>  Mon, 14 May 2012 21:54:41 +0000
 
 xaw3d (1.5+E-18.1) unstable; urgency=medium
 
@@ -14,12 +14,6 @@
 
  -- Alexander Reichle-Schmehl <tolimar@debian.org>  Fri, 02 Dec 2011 18:10:25 +0100
 
-xaw3d (1.5+E-18ubuntu1) precise; urgency=low
-
-  * Build for multiarch.
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 21 Oct 2011 21:22:26 -0700
-
 xaw3d (1.5+E-18) unstable; urgency=low
 
   * Removed old scripts still around in debian/ tree.
@@ -582,0 +577,3 @@
+Local variables:
+mode: debian-changelog
+End:
diff -u xaw3d-1.5+E/debian/control xaw3d-1.5+E/debian/control
--- xaw3d-1.5+E/debian/control
+++ xaw3d-1.5+E/debian/control
@@ -1,8 +1,7 @@
 Source: xaw3d
 Section: x11
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Francesco Paolo Lovergine <frankie@debian.org>
+Maintainer: Francesco Paolo Lovergine <frankie@debian.org>
 Build-Depends: debhelper (>= 8.1.3~), xutils-dev (>= 1:1.0.2-3), libx11-dev, libxmu-dev, libxpm-dev, libxt-dev, x11proto-core-dev, x11proto-xext-dev, 
  bison, flex-old|flex (>= 2.5.31-16), dpatch
 Standards-Version: 3.8.4
@@ -10,7 +9,7 @@
 Package: xaw3dg
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: axe (<< 6.1.2-2), xaw3d (<= 1.3-6), xfig (<< 1:3.2.4-rel-9), gv (<< 1:3.5.8-30.1)
 Description: Xaw3d widget set
only in patch2:
unchanged:
--- xaw3d-1.5+E.orig/source/format
+++ xaw3d-1.5+E/source/format
@@ -0,0 +1 @@
+1.0