diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-10-24 00:54:48 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-10-24 00:55:30 +0200 |
| commit | c2d1cab45e3946a2651d396f4d3fb24aa31eeb8d (patch) | |
| tree | 1712d6eecac4a04fecd4a7c6037eb3b925768190 /ubuntu | |
| parent | 6fbdc6a9da269d7bad7df6693cb3287effe97e0d (diff) | |
| download | tde-packaging-c2d1cab45e3946a2651d396f4d3fb24aa31eeb8d.tar.gz tde-packaging-c2d1cab45e3946a2651d396f4d3fb24aa31eeb8d.zip | |
DEB amarok: Disable building iRiver iFP support.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e5daa77723d6f6523483133fbc0a9d513d722fc1)
Diffstat (limited to 'ubuntu')
4 files changed, 3 insertions, 5 deletions
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install index 3b473baa0..d11bdc487 100644 --- a/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install +++ b/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install @@ -6,7 +6,6 @@ debian/tmp/opt/trinity/share/locale/* debian/tmp/opt/trinity/share/config.kcfg/amarok.kcfg debian/tmp/opt/trinity/share/services/amarok_void-engine_plugin.desktop debian/tmp/opt/trinity/share/services/amarok_generic-mediadevice.desktop -debian/tmp/opt/trinity/share/services/amarok_ifp-mediadevice.desktop debian/tmp/opt/trinity/share/services/amarok_ipod-mediadevice.desktop debian/tmp/opt/trinity/share/services/amarok_njb-mediadevice.desktop debian/tmp/opt/trinity/share/services/amarok_smb-device.desktop diff --git a/ubuntu/_base/applications/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-trinity.install index f66beb7cf..2be358a21 100644 --- a/ubuntu/_base/applications/amarok/debian/amarok-trinity.install +++ b/ubuntu/_base/applications/amarok/debian/amarok-trinity.install @@ -11,8 +11,6 @@ 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_generic-mediadevice.la debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so -debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.la -debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-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 diff --git a/ubuntu/_base/applications/amarok/debian/control b/ubuntu/_base/applications/amarok/debian/control index 06fe05fe3..5ca4b016e 100644 --- a/ubuntu/_base/applications/amarok/debian/control +++ b/ubuntu/_base/applications/amarok/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, bzip2, 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, + libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev, ruby, ruby-dev Standards-Version: 3.8.4 Homepage: http://amarok.kde.org diff --git a/ubuntu/_base/applications/amarok/debian/rules b/ubuntu/_base/applications/amarok/debian/rules index d38f693a3..cb4758734 100755 --- a/ubuntu/_base/applications/amarok/debian/rules +++ b/ubuntu/_base/applications/amarok/debian/rules @@ -13,7 +13,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_ALL_OPTIONS="ON" + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_IFP="OFF" DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) |