summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/applications/multimedia/amarok/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/applications/multimedia/amarok/debian')
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install40
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages4
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/control40
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1181
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.114
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.123
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.163
-rwxr-xr-xubuntu/_base/applications/multimedia/amarok/debian/rules7
11 files changed, 56 insertions, 327 deletions
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..0dbd9f84e 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -1,28 +1,32 @@
-debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
-debian/tmp/opt/trinity/share/services/amarokitpc.protocol
-debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
-debian/tmp/opt/trinity/share/services/amarokpcast.protocol
-debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
-debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
+debian/tmp/opt/trinity/share/man/man1/amarokapp.1
+debian/tmp/opt/trinity/share/man/man1/amarokcollectionscanner.1
+debian/tmp/opt/trinity/share/man/man1/amarok_libvisual.1
+debian/tmp/opt/trinity/share/man/man1/amarok.1
+debian/tmp/opt/trinity/share/services/amarokitpc.protocol
+debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
+debian/tmp/opt/trinity/share/services/amarokpcast.protocol
+debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
+debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
#libkarma is not in MAIN yet
#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
@@ -31,8 +35,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
debian/tmp/opt/trinity/bin/amarok
debian/tmp/opt/trinity/bin/amarokapp
debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
deleted file mode 100644
index 8094eebb9..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/amarokapp-trinity.1
-debian/man/amarok-trinity.1
-debian/man/amarokcollectionscanner-trinity.1
-debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/compat b/ubuntu/_base/applications/multimedia/amarok/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/compat
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 8cd20b0ee..6e16f1f12 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -4,24 +4,24 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bzip2,
tdelibs14-trinity-dev, tdebase-trinity-dev,
- libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev,
+ libakode-dev, libxine2-dev | libxine-dev,
libtag1-dev, libsqlite3-dev,
default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
libvisual-0.4-dev, libsdl1.2-dev,
libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev,
- ruby, ruby-dev
+ ruby, ruby-dev, dh-python
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-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), 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-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
- python-all, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
+ python3-all, python3-pytqt, 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
interface that really makes playlist handling easy.
@@ -45,20 +45,30 @@ Description: versatile and easy to use audio player for Trinity
Support for libvisual visualization plugins is also compiled in (you need
to have libvisual-0.4-plugins installed to be able to use it).
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
Package: amarok-common-trinity
Architecture: all
-Depends: ruby
+Depends: ruby, ${python3:Depends}
Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby-trinity, python-all, python-tqt
+Suggests: libqt0-ruby-trinity, python3-all, python3-pytqt
Description: architecture independent files for Amarok [Trinity]
This package contains architecture independent files needed for Amarok to run
properly. It also provides Amarok documentation. Therefore, unless you have
'amarok' package installed, you will hardly find this package useful.
.
You need to install Python if you intend to use Zeroconf support, WebControl
- and/or playlist2html scripts. You will also need python-qt3 for the
+ and/or playlist2html scripts. You will also need python3-pytqt for the
WebControl script.
Package: amarok-konqsidebar-trinity
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
Package: amarok-engines-trinity
Architecture: all
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})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-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]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
for some reason over the other engines (e.g., it is the lightest engine
Dependency-wise).
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features
- (like visualizations) might not be available while using this engine.
-
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
deleted file mode 100644
index 821ec48c7..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Mar 2004" "Trinity Desktop Environment" "An audio player for TDE"
-.SH NAME
-amarok
-\- An audio player for TDE
-.SH SYNOPSIS
-amarok [Qt-options] [TDE-options] [URL(s)]
-.SH DESCRIPTION
-amaroK is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'.
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-\-\-nograb, use \-\-dograb to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font.
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color.
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color.
-.TP
-.B \-\-name <name>
-sets the application name.
-.TP
-.B \-\-title <title>
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.B \-\-im <XIM server>
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon.
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.B \-\-config <filename>
-Use alternative configuration file.
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B \-\-style <style>
-sets the application GUI style.
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget.
-.SS
-.SS Arguments:
-URL(s) Files/URLs to Open
-.SS
-.SS Options:
-.TP
-.B \-r, \-\-previous
-Skip backwards in playlist
-.TP
-.B \-p, \-\-play
-Start playing current playlist
-.TP
-.B \-s, \-\-stop
-Stop playback
-.TP
-.B \-\-pause
-Pause playback
-.TP
-.B \-f, \-\-next
-Skip forwards in playlist
-.SS
-.SS Additional options:
-.TP
-.B \-e, \-\-enqueue
-Enqueue Files/URLs
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/amarok/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/amarok/'"
-from the command-line.
-.BR
-.SH AUTHORS
-.nf
-Christian Muehlhaeuser <chris@chris.de>
-.BR
-Mark Kretschmann <markey@web.de>
-.BR
-Max Howell <max.howell@methylblue.com>
-.BR
-Stanislav Karchebny <berk@upnet.ru>
-.BR
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.BR
-.SH OTHER
-This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
-system (but may be used by others).
-.BR
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
deleted file mode 100644
index c932b9b0c..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
+++ /dev/null
@@ -1,14 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok"
-.SH NAME
-amarok_libvisual \- LibVisual support utility for Amarok
-.SH SYNOPSIS
-amarok_libvisual
-.SH DESCRIPTION
-This is LibVisual support helper utility for Amarok. It's used internally by Amarok
-itself when needed and is not supposed to be invoked manually by user.
-.SS
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
deleted file mode 100644
index 91ff8b6aa..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for TDE"
-.SH NAME
-amarokapp
-\- A direct executable for Amarok.
-.SH SYNOPSIS
-amarokapp [Qt-options] [TDE-options] [URL(s)]
-.SH DESCRIPTION
-Amarok is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.P
-This is direct Amarok executable. The recommend way to run Amarok is using
-\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're
-debugging Amarok with gdb, valgrind or similar program, you will probably want to
-run it against this binary directly.
-.P
-\fBamarokapp(1)\fP takes the same command line options and arguments as
-\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP.
-.SH SEE ALSO
-amarok(1)
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
deleted file mode 100644
index c67cd917f..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok"
-.SH NAME
-amarokcollectionscanner \- Collection Scanner for Amarok
-.SH SYNOPSIS
-amarokcollectionscanner [Qt\-options] [TDE\-options] Folder(s)
-.SH DESCRIPTION
-This Amarok helper utility scans folder(s) given on the command line or
-restarts previous scan if \fB\-\-restart\fP option was given and writes a
-specially structured XML file to standard output with extensive information
-(including tags) about audio files it was able to find. XML file schema used
-by this utility is Amarok specific.
-.P
-You may find his utility useful if you need to retreive and/or display extended
-information about collection of audio files.
-.SH OPTIONS
-.SS
-.SS Arguments:
-Folder(s) Folders to scan
-.SS
-.SS Options:
-.TP
-.B \-r, \-\-recursive
-Scan folders recursively
-.TP
-.B \-i, \-\-incremental
-Incremental Scan (modified folders only)
-.TP
-.B \-p, \-\-importplaylists
-Import playlist
-.TP
-.B \-s, \-\-restart
-Restart the scanner at last position, after a crash []
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..09544563a 100755
--- a/ubuntu/_base/applications/multimedia/amarok/debian/rules
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,11 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"
+
+binary-install/amarok-common-trinity::
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \
+ /opt/trinity/share/apps/amarok/scripts/playlist2html
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \
+ /opt/trinity/share/apps/amarok/scripts/webcontrol