diff -Nru simple-scan-2.31.91/debian/changelog simple-scan-2.31.91/debian/changelog
--- simple-scan-2.31.91/debian/changelog	2010-08-31 01:03:14.000000000 +0200
+++ simple-scan-2.31.91/debian/changelog	2010-09-04 12:57:05.000000000 +0200
@@ -1,3 +1,12 @@
+simple-scan (2.31.91-1ubuntu1) maverick; urgency=low
+
+  * Merge with Debian experimental (LP: #628773), remaining changes:
+    - Remove Vcs fields (lp:ubuntu/simple-scan is used).
+    - Enable liblaunchpad-integration support.
+    - Install apport hook.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sat, 04 Sep 2010 12:57:05 +0200
+
 simple-scan (2.31.91-1) experimental; urgency=low
 
   * Imported Upstream version 2.31.91
@@ -5,6 +14,25 @@
 
  -- Alessio Treglia <alessio@debian.org>  Tue, 31 Aug 2010 01:03:07 +0200
 
+simple-scan (2.31.91-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Mon, 30 Aug 2010 11:13:49 +1000
+
+simple-scan (2.31.90.2-1ubuntu1) maverick; urgency=low
+
+  * Merge with Debian unstable, remaining Ubuntu changes:
+  * debian/control:
+    - Build-depend on liblaunchpad-integration-dev
+    - Add Vcs-Bzr link
+  * debian/install:
+    - Install apport hook.
+  * debian/patches/01_lpi.patch:
+    - Add Launchpad integration
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 24 Aug 2010 11:52:57 +1000
+
 simple-scan (2.31.90.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
diff -Nru simple-scan-2.31.91/debian/control simple-scan-2.31.91/debian/control
--- simple-scan-2.31.91/debian/control	2010-08-16 14:42:00.000000000 +0200
+++ simple-scan-2.31.91/debian/control	2010-09-04 12:56:36.000000000 +0200
@@ -1,7 +1,8 @@
 Source: simple-scan
 Section: gnome
 Priority: optional
-Maintainer: Alessio Treglia <alessio@debian.org>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alessio Treglia <alessio@debian.org>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 7.0.50~),
  gnome-pkg-tools (>= 0.10),
@@ -16,10 +17,9 @@
  libsane-dev,
  zlib1g-dev,
  libjpeg62-dev,
+ liblaunchpad-integration-dev,
  intltool
 Homepage: https://launchpad.net/simple-scan
-Vcs-Git: git://git.debian.org/collab-maint/simple-scan.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/simple-scan.git
 
 Package: simple-scan
 Architecture: any
diff -Nru simple-scan-2.31.91/debian/install simple-scan-2.31.91/debian/install
--- simple-scan-2.31.91/debian/install	1970-01-01 01:00:00.000000000 +0100
+++ simple-scan-2.31.91/debian/install	2010-09-04 12:56:22.000000000 +0200
@@ -0,0 +1 @@
+debian/source_simple-scan.py usr/share/apport/package-hooks/
diff -Nru simple-scan-2.31.91/debian/patches/series simple-scan-2.31.91/debian/patches/series
--- simple-scan-2.31.91/debian/patches/series	2010-08-31 01:08:10.000000000 +0200
+++ simple-scan-2.31.91/debian/patches/series	2010-09-04 12:56:22.000000000 +0200
@@ -1,2 +1,2 @@
 01-zlib.patch
-# 20-lpi.patch
+20-lpi.patch