DEB amarok: Switch to cmake.

Enable building of aKode engine and Konqueror sidebar.
Do not install broken kubuntu-media-amarok and install-mp3.

Signed-off-by: Slávek Banko <[email protected]>

6 files changed, 43 insertions, 126 deletions

diff --git a/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 447fe40dc..38932df52 100644
--- a/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,14 +1,7 @@
 debian/install-mp3			/usr/lib/amarok
 amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services
 Depend on amarok-xine | amarok-engine
-export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok
 install debian/kubuntu-media-amarok and debian/amarok_play_audiocd.desktop in amarok.install
 chmod x debian/amarok/usr/bin/kubuntu-media-amarok in debian/rules in section
 	common-binary-post-install-arch::
 remove amarok-common.lintian, amarok.lintian
-make watch file actually work
-
-#### due to removal of KDE 3 packages ####
-remove tdemultimedia-dev, tdebase-dev from Build-Depends
-remove amarok-konqsidebar, tdemultimedia-tdeio-plugins from Recommends
-remove complete amarok-konqsidebar package
diff --git a/debian/_base/applications/amarok/debian/amarok-engine-akode-trinity.install b/debian/_base/applications/amarok/debian/amarok-engine-akode-trinity.install
new file mode 100644
index 000000000..53332011c
--- /dev/null
+++ b/debian/_base/applications/amarok/debian/amarok-engine-akode-trinity.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/share/services/amarok_aKode-engine.desktop
+debian/tmp/opt/trinity/lib/trinity/libamarok_aKode-engine.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_aKode-engine.la
diff --git a/debian/_base/applications/amarok/debian/amarok-konqsidebar-trinity.install b/debian/_base/applications/amarok/debian/amarok-konqsidebar-trinity.install
new file mode 100644
index 000000000..b04776a7f
--- /dev/null
+++ b/debian/_base/applications/amarok/debian/amarok-konqsidebar-trinity.install
@@ -0,0 +1,5 @@
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_universalamarok.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_universalamarok.so
+debian/tmp/opt/trinity/share/apps/konqsidebartng/add/amarok.desktop
+debian/tmp/opt/trinity/share/apps/konqsidebartng/entries/amarok.desktop
+debian/tmp/opt/trinity/share/apps/konqsidebartng/kicker_entries/amarok.desktop
diff --git a/debian/_base/applications/amarok/debian/control b/debian/_base/applications/amarok/debian/control
index f976349ec..9f62d1e34 100644
--- a/debian/_base/applications/amarok/debian/control
+++ b/debian/_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-trinity (<< 4:14.0.0~)
 Breaks: 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-trinity (<< 4:14.0.0~)
 Breaks: 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}
diff --git a/debian/_base/applications/amarok/debian/rules b/debian/_base/applications/amarok/debian/rules
index d5bea91d6..d38f693a3 100755
--- a/debian/_base/applications/amarok/debian/rules
+++ b/debian/_base/applications/amarok/debian/rules
@@ -1,116 +1,19 @@
 #!/usr/bin/make -f
 
-### CDBS INCLUDES
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
-
-### VARIABLES
-# Exempt amarok engines from being handled as proper public libraries
-# by dh_makeshlibs
-DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibamarok_\\w*-engine-trinity
-
-export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok-trinity
-
-DEB_CONFIGURE_EXTRA_FLAGS  :=	--without-included-sqlite \
-				--disable-final \
-				--without-akode \
-				--without-gstreamer10 \
-				--without-libkarma \
-				--with-ifp      \
-				--with-libgpod  \
-				--with-libnjb   \
-				--with-libmtp   \
-				--with-mp4v2    \
-				--enable-mysql  \
-				--enable-postgresql \
-				--with-yauap \
-				--prefix=/opt/trinity \
-				--with-extra-libs=/usr/lib/mesa
-
-# Ship upstream README in amarok docs
-DEB_INSTALL_DOCS_ALL =
-DEB_INSTALL_DOCS_amarok-trinity = $(DEB_SRCDIR)/README
-
-# Amarok engines should not auto-depend on amarok. 
-# Appropriate relationships are set manually in the control file.
-DEB_DH_SHLIBDEPS_ARGS_amarok-engine-xine-trinity = -- -xamarok-trinity
-DEB_DH_SHLIBDEPS_ARGS_amarok-engine-yauap-trinity = -- -xamarok-trinity
-
-### Libtool and Automake updates
-# Autoguess automake /usr/share subdirectory. Insure from failures
-DEB_AUTOMAKE_SHARE_DIR = /usr/share/automake-$(shell automake --version | head -n 1 | sed 's/^automake (GNU automake) \([0-9]\+\.[0-9]\+\).*/\1/')
-ifneq ($(words $(DEB_AUTOMAKE_SHARE_DIR)),1)
-DEB_AUTOMAKE_SHARE_DIR =
-endif
-
-post-patches:: debian/stamp-automake
-debian/stamp-automake:
-	touch debian/stamp-automake-started
-	if test -n "$(DEB_AUTOMAKE_SHARE_DIR)"; then \
-		for f in $(DEB_AUTOMAKE_SHARE_DIR)/*; do \
-			if  test -f $$f && \
-			test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
-			cp -f $$f $(DEB_SRCDIR)/admin; \
-			fi; \
-		done; \
-	fi
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common
-	touch $@
-
-# Install ${curpkg}.install as lintian overrides
-$(patsubst %,binary-install/%,$(DEB_PACKAGES))::
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-		    debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-
-clean::
-	if test -d $(DEB_SRCDIR) && test -f debian/stamp-automake-started; then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-				xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-				configure configure.files configure.in stamp-h.in \
-				subdirs; \
-	fi
-	rm -f debian/stamp-automake*
-
-binary-fixup/amarok-common-trinity::
-	# Fix permissions of some amarok scripts
-	chmod a+x  \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/playlist2html/Playlist.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/ruby_debug/debug.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/python_qt_template.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/ruby_qt_template.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/Playlist.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/RequestHandler.py
-
-binary-post-install/amarok-common-trinity::
-	# Remove excess COPYING files from script directories
-	rm -f \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_lyrc/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_default/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_impulsive/COPYING
-	# Remove Mac OSX resource fork file
-	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
-
-### POST-INSTALL HACKING
-common-binary-post-install-arch::
-	# Check for not installed files
-	dh_install --no-act --list-missing
-
-	chmod a+x debian/amarok-trinity/opt/trinity/lib/amarok/install-mp3
-	chmod +x debian/amarok-trinity/opt/trinity/bin/kubuntu-media-amarok
-	ln -s /opt/trinity/bin/amarokapp debian/amarok-trinity/opt/trinity/lib/amarok/amarokapp
diff --git a/debian/_base/applications/amarok/debian/watch b/debian/_base/applications/amarok/debian/watch
deleted file mode 100644
index b0a7420bb..000000000
--- a/debian/_base/applications/amarok/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-opts=pasv ftp://ftp.kde.org/pub/kde/stable/amarok/([0-9.]+)/src/amarok-([0-9.]+)\.tar\.bz2