diff -u amarok-1.4.9.1/debian/changelog amarok-1.4.9.1/debian/changelog --- amarok-1.4.9.1/debian/changelog +++ amarok-1.4.9.1/debian/changelog @@ -1,3 +1,12 @@ +amarok (2:1.4.9.1-0ubuntu2) hardy; urgency=low + + * debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff: + Add lastfm recommended radio station (LP: #103227) + * debian/patches/kubuntu_09_audio_mimetypes.diff: + - Add mimetypes audio/flac and audio/ogg (LP: #201291) + + -- Daniel Hahler Sat, 12 Apr 2008 18:16:17 +0200 + amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low * Upstream patch release only in patch2: unchanged: --- amarok-1.4.9.1.orig/debian/patches/kubuntu_09_audio_mimetypes.diff +++ amarok-1.4.9.1/debian/patches/kubuntu_09_audio_mimetypes.diff @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' amarok-1.4.8/amarok/src/amarok.desktop amarok-1.4.8.new/amarok/src/amarok.desktop +--- amarok-1.4.8/amarok/src/amarok.desktop 2008-04-03 00:50:58.509525000 +0200 ++++ amarok-1.4.8.new/amarok/src/amarok.desktop 2008-04-03 00:51:56.857526386 +0200 +@@ -104,7 +104,7 @@ + Icon=amarok + X-KDE-Protocols=http + #don't add inode/directory to mimetypes it leads to misbehavior +-MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/x-ms-asf; ++MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/x-ms-asf;audio/flac;audio/ogg; + DocPath=amarok/index.html + Terminal=false + Categories=Qt;KDE;AudioVideo;Audio;Player; only in patch2: unchanged: --- amarok-1.4.9.1.orig/debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff +++ amarok-1.4.9.1/debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff @@ -0,0 +1,14 @@ +diff -Nur -x '*.orig' -x '*~' amarok-1.4.8/amarok/src/playlistbrowser.cpp amarok-1.4.8.new/amarok/src/playlistbrowser.cpp +--- amarok-1.4.8/amarok/src/playlistbrowser.cpp 2007-12-31 15:21:43.331246000 +0100 ++++ amarok-1.4.8.new/amarok/src/playlistbrowser.cpp 2007-12-31 17:33:45.446046817 +0100 +@@ -566,6 +566,10 @@ + last = new LastFmEntry( m_lastfmCategory, tagsFolder, url, i18n( "Neighbor Radio" ) ); + last->setKept( false ); + ++ url = KURL::fromPathOrURL( QString("lastfm://user/%1/recommended/100").arg( user ) ); ++ last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Recommended Radio" ) ); ++ last->setKept( false ); ++ + if( subscriber ) + { + url = KURL::fromPathOrURL( QString("lastfm://user/%1/personal").arg( user ) );