diff -Nru trousers-0.3.5/debian/changelog trousers-0.3.5/debian/changelog
--- trousers-0.3.5/debian/changelog	2010-05-24 12:20:12.000000000 +0000
+++ trousers-0.3.5/debian/changelog	2010-07-14 20:00:43.000000000 +0000
@@ -1,3 +1,12 @@
+trousers (0.3.5-1ubuntu1) maverick; urgency=low
+
+  * Sync from debian unstable.  (LP: #600819) Remaining changes:
+    - Dropped Ubuntu patches.
+    - Using debian preinst.
+    - Use of debhelper7 rules exclusively as per Debian.
+
+ -- David Sugar <david.sugar@canonical.com>  Wed, 14 Jul 2010 15:49:23 -0400
+
 trousers (0.3.5-1) unstable; urgency=low
 
   * QA upload.
@@ -162,6 +171,34 @@
 
  -- Daniel Baumann <daniel@debian.org>  Sun, 03 May 2009 10:12:00 +0200
 
+trousers (0.3.1-7ubuntu4) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac@ubuntu.com>  Sun, 07 Mar 2010 01:09:29 +0100
+
+trousers (0.3.1-7ubuntu3) karmic; urgency=low
+
+  * Add 100_fix_gcc-4.4.dpatch to fix unaliased accesses.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Sun, 04 Oct 2009 01:24:28 +0200
+
+trousers (0.3.1-7ubuntu2) jaunty; urgency=low
+
+  * debian/rules: Install udev rules to /lib/udev/rules.d
+  * debian/preinst: Remove old version if unmodified
+  * debian/control: Add Breaks to ensure correct version of udev is used.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 12 Jan 2009 19:56:57 +0000
+
+trousers (0.3.1-7ubuntu1) jaunty; urgency=low
+
+  * debian/patches/99_autoreconnf.dpatch:
+    - added to fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 19 Nov 2008 18:17:56 +0100
+
 trousers (0.3.1-7) unstable; urgency=high
 
   * Also adding check for /dev/tpm* existence in stop section of the
@@ -228,3 +265,4 @@
   * Initial release (Closes: #409578).
 
  -- Daniel Baumann <daniel@debian.org>  Wed, 05 Dec 2007 19:42:00 +0100
+
diff -Nru trousers-0.3.5/debian/control trousers-0.3.5/debian/control
--- trousers-0.3.5/debian/control	2010-05-23 14:33:07.000000000 +0000
+++ trousers-0.3.5/debian/control	2010-07-14 20:01:35.000000000 +0000
@@ -1,14 +1,15 @@
 Source: trousers
 Section: admin
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev (>= 20100122.1), libssl-dev, libtool
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://trousers.sourceforge.net/
 
 Package: trousers
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6)
 Breaks: udev (<< 136-1)
 Description: open-source TCG Software Stack (daemon)
  TrouSerS is an implementation of the Trusted Computing Group's Software Stack