data/amarok_homerc | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

src/MainWindow.cpp | 2 1 + 1 - 0 !
src/playlist/PlaylistSortWidget.cpp | 56 30 + 26 - 0 !
src/playlist/PlaylistSortWidget.h | 19 12 + 7 - 0 !
src/playlist/PlaylistViewUrlRunner.cpp | 34 7 + 27 - 0 !
4 files changed, 50 insertions(+), 61 deletions(-)

 get rid of last traces of shuffle sort level

src/EngineController.cpp | 7 7 + 0 - 0 !
src/EngineController.h | 5 5 + 0 - 0 !
src/context/Containment.h | 2 1 + 1 - 0 !
src/context/ContextView.cpp | 21 2 + 19 - 0 !
src/context/ContextView.h | 5 0 + 5 - 0 !
src/context/containments/verticallayout/VerticalToolbarContainment.cpp | 17 13 + 4 - 0 !
src/context/containments/verticallayout/VerticalToolbarContainment.h | 4 2 + 2 - 0 !
7 files changed, 30 insertions(+), 31 deletions(-)

 don't allow adding analyzer applet when not supported.

CMakeLists.txt | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 [patch] disable qtscriptbindings check
Forwarded; not-needed

src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp | 9 9 + 0 - 0 !
1 file changed, 9 insertions(+)

 [patch] make amarok use locally installed errsys.msg

This patch makes Amarok MySQLe use locally installed errsys.msg
(by amarok-common package) instead of global MySQL one which
might not be available if mysql-server is not installed.

src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 force mysqle to use our custom defaults file
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673403
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672207

cmake/modules/FindMySQLAmarok.cmake | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix mysql_config call for debian mysql

CMakeLists.txt | 3 0 + 3 - 0 !
1 file changed, 3 deletions(-)

 do not check for clamz at build-time