diff -u libmtp-1.0.2/debian/changelog libmtp-1.0.2/debian/changelog
--- libmtp-1.0.2/debian/changelog
+++ libmtp-1.0.2/debian/changelog
@@ -1,3 +1,10 @@
+libmtp (1.0.2-3ubuntu1) lucid; urgency=low
+
+  * Merge from debian unstable (LP: #564242), Ubuntu remaining changes:
+    - Provide an apport package hook.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 19 Apr 2010 07:12:49 +0200
+
 libmtp (1.0.2-3) unstable; urgency=low
 
   * Provide a -dbg package (Closes: #576966).
@@ -15,6 +22,13 @@
 
  -- Alessio Treglia <quadrispro@ubuntu.com>  Sat, 20 Feb 2010 20:45:08 +0100
 
+libmtp (1.0.2-1ubuntu1) lucid; urgency=low
+
+  * Re-sync with debian.
+  * Provide an apport package hook (LP: #430261).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 08 Feb 2010 14:34:52 +0100
+
 libmtp (1.0.2-1) unstable; urgency=low
 
   * New upstream release.
diff -u libmtp-1.0.2/debian/libmtp.install.in libmtp-1.0.2/debian/libmtp.install.in
--- libmtp-1.0.2/debian/libmtp.install.in
+++ libmtp-1.0.2/debian/libmtp.install.in
@@ -3,0 +4 @@
+../../debian/apport/* usr/share/apport/package-hooks/
only in patch2:
unchanged:
--- libmtp-1.0.2.orig/debian/apport/source_libmtp.py
+++ libmtp-1.0.2/debian/apport/source_libmtp.py
@@ -0,0 +1,38 @@
+'''apport package hook for libmtp
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+
+(c) 2009 Sense Hofstede <sense@qense.nl>
+'''
+
+def add_info(report, ui):
+    
+    ui.information('Please make sure the affected device is connected and on before continuing.')
+    
+    attach_related_packages(report, [
+        "hal",
+        "udev",
+        ])
+        
+    # Try using the mtp-detect command to obtain more information
+    if command_available("mtp-detect"):
+        report['MTPDetect'] = command_output("mtp-detect")
+    else:
+        ui.information("Please install the package 'mtp-tools' so we can gather "\
+                        "more detailed debugging information. Afterwards, rerun " \
+                        "the command 'ubuntu-bug libmtp8' or add more information "\
+                        "to an existing bug report by running the command "\
+                        "'apport-collect -p libmtp8 '<bugnumber>', replacing "\
+                        "<bugnumber> with the number of your bug report.")
+    
+    # Obtain information about changes to udev configuration files
+    attach_conffiles(report, "udev")
+    # Attach the udev log file
+    attach_file_if_exists(report, '/var/log/udev', 'UdevLog')
+    
+    # Get all connected USB devices
+    report['USBDevices'] = usb_devices()