From 66abe8b88b1f576f6f049bf07bf5c69b69ef9517 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Fri, 24 Dec 2010 16:29:45 +0100
Subject: [PATCH] amarok: Updated (2.0.90 -> 2.3.90)

---
 kde/amarok/amarok.desc |  8 ++++----
 kde/amarok/mysql.patch | 37 -------------------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 kde/amarok/mysql.patch

diff --git a/kde/amarok/amarok.desc b/kde/amarok/amarok.desc
index b17439dab..70a3ebe26 100644
--- a/kde/amarok/amarok.desc
+++ b/kde/amarok/amarok.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../amarok/amarok.desc
-[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -27,11 +27,11 @@
 [M] Nagy Karoly Gabriel <nagy.karoly@opensde.org>
 
 [C] extra/multimedia extra/desktop/kde
-[F] KDE QT3-PLUGIN
+[F] KDE
 
 [L] GPL
 [S] Stable
-[V] 2.0.90
+[V] 2.3.90
 [P] X -----5---9 600.000
 
-[D] 1871023274 amarok-2.0.90.tar.bz2 ftp://ftp.kde.org/pub/kde/unstable/amarok/2.0.90/src/
+[D] 261238180 amarok-2.3.90.tar.bz2 ftp://ftp.kde.org/pub/kde/unstable/amarok/2.3.90/src/
diff --git a/kde/amarok/mysql.patch b/kde/amarok/mysql.patch
deleted file mode 100644
index 4ab2cfb91..000000000
--- a/kde/amarok/mysql.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../amarok/mysql.patch
-# Copyright (C) 2009 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-diff -Nur amarok-2.0.90-orig/cmake/modules/FindMySQLAmarok.cmake amarok-2.0.90/cmake/modules/FindMySQLAmarok.cmake
---- amarok-2.0.90-orig/cmake/modules/FindMySQLAmarok.cmake	2009-04-21 13:41:47.000000000 +0300
-+++ amarok-2.0.90/cmake/modules/FindMySQLAmarok.cmake	2009-04-21 13:55:03.000000000 +0300
-@@ -16,7 +16,7 @@
- find_path(MYSQL_INCLUDE_DIR mysql.h
-    ~/usr/include/mysql
-    /opt/local/include/mysql5/mysql
--   /opt/mysqle/include/mysql
-+   /opt/mysql/include/mysql
-    /opt/mysql/mysql/include 
-    /usr/mysql/include/mysql
-    /usr/include/mysql
-@@ -44,7 +44,7 @@
-    PATHS
-    ~/usr/lib/mysql
-    /opt/local/lib/mysql5/mysql
--   /opt/mysqle/lib/mysql
-+   /opt/mysql/lib/mysql
-    /usr/lib/mysql
-    /usr/lib64/mysql
-    /usr/local/lib/mysql