diff -ru katapult-0.3.1.3.orig/debian/changelog katapult-0.3.1.3/debian/changelog
--- katapult-0.3.1.3.orig/debian/changelog	2006-12-18 10:06:39.000000000 +0000
+++ katapult-0.3.1.3/debian/changelog	2006-12-18 10:11:03.000000000 +0000
@@ -1,3 +1,15 @@
+katapult (0.3.1.3-0ubuntu5.1) edgy-proposed; urgency=low
+
+  [ Martin Meredith ]
+  * Update of kubuntu_06_amarok_14.diff to working version, 
+    closes malone 69479
+
+  [ Jonathan Riddell ]
+  * Fix .desktop file in kubuntu_01_o2display.diff, 
+    X-Katapult-Id needs to be X-Katapult-ID, closes malone 56918
+
+ -- Martin Meredith <mez@ubuntu.com>  Fri,  3 Nov 2006 12:20:28 +0000
+
 katapult (0.3.1.3-0ubuntu5) edgy; urgency=low
 
   * Add kubuntu_06_amarok_14.diff closes 60136
diff -ru katapult-0.3.1.3.orig/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
--- katapult-0.3.1.3.orig/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp	2006-12-18 10:10:00.000000000 +0000
+++ katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp	2006-12-18 10:11:19.000000000 +0000
@@ -66,6 +66,7 @@
 		setBestMatch(Match());
 		setStatus(0);
 	} else {
+
 		if ( _gotCollectionStatus)
 		{
 
@@ -92,7 +93,6 @@
 				arg << sqlQuery;
 				if (!kapp->dcopClient()->call("amarok", "collection", "query(QString)",
 				     sqlQueryData, replyType, replyData)) {
-					//qDebug("There was some error using DCOP. Perhaps amaroK doesn't run.");
 					newStatus = 0;
 				} else {
 					QDataStream reply(replyData, IO_ReadOnly);
@@ -138,7 +138,6 @@
 								newStatus = S_HasResults;
 						}
 					} else {
-						qDebug("DCOP: query returned an unexpected type of reply!");
 						newStatus = 0;
 					}
 				}
@@ -149,7 +148,7 @@
 
 				QStringList queryList;
 				//prepares SQL-queryQRegExp
-				QString sqlQuery("SELECT a.name, t.title, t.deviceid, d.lastmountpoint, t.url, i.path, album.name FROM tags t, artist a, album LEFT JOIN statistics s ON t.url = s.url AND t.deviceid = s.deviceid LEFT JOIN images i ON (a.name = i.artist AND album.name = i.album) LEFT JOIN devices d ON t.deviceid = d.id WHERE t.album = album.id AND t.artist = a.id"); // AND
+				QString sqlQuery("SELECT a.name, t.title, t.deviceid, d.lastmountpoint, t.url, i.path, album.name FROM tags t LEFT JOIN statistics s ON t.url = s.url AND t.deviceid = s.deviceid LEFT JOIN artist a ON t.artist = a.id LEFT JOIN album ON t.album = album.id LEFT JOIN images i ON ( a.name = i.artist AND album.name = i.album) LEFT JOIN devices d ON t.deviceid = d.id WHERE 1");
 				queryList = QStringList::split ( QString(" "), QString(queryString).replace(QChar(':')," ").replace(QChar('\"'), " ").replace(QChar('\"'), "%") );
 
 				for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) {
@@ -166,7 +165,6 @@
 				arg << sqlQuery;
 				if (!kapp->dcopClient()->call("amarok", "collection", "query(QString)",
 				     sqlQueryData, replyType, replyData)) {
-					//qDebug("There was some error using DCOP. Perhaps amaroK doesn't run.");
 					newStatus = 0;
 				} else {
 					QDataStream reply(replyData, IO_ReadOnly);
@@ -181,10 +179,20 @@
 							//Reads information from SQL-Query
 							_result.setArtist(sqlResult[0]);
 							_result.setName(sqlResult[1]);
-							if (sqlResult[2]=="-1") {
-								_result.setURL(KURL(sqlResult[3]+sqlResult[4].mid(1)));
+							if (sqlResult[2]!="-1") {
+								KURL absolutePath;
+								absolutePath.setPath( sqlResult[3] );
+								absolutePath.addPath( sqlResult[4] );
+								absolutePath.cleanPath();
+
+								_result.setURL( absolutePath );
 							} else {
-								_result.setURL(KURL("/"+sqlResult[4].mid(1)));
+								KURL absolutePath;
+								absolutePath.setPath( "/" );
+								absolutePath.addPath( sqlResult[4] );
+								absolutePath.cleanPath(); 
+
+								_result.setURL( absolutePath );
 							}
 
 							_result.setAlbum(sqlResult[6]);
@@ -217,7 +225,6 @@
 								newStatus = S_HasResults;
 						}
 					} else {
-						qDebug("DCOP: query returned an unexpected type of reply!");
 						newStatus = 0;
 					}
 				}
@@ -271,6 +278,7 @@
 			if (sqlResult[0] == "1")
 			{
 				_dynamicCollection = true;
+
 			}
 			else
 			{
diff -ru katapult-0.3.1.3.orig/katapult/plugins/display/o2display/katapult_o2display.desktop katapult-0.3.1.3/katapult/plugins/display/o2display/katapult_o2display.desktop
--- katapult-0.3.1.3.orig/katapult/plugins/display/o2display/katapult_o2display.desktop	2006-12-18 10:09:28.000000000 +0000
+++ katapult-0.3.1.3/katapult/plugins/display/o2display/katapult_o2display.desktop	2006-12-18 10:11:13.000000000 +0000
@@ -3,3 +3,4 @@
 ServiceTypes=Katapult/Display
 Type=Service
 X-KDE-Library=katapult_o2display
+X-Katapult-ID=o2 Display