summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-10-24 16:33:54 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-10-24 16:36:28 +0200
commit7f6da4f06711576a1a8a56efcef183e78bda3e7e (patch)
tree6d21e68d6358fe78fc75e572714d15e5c7a7a4d7
parent4044160d68cb611b3b242ac074edd234df114145 (diff)
downloadtde-packaging-7f6da4f06711576a1a8a56efcef183e78bda3e7e.tar.gz
tde-packaging-7f6da4f06711576a1a8a56efcef183e78bda3e7e.zip
DEB amarok: Don't build Yauap engine, drop package amarok-engine-yauap.
This resolves issue TDE/amarok#29. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 9a9f4caa34c7054f3d12bccbd585a7d0b875b258)
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/control14
-rwxr-xr-xdebian/_base/applications/multimedia/amarok/debian/rules1
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/control14
-rwxr-xr-xubuntu/_base/applications/multimedia/amarok/debian/rules1
4 files changed, 4 insertions, 26 deletions
diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
index 00d0b4b9c..baeb8ad1b 100644
--- a/debian/_base/applications/multimedia/amarok/debian/control
+++ b/debian/_base/applications/multimedia/amarok/debian/control
@@ -72,7 +72,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-trinity (<< 4:14.0.0~)
Breaks: amarok-engines-trinity (<< 4:14.0.0~)
Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +100,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-trinity (<< 4:14.0.0~)
-Breaks: 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/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/debian/_base/applications/multimedia/amarok/debian/rules
+++ b/debian/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 8cd20b0ee..2a90404e2 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -72,7 +72,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 +100,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/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/ubuntu/_base/applications/multimedia/amarok/debian/rules
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"