diff -u mtpfs-0.8+svn11/debian/control mtpfs-0.8+svn11/debian/control
--- mtpfs-0.8+svn11/debian/control
+++ mtpfs-0.8+svn11/debian/control
@@ -1,7 +1,8 @@
 Source: mtpfs
 Section: interpreters
 Priority: optional
-Maintainer: Chris Lamb <chris@chris-lamb.co.uk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Chris Lamb <chris@chris-lamb.co.uk>
 Build-Depends: debhelper (>= 5), automake, autotools-dev, pkg-config, libmtp-dev, libfuse-dev, libmad0-dev, libid3tag0-dev, libglib2.0-dev
 Standards-Version: 3.7.3
 Vcs-Git: git://git.chris-lamb.co.uk/pkg-mtpfs.git
diff -u mtpfs-0.8+svn11/debian/changelog mtpfs-0.8+svn11/debian/changelog
--- mtpfs-0.8+svn11/debian/changelog
+++ mtpfs-0.8+svn11/debian/changelog
@@ -1,3 +1,10 @@
+mtpfs (0.8+svn11-1ubuntu1) intrepid; urgency=low
+
+  * Rebuild for libtmp7 -> libmtp8 transition (LP: #262336)
+  * mtpfs.c: updates from upstream revno 16 to support libmtp 0.3.0
+
+ -- Riccardo Coccioli <volans@ubuntu.com>  Thu, 28 Aug 2008 16:26:04 +0200
+
 mtpfs (0.8+svn11-1) unstable; urgency=low
 
   * Initial release (Closes: #457236)
only in patch2:
unchanged:
--- mtpfs-0.8+svn11.orig/mtpfs.c
+++ mtpfs-0.8+svn11/mtpfs.c
@@ -174,7 +174,7 @@
         ret = LIBMTP_Update_Playlist(device,playlist);
     } else {
         if(DEBUG) g_debug("New playlist");
-        ret = LIBMTP_Create_New_Playlist(device,playlist,0);
+        ret = LIBMTP_Create_New_Playlist(device,playlist);
     }
     playlists_changed=TRUE;
     return ret;
@@ -448,8 +448,10 @@
                 genfile->genre = getGenre (tag);
                 genfile->date = getYear (tag);
                 genfile->usecount = 0;
+                genfile->parent_id = 0;
+                genfile->storage_id = 0;
 
-                /* If there is a songlength tag it will take
+			 /* If there is a songlength tag it will take
                  * precedence over any length calculated from
                  * the bitrate and filesize */
                 songlen = getSonglen (tag);
@@ -486,8 +488,7 @@
                 g_mutex_lock(device_lock);
                 ret =
                     LIBMTP_Send_Track_From_File_Descriptor (device, fi->fh,
-						genfile, NULL, NULL,
-						parent_id);
+						genfile, NULL, NULL);
                 g_mutex_unlock(device_lock);
                 id3_file_close (id3_fh);
                 LIBMTP_destroy_track_t (genfile);
@@ -503,8 +504,7 @@
                 g_mutex_lock(device_lock);
                 ret =
                     LIBMTP_Send_File_From_File_Descriptor (device, fi->fh,
-						genfile, NULL, NULL,
-						parent_id);
+						genfile, NULL, NULL);
                 g_mutex_unlock(device_lock);
                 LIBMTP_destroy_file_t (genfile);
                 if (DEBUG) g_debug ("Sent FILE %s",path);
@@ -982,7 +982,7 @@
         }
         if (DEBUG) g_debug ("%s:%s:%d", filename, directory, parent_id);
         g_mutex_lock(device_lock);
-        ret = LIBMTP_Create_Folder (device, filename, parent_id);
+        ret = LIBMTP_Create_Folder (device, filename, parent_id,0);
         g_mutex_unlock(device_lock);
         g_strfreev (fields);
 		g_free (directory);