[Bug 625327] Re: Sync libmtp (main) 1.0.3-2 from Debian experimental (main)

[Alessio Treglia]

** Attachment added: "libmtp_1.0.3-2.contents"
   https://bugs.edge.launchpad.net/ubuntu/+source/libmtp/+bug/625327/+attachment/1523015/+files/libmtp_1.0.3-2.contents

-- 
Sync libmtp (main) 1.0.3-2 from Debian experimental (main)
https://bugs.launchpad.net/bugs/625327
You received this bug notification because you are a member of Ubuntu
Sponsors Team, which is a direct subscriber.

Status in “libmtp” package in Ubuntu: New

Bug description:
Latest changelog entry says the following:

libmtp (1.0.3-2) experimental; urgency=low

  * Install apport package hooks only if system is Ubuntu.
  * Build-Depends on lsb-release.
  * Remove unnecessary DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL for
    device Creative ZEN 041E:4157 (Closes: #520961).
  * Add device entry for the device ID 041E:4133 Creative ZEN MicroPhoto;
    Closes: #594560; LP: #537386
  * mtp-connect should not return exit status 0 regardless if the
    connect was successful; Closes: #594565, LP: #620814
  * Update series file.
  * Purge ancient /etc/udev/rules.d/65-libmtp.rules conffile; LP: #506791.
  * Remove broken link /etc/udev/rules.d/libmtp7.rules, libmtp7
    leftover.
  * debian/control{,.in}:
    - Change my email address.
    - Bump Standards.
    - Remove DM-Upload-Allowed: yes.
  * Add debian/gbp.conf file.
  * Add .gitignore file.

 -- Alessio Treglia <alessio at debian.org>  Fri, 27 Aug 2010 14:21:06 +0200

I've put a small trick in debian/rules to drop the delta between Debian and Ubuntu so now the package can be re-sync'ed:

diff --git a/debian/rules b/debian/rules
index ba8e01b..f7b3c7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ SUBSTFILES = debian/libmtp$(SOVERSION).docs   \
        debian/libmtp$(SOVERSION).preinst       \
        debian/libmtp$(SOVERSION).postinst
 UDEVFILES = 45-libmtp$(SOVERSION).rules 20-libmtp$(SOVERSION).fdi
+DISTRIBUTION = $(shell lsb_release -i | cut -f2 -d':')
 
 debdir = $(CURDIR)/debian
 debver = $(shell perl -ne '/([\d.-]+)/;print "$$1"; last' \
@@ -40,6 +41,13 @@ install/libmtp-doc::
 binary-install/libmtp-dev::
        rm -f debian/libmtp-dev/usr/lib/libmtp.la
 
+binary-install/libmtp$(SOVERSION)::
+       if [ ${DISTRIBUTION} = 'Ubuntu' ]; then \
+               mkdir -p $(debdir)/libmtp$(SOVERSION)/usr/share/apport/package-h
+               install -m 0644 $(debdir)/apport/* \
+                       $(debdir)/libmtp$(SOVERSION)/usr/share/apport/package-ho
+       fi
+
 build/libmtp$(SOVERSION)::
        # Fix mode of udev lifting script
        chmod +x libmtp.sh




The buildlog is attached.