libmtp7 -> libmtp8 transition

[Rafael Laboissiere <rafael@debian.org>]

I hereby request the authorization to upload libmtp 0.3.6 to unstable.
Since version 0.3.0-1 of the package, uploaded to experimental on June 30,
2008, the SOVERSION was bumped to libmtp8.  The current version in unstable
(0.2.6.1-3) has libmtp7.

I looked at the packages that build-depend on libmtp-dev.  Here is the
current situation:

* amarok

  The version currently in experimental (2.0.1.1-1) depends already on
  libmtp8.  Nothing to do here.

* audacious-plugins

  Version 1.5.1-2 needs a patch to src/mtp_up/mtp.c like the one attached
  below.  The package compiles fine but I did not tested it with an MTP
  device.

* banshee

  I could not build this package in my sid/experimental system because of a
  complex web of dependencies starting with cli-common-dev.  However, Ubuntu
  intrepid has version 1.2.1-3ubuntu1 that depends on libmtp8.
  
* gnomad2  

  Ubuntu has already done the transition since intrepid (version
  2.9.1-1ubuntu1).  I advice to just apply the Ubuntu patch [1] to the
  Debian package.
  [1] http://archive.ubuntu.com/ubuntu/pool/universe/g/gnomad2/gnomad2_2.9.1-1ubuntu1.diff.gz

* mtpfs

  Version 0.9 currently in experimental builds fine without changes against
  libmtp-dev 0.3.6.

* rhythmbox  
  
  Version 00.11.6-1 needs a patch to plugins/mtpdevice/rb-mtp-source.c like
  the one attached below.  The package compiles fine but I did not tested it
  with an MTP device.
  
If nobody objects, I will upload libmtp 0.3.6 to unstable in the next days.
If the maintainers of the packages mentioned above take too much time to
react, I will file appropriate bug reports.

Thanks,

-- 
Rafael Laboissiere

--- audacious-plugins-1.5.1.orig/src/mtp_up/mtp.c
+++ audacious-plugins-1.5.1/src/mtp_up/mtp.c
@@ -182,7 +182,6 @@
 {
     int ret;
     gchar *tmp, *from_path = NULL, *filename;
-    uint32_t parent_id = 0;
     LIBMTP_track_t *gentrack;
     gentrack = track_metadata(from_tuple);
     from_path = g_strdup_printf("%s/%s", aud_tuple_get_string(from_tuple, FIELD_FILE_PATH, NULL), aud_tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
@@ -192,12 +191,11 @@
 
     g_free(from_path);
     g_free(tmp);
-    parent_id = mtp_device->default_music_folder;
 
 #if DEBUG
     g_print("Uploading track '%s'\n",filename);
 #endif
-    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id);
+    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL);
     LIBMTP_destroy_track_t(gentrack);
     if (ret == 0) 
         g_print("Track upload finished!\n");

--- rhythmbox-0.11.6.orig/plugins/mtpdevice/rb-mtp-source.c
+++ rhythmbox-0.11.6/plugins/mtpdevice/rb-mtp-source.c
@@ -714,7 +714,7 @@
 		trackmeta->filetype = mimetype_to_filetype (mimetype);
 	}
 
-	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL, 0) != 0) {
+	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL) != 0) {
 		LIBMTP_destroy_track_t (trackmeta);
 		rb_debug ("Tracktransfer failed\n");
 		return NULL;