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

[Soren Hansen]

ACK, looks good to me.

-- 
Sync libmtp (main) 1.0.3-4 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:
Please sync libmtp (main) 1.0.3-4 from Debian experimental (main)

Latest changelog entries say the following:

libmtp (1.0.3-4) experimental; urgency=low

  * New device: Wyplay Wyplayer 1e53:0007.
  * Refresh patches.

libmtp (1.0.3-3) experimental; urgency=low

  * Rename, refresh and re-organize patches.
  * debian/patches/01-devices_small_fixes.patch:
    - Fix Blackberry's name.
    - Fix Sony DCR-SR75 device ID.
    - Add flag to mark Samsung M7600 Beat/GT-S8300T as unable to read
      the battery status.
    - Add DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST flag to LG KM900.
  * New devices now supported:
    - Apple iPhone 05ac:0x1290
    - Apple iPod Touch 1st Gen 05ac:1291
    - Apple iPhone 3G 05ac:0x1292
    - Apple iPod Touch 2nd Gen 05ac:0x1293
    - Apple iPhone 3GS 05ac:0x1294
    - Apple 05ac:1296
    - Apple 05ac:1297
    - Apple 05ac:1298
    - Apple iPod Touch 3rd Gen 05ac:0x1299
    - Apple iPad 05ac:129a
    - SonyEricsson U5 0fce:0133
    - Samsung Galaxy S GT-I9000 04e8:6877
    - Samsung Vibrant SGH-T959 04e8:68a9
    - COBY MP705 1e74:6512
    - Cowon iAudio J3 0e21:0921
    - Motorola Droid X 22b8:41d6
  * debian/patches/03-ogg_flags.patch:
    - Set proper Ogg flags on some Cowon and Samsung devices.
  * debian/patches/04-autoremove_oggflac_unkn_flags.patch:
    - If the Ogg or FLAC filetypes have been flagged as being stored as
      unknown and the device now indicates it supports them then remove
      the flag.

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, 03 Sep 2010 19:18:19 +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.