Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-3 from Debian

Bug #315679 reported by spitfire
18
This bug affects 1 person
Affects Status Importance Assigned to Milestone
libmtp (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Newest version of libmtp is 0.3.6, libmtp in jaunty is 0.3.0, plese bump it.
Debian tag direcory is available at svn://svn.debian.org/svn/private/rafael/deb-pkg/libmtp/trunk

Revision history for this message
spitfire (mieszkoslusarczyk) wrote :

For now it is available in experimental as a tarball.
http://packages.debian.org/source/experimental/libmtp

Revision history for this message
spitfire (mieszkoslusarczyk) wrote : Re: Please sync libmtp 0.3.0-1ubuntu3 (main) to 0.3.5-1 from Debian (experimental)

In libmtp 0.3.5 developers had repaired some low-level issues, and seriously improved performance.

Revision history for this message
Savvas Radevic (medigeek) wrote :

They seem to have a lot of changes from 0.3.0 release (2008-06-24) to 0.3.5 (2008-12-21):
http://libmtp.cvs.sourceforge.net/viewvc/*checkout*/libmtp/libmtp/ChangeLog?revision=1.435

I'm confirming. :)

Changed in libmtp:
status: New → Confirmed
Changed in libmtp:
importance: Undecided → Wishlist
Revision history for this message
spitfire (mieszkoslusarczyk) wrote :

New libmtp is available for testing in my PPA (https://edge.launchpad.net/~mieszkoslusarczyk/+archive/ppa/).

Revision history for this message
Daniel Holbach (dholbach) wrote :

To me it looks like this needs to be merged. Can you check again?

 - in Debian there's 0.3.6-1 is available already
 - in Ubuntu at least this change needs to be merged: "Add Breaks to ensure the right verison of udev gets used."

Revision history for this message
Savvas Radevic (medigeek) wrote :

Hm.. that's right, it needs merge - spitfire, sorry for the wrong suggestion.
Anyone to merge this?
(It's too much for my knowledge currently)

Revision history for this message
exactt (giesbert) wrote : Re: Please sync libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian (experimental)

packages for hardy would also be highly appreciated! thx guys!

description: updated
Revision history for this message
Savvas Radevic (medigeek) wrote :

exactt, we need someone to package it first, there are a lot of patches to be updated for this.

Revision history for this message
spitfire (mieszkoslusarczyk) wrote :

I have this one in my PPA, (along with mtpfs) and haven't seen any issues.

Revision history for this message
Daniel Holbach (dholbach) wrote : Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian (experimental)

spitfire: There's 0.3.5-1~intrepid1 , but where's the merge of 0.3.6-1?

Revision history for this message
spitfire (mieszkoslusarczyk) wrote :
Revision history for this message
Savvas Radevic (medigeek) wrote :

Hm, daniel, is it possible that it doesn't require the ubuntu-specific patches anymore?

Revision history for this message
Daniel Holbach (dholbach) wrote :

Savvas: it could be, but I'd expect you guys to check it before I review it. :-))

Revision history for this message
spitfire (mieszkoslusarczyk) wrote :

Savvas, Daniel: I can push it to another, separate PPA, for testing it you want.

Revision history for this message
Daniel Holbach (dholbach) wrote :

This definitely needs merging: https://wiki.ubuntu.com/UbuntuDevelopment/Merging

Please
 - post a debdiff between the Debian experimental version and your proposed version
 - make it 0.3.6-1ubuntu1 instead of 0.3.6-1~jaunty1
 - add (LP: #315679) to the changelog entry

Revision history for this message
spitfire (mieszkoslusarczyk) wrote :

Here it is, I hope it's ok.

Revision history for this message
Daniel Holbach (dholbach) wrote :

You're not including:
 - old changelogs
 - the changes that were made in the last Ubuntu uploads
 - documentation of what's still necessary to merge from Ubuntu

Please check out https://wiki.ubuntu.com/UbuntuDevelopment/Merging

Revision history for this message
Savvas Radevic (medigeek) wrote :

Daniel, can you unsubscribe the main sponsors for now?
Until one of us or someone else get this resolved? This can take a while unfortunately.

Revision history for this message
Savvas Radevic (medigeek) wrote :

I've done some work, still not done though:
https://code.edge.launchpad.net/~medigeek/libmtp/bug-315679

1) Should rules be updated?
-install/libmtp$(SOVERSION)::
- install -D -m 644 libmtp$(SOVERSION).rules debian/libmtp$(SOVERSION)/lib/udev/rules.d/45-libmtp$(SOVERSION).rules
-

2) Is ./libmtp.postinst.in necessary?
(libmtp.install.in exists and adds the udev rules)

3) Is the correct conf at /etc/udev/libmtp@SOVERSION@.rules or /etc/udev/rules.d/45-libmtp@SOVERSION@.rules ?
(libmtp.postinst.in)

Revision history for this message
Savvas Radevic (medigeek) wrote :

I've built a package in my PPA:
- https://launchpad.net/~medigeek/+archive/ppa
- https://launchpad.net/%7Emedigeek/+archive/ppa/+files/libmtp_0.3.6-1ubuntu1.diff.gz
https://launchpad.net/%7Emedigeek/+archive/ppa/+files/libmtp_0.3.6-1ubuntu1.dsc
https://launchpad.net/%7Emedigeek/+archive/ppa/+files/libmtp_0.3.6.orig.tar.gz
- https://launchpad.net/%7Emedigeek/+archive/ppa/+files/libmtp_0.3.0-1ubuntu3_0.3.6-1ubuntu1.diff.gz

 I have kept "install/libmtp$(SOVERSION)::" in debian/rules and kept debian/libmtp.postinst.in

 I would however like to get some feedback on question (3), because I have my doubts if these extra steps for udev rules are required. I mean, I could directly set the udev rules to be installed as /etc/udev/rules.d/45-libmtp@SOVERSION@.rules (if /etc/udev/libmtp@SOVERSION@.rules isn't required that is)

Revision history for this message
Daniel Holbach (dholbach) wrote :

A few things:
 - You're throwing away all the debian/changelog entries of the experimental version.
 - The changelog does not specify the Ubuntu specific changes we still have: https://wiki.ubuntu.com/UbuntuDevelopment/Merging#Outline%20of%20Algorithm%20for%20Tackling%20Merges

Revision history for this message
Savvas Radevic (medigeek) wrote :

Revision #3:
https://code.launchpad.net/~medigeek/libmtp/bug-315679

Package:
libmtp 0.3.6-1ubuntu1~ppajaunty1
http://launchpadlibrarian.net/22437686/libmtp_0.3.6-1ubuntu1~ppajaunty1_source.changes
http://ppa.launchpad.net/medigeek/ppa/ubuntu/pool/main/libm/libmtp/libmtp_0.3.6-1ubuntu1~ppajaunty1.dsc
http://ppa.launchpad.net/medigeek/ppa/ubuntu/pool/main/libm/libmtp/libmtp_0.3.6-1ubuntu1~ppajaunty1.diff.gz

I marked some libmtp version checks for older versions as "ubuntu hardy", makes it easier to follow.
Yet I still have my doubts about some ubuntu changes.

The control file says "Breaks: udev (<< 136-1)" which makes libmtp work only for 9.04 jaunty or later releases.
If that is the case, then libmtp older version checks in preinst and postinst scripts could probably be removed.
Help!! :)

Revision history for this message
Luke Yelavich (themuso) wrote :

This PPA version, http://ppa.launchpad.net/medigeek/ppa/ubuntu/pool/main/libm/libmtp/libmtp_0.3.6-1ubuntu1~ppajaunty1.dsc still doesn't have the changelog entries that it needs. The changelog entries in question are the ones from the debian package, such as for this change:

libmtp (0.3.6-1) experimental; urgency=low

  * New upstream release
  * debian/watch: Use the qa.debian.org SF redirector URL

 -- Rafael Laboissiere <email address hidden> Thu, 22 Jan 2009 22:44:49 +0100

That complete text needs to be in debian/changelog to be avalid merge.

Revision history for this message
Savvas Radevic (medigeek) wrote : Re: [Bug 315679] Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian (experimental)

It does:

+++ libmtp-0.3.6/debian/changelog
@@ -0,0 +1,355 @@
+libmtp (0.3.6-1ubuntu1~ppajaunty1) jaunty; urgency=low
+
+ * Merged with Debian. Changes are:
+ + New upstream release (LP: #315679)
+ + debian/watch: Use the qa.debian.org SF redirector URL

I don't understand much, this is my first merge :) Neither MoM nor DaD
had libmtp to get me started.
Can someone take over from here? If it's only the changelog, it should
be easy to apply the appropriate format.

Revision history for this message
Savvas Radevic (medigeek) wrote : Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian (experimental)

If you mean this:
   * debian/rules: Clean src/_stdint.h file, which is created by configure
     but not cleaned by make distclean, as it should

This was removed in debian svn #1399:
http://svn.debian.org/wsvn/private/rafael/deb-pkg/libmtp/trunk/debian/?rev=1399&sc=1

Debian svn #1403 represents 0.3.6-1:
http://svn.debian.org/wsvn/private/rafael/deb-pkg/libmtp/trunk/debian/?rev=1403&sc=1

Revision history for this message
Savvas Radevic (medigeek) wrote :

OK, I understood what is necessary (thanks to RAOF in #ubuntu-motu)!
I'll try merge the changelog properly now :)

Revision history for this message
Savvas Radevic (medigeek) wrote :
Revision history for this message
Saivann Carignan (oxmosys) wrote :

Jaunty would really have benefit if this bug is fixed in time. Also, Bug 352852 needs this to be fixed. Ubuntu sponsors for main : any thoughts on this?

Revision history for this message
Savvas Radevic (medigeek) wrote : Re: [Bug 315679] Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian (experimental)

Since it took me so long to learn about the upgrading process, libmtp
0.3.7-1 is in Debian experimental now, if anyone wants to take over to
update this, please do. :)

But before doing any work on this, I'd like to know if the main
sponsors are interested in approving this merge for jaunty. If not, we
could just wait for next release, karmic instead of doing unnecessary
extra work. :)

Revision history for this message
Steve Langasek (vorlon) wrote : Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian (experimental)

Hi Savvas,

Of course, this has missed the deadline for jaunty now. :) Are you interested in following through on this merge, now that 0.3.7-3 is in unstable (and therefore listed on MoM)?

Revision history for this message
Savvas Radevic (medigeek) wrote : Re: [Bug 315679] Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian (experimental)

> Of course, this has missed the deadline for jaunty now. :)  Are you
> interested in following through on this merge, now that 0.3.7-3 is in
> unstable (and therefore listed on MoM)?

I'll take it if it's not time-sensitive! (Probably next week)

Revision history for this message
Martin Pitt (pitti) wrote : Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-1 from Debian

Unsubscribing sponsors for now, there isn't a merge to upload right now.

Savvas, if you want to do this because you are interested in the package and have a device to test this, please go ahead. Perhaps you can include the patch in bug 306410 while you are at it?

If you aren't interested in this, I can do the merge next week.

summary: - Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.6-1 from Debian
- (experimental)
+ Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-1 from Debian
Revision history for this message
Savvas Radevic (medigeek) wrote :

@spitfire: Do you have a device to test a potential package? I don't have a device anymore, so I could use a tester. :)

The patch is actually pretty straight-forward and MoM service merged it correctly. (It probably just needs updating those checks for the configuration files to be moved to the proper folder, I'll check that).

The only thing I am afraid of is that "Breaks: udev (<< 136-1)" - would that affect an upgrade say from ubuntu 8.04 -> 10.04? Or is dpkg smart enough to upgrade the udev package first?

Revision history for this message
Savvas Radevic (medigeek) wrote :

@Martin: I'll check it this weekend and let you know!

Revision history for this message
Martin Pitt (pitti) wrote : Re: [Bug 315679] Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-1 from Debian

Savvas Radevic [2009-05-04 16:28 -0000]:
> The patch is actually pretty straight-forward and MoM service merged it
> correctly. (It probably just needs updating those checks for the
> configuration files to be moved to the proper folder, I'll check that).

They shouldn't need any change.

> The only thing I am afraid of is that "Breaks: udev (<< 136-1)" - would
> that affect an upgrade say from ubuntu 8.04 -> 10.04? Or is dpkg smart
> enough to upgrade the udev package first?

That's the purpose of breaks. (Actually it's apt, but that's what you
mean). You can just keep this.

Revision history for this message
spitfire (mieszkoslusarczyk) wrote : Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-1 from Debian

@Savvas: yes I still got that device, but not ubuntu anymore. Will the pachage be tested with 9.04 or with upcoming dev release?

Revision history for this message
Savvas Radevic (medigeek) wrote : Re: [Bug 315679] Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-1 from Debian

> @Savvas: yes I still got that device, but not ubuntu anymore. Will the
> pachage be tested with 9.04 or with upcoming dev release?

Well, as it is now there aren't many changes (as far as I know), so
I'll make both in an experimental PPA and let you know. Cheers!

Revision history for this message
Savvas Radevic (medigeek) wrote : Re: Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-1 from Debian

 libmtp (0.3.7-3ubuntu1) karmic; urgency=low

   [ Savvas Radevic ]
   * Merge from debian unstable, remaining changes:
     + debian/control: Add Breaks to ensure the right udev version gets used.
     + debian/libmtp.install.in, debian/libmtp.preinst.in,
       debian/libmtp.postinst.in: Clean up the mess where files were still
       going into the wrong directory.
   * debian/libmtp.preinst.in: Dropped check on unsupported 0.2.5-1 (hardy has
     0.2.6.1-2ubuntu1)

   [ Flávio Martins ]
   * debian/rules: Append proper prefix 45- to libmtp rules in UDEV variable
   * debian/libmtp.install.in: ../../45-libmtp@SOVERSION@.rules lib/udev/rules.d

Builds under way:
https://launchpad.net/~medigeek/+archive/experimental/+sourcepub/607108/+listing-archive-extra
https://launchpad.net/~medigeek/+archive/experimental/+sourcepub/607111/+listing-archive-extra

summary: - Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-1 from Debian
+ Please merge libmtp 0.3.0-1ubuntu3 (main) to 0.3.7-3 from Debian
Revision history for this message
Savvas Radevic (medigeek) wrote :

Sorry, I forgot to append (LP: #315679)
The fix is released for karmic:
https://launchpad.net/ubuntu/+source/libmtp/0.3.7-3ubuntu1

libmtp (0.3.7-3ubuntu1) karmic; urgency=low

  [ Savvas Radevic ]
  * Merge from debian unstable, remaining changes:
    + debian/control: Add Breaks to ensure the right udev version gets used.
    + debian/libmtp.install.in, debian/libmtp.preinst.in,
      debian/libmtp.postinst.in: Clean up the mess where files were still
      going into the wrong directory.
  * debian/libmtp.preinst.in: Dropped check on unsupported 0.2.5-1 (hardy has
    0.2.6.1-2ubuntu1)

  [ Flávio Martins ]
  * debian/rules: Append proper prefix 45- to libmtp rules in UDEV variable
  * debian/libmtp.install.in: ../../45-libmtp@SOVERSION@.rules lib/udev/rules.d

It failed on ia64 though:
https://launchpad.net/ubuntu/+source/libmtp/0.3.7-3ubuntu1/+build/988154
http://launchpadlibrarian.net/26345595/buildlog_ubuntu-karmic-ia64.libmtp_0.3.7-3ubuntu1_FAILEDTOBUILD.txt.gz

Changed in libmtp (Ubuntu):
status: Confirmed → Fix Released
Revision history for this message
Savvas Radevic (medigeek) wrote :

I've submitted to debian the changes, for future reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527108

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Bug attachments

Remote bug watches

Bug watches keep track of this bug in other bug trackers.