1 files changed, 24 insertions, 9 deletions
diff --git a/ubuntu/_base/applications/amarok/debian/control b/ubuntu/_base/applications/amarok/debian/control
index 54deec176..1a911c735 100644
--- a/ubuntu/_base/applications/amarok/debian/control
+++ b/ubuntu/_base/applications/amarok/debian/control
@@ -4,24 +4,23 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Modestas Vainius <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, bzip2,
- tdelibs14-trinity-dev,
- libxine2-dev | libxine-dev, libdbus-tqt-1-dev,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, bzip2,
+ tdelibs14-trinity-dev, tdebase-trinity-dev,
+ libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev,
  libtag1-dev, libsqlite3-dev,
  default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev,
- ruby, ruby-dev,
- automake, autoconf, libtool, libltdl-dev
+ ruby, ruby-dev
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
 
 Package: amarok-trinity
 Architecture: any
-Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
+Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
 Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
-Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
+Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
  python-all, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
@@ -62,10 +61,18 @@ Description: architecture independent files for Amarok [Trinity]
  and/or playlist2html scripts. You will also need python-qt3 for the
  WebControl script.
 
+Package: amarok-konqsidebar-trinity
+Architecture: any
+Depends: amarok-trinity (= ${binary:Version}), konqueror-trinity (>= 4:3.0.0), ${shlibs:Depends}
+Description: Amarok sidebar for konqueror [Trinity]
+ This package contains the Amarok sidebar plugin for konqueror from Trinity.
+ The sidebar provides a convenient way for a user to control amarok directly
+ from the running konqueror instance.
+
 Package: amarok-engines-trinity
 Architecture: all
-Depends: amarok-engine-xine-trinity (>= ${source:Version})
-Recommends: amarok-engine-yauap-trinity (>= ${source:Version})
+Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
 Replaces: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
 Breaks: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
 Description: output engines for the Amarok music player [Trinity]
@@ -74,6 +81,14 @@ Description: output engines for the Amarok music player [Trinity]
  generally can be used by most users. You can safely remove this metapackage
  as you can remove the amarok-engine-$engine packages that you don't use.
 
+Package: amarok-engine-akode-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: amarok-trinity (= ${binary:Version}), libakode2-mpeg
+Description: aKode engine for the Amarok audio player, providing aRts support [Trinity]
+ This package provides the aKode engine for Amarok, which will output sound to
+ the TDE sound system, the aRts daemon.
+
 Package: amarok-engine-xine-trinity
 Architecture: any
 Depends: ${shlibs:Depends}