diff -u strace-4.5.15/debian/changelog strace-4.5.15/debian/changelog
--- strace-4.5.15/debian/changelog
+++ strace-4.5.15/debian/changelog
@@ -1,3 +1,11 @@
+strace (4.5.15-1.1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #182432), Ubuntu remaining changes:
+    - Add lpia as supported architecture
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Pedro Fragoso <emberez@gmail.com>  Sat, 12 Jan 2008 09:42:34 +0000
+
 strace (4.5.15-1.1) unstable; urgency=low
 
   * Porter NMU.
@@ -9,6 +17,13 @@
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jan 2008 23:54:49 -0500
 
+strace (4.5.15-1ubuntu1) gutsy; urgency=low
+
+  * Add lpia as supported architecture.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 31 Jul 2007 00:22:06 +0200
+
 strace (4.5.15-1) unstable; urgency=high
 
   [ Roland McGrath ]
@@ -583,6 +598,7 @@
   * Small patch for compilation on kernels 2.1.0 and later (see signal.c)
 
  -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>  Fri, 18 Oct 1996 00:28:47 +0200
+
 strace (3.1-5) stable unstable; urgency=LOW
 
   * Moved to new packagingformat
@@ -597,14 +613,12 @@
 
  -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>, Thu Sep 12 14:59:44 MET DST 1996
 
-
 strace (3.1-3) unstable; priority=LOW
 
   * Revamped debian files
 
  -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>, Thu Jul 11 20:19:11 MET DST 1996
 
-
 strace (3.1-2) unstable; priority=LOW
   * Added some #ifdef's around IPX stuff to make it compilable on non-Linux
     systems.
@@ -614,7 +628,6 @@
 
  -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>
 
-
 strace (3.1-1) unstable; priority=LOW
 
   * Moved to new upstream version
@@ -629,0 +643 @@
+
diff -u strace-4.5.15/debian/control strace-4.5.15/debian/control
--- strace-4.5.15/debian/control
+++ strace-4.5.15/debian/control
@@ -1,13 +1,14 @@
 Source: strace
 Section: utils
 Priority: standard
-Maintainer: Roland McGrath <frob@debian.org>
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Roland McGrath <frob@debian.org>
 Uploaders: Wichert Akkerman <wakkerma@debian.org>, Frederik Schüler <fs@debian.org>
 Build-Depends: libc6-dev (>= 2.2.2-1) [!alpha !ia64], libc6.1-dev (>= 2.2.2-1) [alpha ia64], libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], debhelper (>= 5.0.0)
 Standards-Version: 3.7.2
 
 Package: strace
-Architecture: alpha amd64 arm armel armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sh sparc
+Architecture: alpha amd64 arm armel armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sh sparc lpia
 Depends: ${shlibs:Depends}
 Description: A system call tracer
  strace is a system call tracer, i.e. a debugging tool which prints out
@@ -22,7 +23,7 @@
 Package: strace-udeb
 Section: debian-installer
 Priority: extra
-Architecture: alpha amd64 arm armel armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh sparc
+Architecture: alpha amd64 arm armel armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh sparc lpia
 Depends: ${shlibs:Depends}
 Description: A system call tracer
  strace is a system call tracer, i.e. a debugging tool which prints out