diff -u gnomad2-2.9.1/debian/changelog gnomad2-2.9.1/debian/changelog
--- gnomad2-2.9.1/debian/changelog
+++ gnomad2-2.9.1/debian/changelog
@@ -1,3 +1,11 @@
+gnomad2 (2.9.1-1.1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #313219
+    - configure.ac: updates from upstream revno 1.50 to support libmtp 0.3.0
+    - src/jukebox.c: updates from upstream revno 1.123 to support libtmp 0.3.0
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Fri, 02 Jan 2009 19:48:55 +0530
+
 gnomad2 (2.9.1-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -10,6 +18,14 @@
 
  -- Stefano Zacchiroli <zack@debian.org>  Fri, 26 Dec 2008 09:53:11 +0100
 
+gnomad2 (2.9.1-1ubuntu1) intrepid; urgency=low
+
+  * Rebuild for libtmp7 -> libmtp8 transition (LP: #262336)
+  * configure.ac: updates from upstream revno 1.50 to support libmtp 0.3.0
+  * src/jukebox.c: updates from upstream revno 1.123 to support libtmp 0.3.0
+
+ -- Riccardo Coccioli <volans@ubuntu.com>  Thu, 28 Aug 2008 16:48:38 +0200
+
 gnomad2 (2.9.1-1) unstable; urgency=low
 
   * New upstream release. Closes: #446812.
diff -u gnomad2-2.9.1/debian/control gnomad2-2.9.1/debian/control
--- gnomad2-2.9.1/debian/control
+++ gnomad2-2.9.1/debian/control
@@ -1,7 +1,8 @@
 Source: gnomad2
 Section: x11
 Priority: optional
-Maintainer: Manuel Garcia <mannyto@gmail.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Manuel Garcia <mannyto@gmail.com>
 Build-Depends: libgnomeui-dev, libnjb-dev (>> 2.2), libid3tag0-dev, libxml-parser-perl, debhelper (>= 4), libmtp-dev (>= 0.2.2), libtagc0-dev, libtag1-dev
 Standards-Version: 3.8.0
 
only in patch2:
unchanged:
--- gnomad2-2.9.1.orig/src/jukebox.c
+++ gnomad2-2.9.1/src/jukebox.c
@@ -2176,11 +2176,15 @@
 	trackmeta->duration = length * 1000;
 	trackmeta->filesize = get_64bit_file_size(tmpfname);
 	trackmeta->filetype = filetype_d->filetype;
+	// Hardcode parent (folder) to 0 (== root directory)
+	trackmeta->parent_id = 0;
+	// Hardcode storage to primary
+	trackmeta->storage_id = 0;
 	// TODO: Discarding return value as for now
 	// g_print("Transferring MTP track...\n");
 	// Hardcode parent (folder) to 0 (== root directory)
 	ret = LIBMTP_Send_Track_From_File(mtpdevice, tmpfname, trackmeta,
-					  mtp_progress, NULL, 0);
+					  mtp_progress, NULL);
 	if (ret != 0) {
 	  g_print("Error sending file \"%s\" to MTP device!\n", tmpfname);
 	  LIBMTP_Dump_Errorstack(mtpdevice);
@@ -2347,7 +2351,7 @@
 	filemeta->filesize = (uint64_t) hdmeta->size;
 	filemeta->filetype = filetype_d->filetype;
 	filemeta->parent_id = mtp_current_filter_id;
-	if (LIBMTP_Send_File_From_File(mtpdevice, tmpfname, filemeta, mtp_progress, NULL, mtp_current_filter_id) != 0) {
+	if (LIBMTP_Send_File_From_File(mtpdevice, tmpfname, filemeta, mtp_progress, NULL) != 0) {
 	  LIBMTP_destroy_file_t(filemeta);
 	  g_free(tmpfname);
 	  g_print("Error sending file \"%s\" to MTP device!\n", tmpfname);
@@ -2745,8 +2749,10 @@
 
     pl = LIBMTP_new_playlist_t();
     pl->name = g_strdup(plname);
+    pl->parent_id = 0;
+    pl->storage_id = 0;
     // This will create the new playlist in the default folder
-    if (LIBMTP_Create_New_Playlist(mtpdevice, pl, 0) != 0) {
+    if (LIBMTP_Create_New_Playlist(mtpdevice, pl) != 0) {
       create_error_dialog(_("Could not create playlist"));
       return 0;
     }
@@ -3608,7 +3614,7 @@
 
 #ifdef HAVE_LIBMTP
   if (use_mtp) {
-    int ret=LIBMTP_Create_Folder(mtpdevice,foldername,mtp_current_filter_id);
+    int ret=LIBMTP_Create_Folder(mtpdevice,foldername,mtp_current_filter_id,0);
     mtp_initialize_folders();
     rebuild_datafile_list(folder);
     return;
only in patch2:
unchanged:
--- gnomad2-2.9.1.orig/configure.ac
+++ gnomad2-2.9.1/configure.ac
@@ -167,7 +167,7 @@
 dnl
 dnl --------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(MTP, libmtp >= 0.1.3, found_libmtp_pkg=yes, found_libmtp_pkg=no)
+PKG_CHECK_MODULES(MTP, libmtp >= 0.3.0, found_libmtp_pkg=yes, found_libmtp_pkg=no)
 MTP_VER=`pkg-config --modversion libmtp`
 AC_CHECK_HEADER(libmtp.h, found_libmtp_header=yes, found_libmtp_header=no)