rev 11748 - in kde-extras/amarok/trunk/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sat Jul 26 14:04:48 UTC 2008
Author: modax-guest
Date: 2008-07-26 14:04:48 +0000 (Sat, 26 Jul 2008)
New Revision: 11748
Added:
kde-extras/amarok/trunk/debian/patches/16_gnome_multimedia_keys.diff
kde-extras/amarok/trunk/debian/patches/17_xiph_audio_mimetypes.diff
kde-extras/amarok/trunk/debian/patches/18_add_lastfm_recommended_radio.diff
kde-extras/amarok/trunk/debian/patches/19_amarok_play_audiocd.desktop.diff
kde-extras/amarok/trunk/debian/play_audiocd
Modified:
kde-extras/amarok/trunk/debian/README.Debian
kde-extras/amarok/trunk/debian/amarok-common.install
kde-extras/amarok/trunk/debian/changelog
kde-extras/amarok/trunk/debian/control
kde-extras/amarok/trunk/debian/patches/03_am_maintainer_mode.patch
kde-extras/amarok/trunk/debian/patches/04_disable_no_undefined.patch
kde-extras/amarok/trunk/debian/patches/05_gmo_files_at_build_time.patch
kde-extras/amarok/trunk/debian/patches/06_disable-final.diff
kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch
kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff
kde-extras/amarok/trunk/debian/patches/series
kde-extras/amarok/trunk/debian/rules
Log:
* Make amarok depend strictly on the same source version of amarok-common (=)
* Add support for hotkeys under GNOME (Closes: #460113):
- Add 16_gnome_multimedia_keys.diff patch (patch from Ubuntu, thanks to
Chris Brown and James Westby). Adds gnome_media_keys script.
- Make amarok-common suggest python-dbus and libdbus-glib.
- Add entry to README.Debian that python-dbus and libdbus-glib are needed
to get the script working.
- Add and patch Makefile.am to enable installation of the script.
* Properly support Xiph mime types (patch from Ubuntu, thanks to Daniel
Hahler and James Westby) (Closes: #488699).
* Improve audiocd support from konqueror menu (Closes: #488680). Based on
patch from Ubuntu (thanks to Anthony Mercatante and James Westby) with
the following changes:
- No distro branding.
- Rename and install the 'play_audiocd' script to /usr/share/apps/amarok.
- Remove bashisms from the play_audiocd script: /bin/sh compatibility.
- Enhance play_audiocd script. Some assumptions there were not valid.
- Install the script to the amarok-common package.
- Patch amarok/src/amarok_play_audiocd.desktop instead of providing own
version (19_amarok_play_audiocd.desktop.diff).
* Add last.fm "Recommended Radio". Patch from Ubuntu (Closes: #488698).
Thanks to Daniel Hahler and James Westby.
- Extend the patch. Add "Recommend Radio" to the Playlist menu too.
* Remove KDE*3* from the amarok package description. When I added it, I
planned the KDE 4 version too (Closes: #488692).
* Do not use quilt options (-p0) (Closes: #484942).
Modified: kde-extras/amarok/trunk/debian/README.Debian
===================================================================
--- kde-extras/amarok/trunk/debian/README.Debian 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/README.Debian 2008-07-26 14:04:48 UTC (rev 11748)
@@ -15,6 +15,11 @@
- the scripts available in the 'Scripts' menu need that you install
some other packages for them to work. Those packages are listed in
the Suggests: field of the amarok package.
+
+ - If you are running GNOME and to get Amarok hotkey working, install
+ libdbus-glib and python-dbus and run `gnome_media_keys' script.
+ Read /usr/share/amarok/apps/scripts/gnome_media_keys/README for
+ more information.
Also, users not using the full KDE environment may get the following
error when executing amarok for the first time: "Socket-path is not a
@@ -24,5 +29,3 @@
Note that you only need to execute it once, not each time that you
start Amarok.
-
- -- Adeodato Simó <dato at net.com.org.es>
Modified: kde-extras/amarok/trunk/debian/amarok-common.install
===================================================================
--- kde-extras/amarok/trunk/debian/amarok-common.install 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/amarok-common.install 2008-07-26 14:04:48 UTC (rev 11748)
@@ -19,3 +19,4 @@
debian/tmp/usr/bin/amarok_daapserver.rb
debian/tmp/etc/*
+debian/play_audiocd /usr/share/apps/amarok/
Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/changelog 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,3 +1,34 @@
+amarok (1.4.9.1-3) unstable; urgency=low
+
+ * Make amarok depend strictly on the same source version of amarok-common (=)
+ * Add support for hotkeys under GNOME (Closes: #460113):
+ - Add 16_gnome_multimedia_keys.diff patch (patch from Ubuntu, thanks to
+ Chris Brown and James Westby). Adds gnome_media_keys script.
+ - Make amarok-common suggest python-dbus and libdbus-glib.
+ - Add entry to README.Debian that python-dbus and libdbus-glib are needed
+ to get the script working.
+ - Add and patch Makefile.am to enable installation of the script.
+ * Properly support Xiph mime types (patch from Ubuntu, thanks to Daniel
+ Hahler and James Westby) (Closes: #488699).
+ * Improve audiocd support from konqueror menu (Closes: #488680). Based on
+ patch from Ubuntu (thanks to Anthony Mercatante and James Westby) with
+ the following changes:
+ - No distro branding.
+ - Rename and install the 'play_audiocd' script to /usr/share/apps/amarok.
+ - Remove bashisms from the play_audiocd script: /bin/sh compatibility.
+ - Enhance play_audiocd script. Some assumptions there were not valid.
+ - Install the script to the amarok-common package.
+ - Patch amarok/src/amarok_play_audiocd.desktop instead of providing own
+ version (19_amarok_play_audiocd.desktop.diff).
+ * Add last.fm "Recommended Radio". Patch from Ubuntu (Closes: #488698).
+ Thanks to Daniel Hahler and James Westby.
+ - Extend the patch. Add "Recommend Radio" to the Playlist menu too.
+ * Remove KDE*3* from the amarok package description. When I added it, I
+ planned the KDE 4 version too (Closes: #488692).
+ * Do not use quilt options (-p0) (Closes: #484942).
+
+ -- Modestas Vainius <modestas at vainius.eu> Sat, 26 Jul 2008 16:06:43 +0300
+
amarok (1.4.9.1-2) unstable; urgency=medium
* Add 15_temptables_more_indices.diff patch which creates more indices for
Modified: kde-extras/amarok/trunk/debian/control
===================================================================
--- kde-extras/amarok/trunk/debian/control 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/control 2008-07-26 14:04:48 UTC (rev 11748)
@@ -2,6 +2,7 @@
Section: kde
Priority: optional
Maintainer: Modestas Vainius <modestas at vainius.eu>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>
DM-Upload-Allowed: yes
Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, libtool,
kdelibs4-dev, kdebase-dev,
@@ -18,11 +19,11 @@
Package: amarok
Architecture: any
-Depends: amarok-common (>= ${source:Version}), amarok-engine-xine (= ${binary:Version}) | amarok-engine-yauap (= ${binary:Version}), unzip, ${shlibs:Depends}
+Depends: amarok-common (= ${source:Version}), amarok-engine-xine (= ${binary:Version}) | amarok-engine-yauap (= ${binary:Version}), unzip, ${shlibs:Depends}
Recommends: amarok-konqsidebar, kdemultimedia-kio-plugins
Conflicts: amarok-engine
Suggests: amarok-engines, moodbar, libvisual-0.4-plugins, konqueror | www-browser
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for KDE
Amarok tries to be a little different, providing a simple drag and drop
interface that really makes playlist handling easy.
.
@@ -49,7 +50,7 @@
Architecture: all
Depends: ruby
Recommends: amarok (>= ${source:Version})
-Suggests: libqt0-ruby1.8, python, python-qt3
+Suggests: libqt0-ruby1.8, python, python-qt3, python-dbus, libdbus-glib
Replaces: amarok (<= 1.4.8-1)
Description: architecture independent files for Amarok
This package contains architecture independent files needed for Amarok to run
Modified: kde-extras/amarok/trunk/debian/patches/03_am_maintainer_mode.patch
===================================================================
--- kde-extras/amarok/trunk/debian/patches/03_am_maintainer_mode.patch 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/patches/03_am_maintainer_mode.patch 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,5 +1,5 @@
---- admin/configure.in.min.orig
-+++ admin/configure.in.min
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
Modified: kde-extras/amarok/trunk/debian/patches/04_disable_no_undefined.patch
===================================================================
--- kde-extras/amarok/trunk/debian/patches/04_disable_no_undefined.patch 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/patches/04_disable_no_undefined.patch 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,5 +1,5 @@
---- admin/acinclude.m4.in.orig
-+++ admin/acinclude.m4.in
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
@@ -1694,15 +1694,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
Modified: kde-extras/amarok/trunk/debian/patches/05_gmo_files_at_build_time.patch
===================================================================
--- kde-extras/amarok/trunk/debian/patches/05_gmo_files_at_build_time.patch 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/patches/05_gmo_files_at_build_time.patch 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,5 +1,5 @@
---- admin/cvs.sh.orig
-+++ admin/cvs.sh
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
@@ -204,7 +204,7 @@
###
### Then make messages
Modified: kde-extras/amarok/trunk/debian/patches/06_disable-final.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/06_disable-final.diff 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/patches/06_disable-final.diff 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,5 +1,5 @@
---- amarok/src/Makefile.am.orig
-+++ amarok/src/Makefile.am
+--- a/amarok/src/Makefile.am
++++ b/amarok/src/Makefile.am
@@ -8,6 +8,7 @@
KONQSIDEBAR_SUBDIR = konquisidebar
endif
Modified: kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch
===================================================================
--- kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,6 +1,6 @@
diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.cpp amarok/src/amarokcore/amarokdcophandler.cpp
---- amarok.orig/src/amarokcore/amarokdcophandler.cpp 2006-10-26 22:40:20.000000000 +0200
-+++ amarok/src/amarokcore/amarokdcophandler.cpp 2007-02-08 21:11:45.000000000 +0100
+--- a/amarok/src/amarokcore/amarokdcophandler.cpp 2006-10-26 22:40:20.000000000 +0200
++++ b/amarok/src/amarokcore/amarokdcophandler.cpp 2007-02-08 21:11:45.000000000 +0100
@@ -585,6 +585,11 @@
Playlist::instance()->insertMedia(urls);
}
@@ -14,8 +14,8 @@
{
Playlist::instance()->clear();
diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.h amarok/src/amarokcore/amarokdcophandler.h
---- amarok.orig/src/amarokcore/amarokdcophandler.h 2006-10-26 22:40:20.000000000 +0200
-+++ amarok/src/amarokcore/amarokdcophandler.h 2007-02-08 21:11:56.000000000 +0100
+--- a/amarok/src/amarokcore/amarokdcophandler.h 2006-10-26 22:40:20.000000000 +0200
++++ b/amarok/src/amarokcore/amarokdcophandler.h 2007-02-08 21:11:56.000000000 +0100
@@ -125,6 +125,7 @@
virtual int getTotalTrackCount();
virtual QString saveCurrentPlaylist();
@@ -25,8 +25,8 @@
virtual void clearPlaylist();
virtual QString currentTrackUniqueId();
diff -u -Nrua amarok.orig/src/amarokcore/amarokdcopiface.h amarok/src/amarokcore/amarokdcopiface.h
---- amarok.orig/src/amarokcore/amarokdcopiface.h 2006-10-26 22:40:20.000000000 +0200
-+++ amarok/src/amarokcore/amarokdcopiface.h 2007-02-08 21:12:12.000000000 +0100
+--- a/amarok/src/amarokcore/amarokdcopiface.h 2006-10-26 22:40:20.000000000 +0200
++++ b/amarok/src/amarokcore/amarokdcopiface.h 2007-02-08 21:12:12.000000000 +0100
@@ -127,6 +127,7 @@
/* These two methods are used by mediacontrol. DO NOT TOUCH! */
Modified: kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,5 +1,5 @@
---- amarok/src/playlist.cpp 2007-12-25 23:53:35.000000000 +0200
-+++ amarok/src/playlist.cpp 2007-12-26 00:00:38.000000000 +0200
+--- a/amarok/src/playlist.cpp 2007-12-25 23:53:35.000000000 +0200
++++ b/amarok/src/playlist.cpp 2007-12-26 00:00:38.000000000 +0200
@@ -4381,6 +4381,12 @@
setStopAfterMode( DoNotStop );
}
Added: kde-extras/amarok/trunk/debian/patches/16_gnome_multimedia_keys.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/16_gnome_multimedia_keys.diff (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/16_gnome_multimedia_keys.diff 2008-07-26 14:04:48 UTC (rev 11748)
@@ -0,0 +1,99 @@
+--- /dev/null
++++ b/amarok/src/scripts/gnome_media_keys/gnome_media_keys.py
+@@ -0,0 +1,45 @@
++#!/usr/bin/env python
++#Gnome Multimedia Key's event handler script.
++#This script will allow the use of multimedia buttons in amarok as configured using gnome keyboard shortcuts.
++#Author: Chris Brown
++#Date: 22June2007
++#Version: 0.3
++#bug reports to: chris.scotland[at]gmail.com
++
++import os, gobject
++
++try:
++ import dbus
++except:
++ os.system("kdialog --sorry 'the package python-dbus (DBUS bindings for Python) is required for this script.'")
++ raise
++
++try:
++ from dbus import glib
++except:
++ os.system("kdialog --sorry 'the package libdbus-glib (Glib-based shared library for dbus) is required for this script.'")
++ raise
++
++bus = dbus.SessionBus()
++object = bus.get_object('org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon')
++
++def signal_handler(*mmkeys):
++ for mmk in mmkeys:
++ if mmk == "Play":
++ os.system("dcop amarok player playPause")
++ elif mmk == "Pause":
++ os.system("dcop amarok player pause")
++ elif mmk == "Stop":
++ os.system("dcop amarok player stop")
++ elif mmk == "Next":
++ os.system("dcop amarok player next")
++ elif mmk == "Previous":
++ os.system("dcop amarok player prev")
++
++
++object.connect_to_signal("MediaPlayerKeyPressed", signal_handler, dbus_interface='org.gnome.SettingsDaemon')
++
++gobject.timeout_add(5000, signal_handler)
++
++loop = gobject.MainLoop()
++loop.run()
+--- /dev/null
++++ b/amarok/src/scripts/gnome_media_keys/gnome_media_keys.spec
+@@ -0,0 +1,2 @@
++name = Gnome Multimedia Keys
++type = {generic}
+--- /dev/null
++++ b/amarok/src/scripts/gnome_media_keys/README
+@@ -0,0 +1,24 @@
++<div align="center"><b>Gnome Multimedia Key's</b><br>Version: 0.1</div>
++
++<p>
++<b>About:</b><br>
++This script will allow the use of keyboard multimedia keys in Gnome 2.18 and above (eg. ubuntu feisty) to control playback. This includes most multimedia buttons found on many laptops.<br>
++Currently supported operations are:<br>
++<pre> Play/Pause
++ Pause
++ Stop
++ Next Track
++ Previous Track
++</pre></p>
++<p>
++<b>Usage:</b><br>
++Simply run the script, no configuration of the script itself is required.<br>The desired keyboard shortcuts can be configured by selecting <i>"System-->Prefrences-->Keyboard Shortcuts"</i> from the Gnome pannel.
++</p>
++<p>
++<b>Author:</b><br>
++Chris Brown: chris.scotland[at]gmail.com<br>
++This is my first ever script and would love your feedback and bug reports.
++</p>
++<p><b>ENJOY!</b></p>
++
++
+--- a/amarok/src/scripts/Makefile.am
++++ b/amarok/src/scripts/Makefile.am
+@@ -7,4 +7,5 @@
+ score_default \
+ score_impulsive \
+ templates \
+- webcontrol
++ webcontrol \
++ gnome_media_keys
+--- /dev/null
++++ b/amarok/src/scripts/gnome_media_keys/Makefile.am
+@@ -0,0 +1,7 @@
++gnomemediakeysdir = \
++ $(kde_datadir)/amarok/scripts/gnome_media_keys
++
++gnomemediakeys_DATA = \
++ README \
++ gnome_media_keys.py \
++ gnome_media_keys.spec
Added: kde-extras/amarok/trunk/debian/patches/17_xiph_audio_mimetypes.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/17_xiph_audio_mimetypes.diff (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/17_xiph_audio_mimetypes.diff 2008-07-26 14:04:48 UTC (rev 11748)
@@ -0,0 +1,11 @@
+--- 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;
Added: kde-extras/amarok/trunk/debian/patches/18_add_lastfm_recommended_radio.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/18_add_lastfm_recommended_radio.diff (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/18_add_lastfm_recommended_radio.diff 2008-07-26 14:04:48 UTC (rev 11748)
@@ -0,0 +1,71 @@
+--- a/amarok/src/playlistbrowser.cpp
++++ b/amarok/src/playlistbrowser.cpp
+@@ -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 ) );
+--- a/amarok/src/playlistwindow.h
++++ b/amarok/src/playlistwindow.h
+@@ -80,6 +80,8 @@
+ void addLastfmPersonal();
+ void playLastfmNeighbor();
+ void addLastfmNeighbor();
++ void playLastfmRecommended();
++ void addLastfmRecommended();
+ void playLastfmCustom();
+ void addLastfmCustom();
+ void playLastfmGlobaltag( int );
+--- a/amarok/src/playlistwindow.cpp
++++ b/amarok/src/playlistwindow.cpp
+@@ -176,6 +176,7 @@
+ QPopupMenu* playLastfmMenu = playLastfm->popupMenu();
+ playLastfmMenu->insertItem( i18n( "Personal Radio" ), this, SLOT( playLastfmPersonal() ) );
+ playLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, SLOT( playLastfmNeighbor() ) );
++ playLastfmMenu->insertItem( i18n( "Recommended Radio" ), this, SLOT( playLastfmRecommended() ) );
+ playLastfmMenu->insertItem( i18n( "Custom Station" ), this, SLOT( playLastfmCustom() ) );
+ playLastfmMenu->insertItem( i18n( "Global Tag Radio" ), playTagRadioMenu );
+
+@@ -183,6 +184,7 @@
+ QPopupMenu* addLastfmMenu = addLastfm->popupMenu();
+ addLastfmMenu->insertItem( i18n( "Personal Radio" ), this, SLOT( addLastfmPersonal() ) );
+ addLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, SLOT( addLastfmNeighbor() ) );
++ addLastfmMenu->insertItem( i18n( "Recommended Radio" ), this, SLOT( addLastfmRecommended() ) );
+ addLastfmMenu->insertItem( i18n( "Custom Station" ), this, SLOT( addLastfmCustom() ) );
+ addLastfmMenu->insertItem( i18n( "Global Tag Radio" ), addTagRadioMenu );
+
+@@ -944,6 +946,28 @@
+ }
+
+
++void PlaylistWindow::playLastfmRecommended() //SLOT
++{
++ if( !LastFm::Controller::checkCredentials() ) return;
++
++ const KURL url( QString( "lastfm://user/%1/recommended/100" )
++ .arg( AmarokConfig::scrobblerUsername() ) );
++
++ Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay );
++}
++
++
++void PlaylistWindow::addLastfmRecommended() //SLOT
++{
++ if( !LastFm::Controller::checkCredentials() ) return;
++
++ const KURL url( QString( "lastfm://user/%1/recommended/100" )
++ .arg( AmarokConfig::scrobblerUsername() ) );
++
++ Playlist::instance()->insertMedia( url );
++}
++
++
+ void PlaylistWindow::playLastfmCustom() //SLOT
+ {
+ const QString token = LastFm::Controller::createCustomStation();
Added: kde-extras/amarok/trunk/debian/patches/19_amarok_play_audiocd.desktop.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/19_amarok_play_audiocd.desktop.diff (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/19_amarok_play_audiocd.desktop.diff 2008-07-26 14:04:48 UTC (rev 11748)
@@ -0,0 +1,8 @@
+--- a/amarok/src/amarok_play_audiocd.desktop 2008-07-26 14:11:55.000000000 +0300
++++ b/amarok/src/amarok_play_audiocd.desktop 2008-07-26 14:12:20.000000000 +0300
+@@ -50,4 +50,4 @@
+ Name[zh_CN]=用 Amarok 播放音频 CD
+ Name[zh_TW]=以 Amarok 播放音樂 CD
+ Icon=amarok
+-Exec=amarok --cdplay %u
++Exec=/usr/share/apps/amarok/play_audiocd %u
Modified: kde-extras/amarok/trunk/debian/patches/series
===================================================================
--- kde-extras/amarok/trunk/debian/patches/series 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/patches/series 2008-07-26 14:04:48 UTC (rev 11748)
@@ -1,13 +1,17 @@
01_libtool_update.diff
02_admin_cleanup.diff
-03_am_maintainer_mode.patch -p0
-04_disable_no_undefined.patch -p0
-05_gmo_files_at_build_time.patch -p0
-06_disable-final.diff -p0
-10_queuemedia.patch -p0
-11_bug403340_cancel_rename_when_deleting_items.diff -p0
+03_am_maintainer_mode.patch
+04_disable_no_undefined.patch
+05_gmo_files_at_build_time.patch
+06_disable-final.diff
+10_queuemedia.patch
+11_bug403340_cancel_rename_when_deleting_items.diff
12_devicemanager_dcopcall_no_timeout.diff
13_lastfm_crash_434835.diff
14_ruby_libs_not_scripts.diff
15_temptables_more_indices.diff
+16_gnome_multimedia_keys.diff
+17_xiph_audio_mimetypes.diff
+18_add_lastfm_recommended_radio.diff
+19_amarok_play_audiocd.desktop.diff
97_automake_cleanup.diff
Added: kde-extras/amarok/trunk/debian/play_audiocd
===================================================================
--- kde-extras/amarok/trunk/debian/play_audiocd (rev 0)
+++ kde-extras/amarok/trunk/debian/play_audiocd 2008-07-26 14:04:48 UTC (rev 11748)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+DEVICE=$@
+
+if [ -n "$DEVICE" ]; then
+ if [ ${DEVICE#audiocd} != "$DEVICE" ]; then
+ # E.g. audiocd:/?device=/dev/hdc
+ exec amarok --cdplay "${DEVICE#*=}"
+ elif [ "${DEVICE#/dev/}" != "$DEVICE" ] || [ "${DEVICE#media:}" != "$DEVICE" ] || [ "${DEVICE#system:}" != "$DEVICE" ]; then
+ # Device in /dev or media/system URL (amarok will convert those)
+ exec amarok --cdplay "$DEVICE"
+ elif [ ${DEVICE#/} != "$DEVICE" ]; then
+ # Some mountpoint probably (this is rare, but might happen)
+ exec amarok --cdplay "`dcop kded mediamanager fullList | grep -B1 $DEVICE | head -n1`"
+ else
+ exec amarok --cdplay /dev/cdrom
+ fi
+else
+ exec amarok --cdplay /dev/cdrom
+fi
Modified: kde-extras/amarok/trunk/debian/rules
===================================================================
--- kde-extras/amarok/trunk/debian/rules 2008-07-26 10:03:28 UTC (rev 11747)
+++ kde-extras/amarok/trunk/debian/rules 2008-07-26 14:04:48 UTC (rev 11748)
@@ -74,6 +74,7 @@
binary-fixup/amarok-common::
# Fix permissions of some amarok scripts
chmod a+x \
+ debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/gnome_media_keys/gnome_media_keys.py \
debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb \
debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/playlist2html/Playlist.py \
debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/ruby_debug/debug.rb \
@@ -81,6 +82,8 @@
debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/templates/ruby_qt_template.rb \
debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/webcontrol/Playlist.py \
debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/webcontrol/RequestHandler.py
+ chmod a+x \
+ debian/$(cdbs_curpkg)/usr/share/apps/amarok/play_audiocd
binary-post-install/amarok-common::
# Remove excess COPYING files from script directories
More information about the pkg-kde-commits
mailing list