summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-10-24 16:42:17 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-10-24 16:42:17 +0200
commit0b2fd0596ed4542e97cde159ebf0a6335c18e1b5 (patch)
tree17b37ce358fd1fc2646c4c146d9d04234451f322
parent9a9f4caa34c7054f3d12bccbd585a7d0b875b258 (diff)
downloadtde-packaging-0b2fd0596ed4542e97cde159ebf0a6335c18e1b5.tar.gz
tde-packaging-0b2fd0596ed4542e97cde159ebf0a6335c18e1b5.zip
DEB amarok: Move the libamarok library to a separate package.
This resolves a circular dependency - issue TDE/amarok#28. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install2
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/control12
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/control12
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
6 files changed, 26 insertions, 6 deletions
diff --git a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..ed34bb3c2 100644
--- a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -31,8 +31,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/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
index baeb8ad1b..b08143d1e 100644
--- a/debian/_base/applications/multimedia/amarok/debian/control
+++ b/debian/_base/applications/multimedia/amarok/debian/control
@@ -17,7 +17,7 @@ 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-trinity (<< 4:14.0.0~)
Breaks: amarok-trinity (<< 4:14.0.0~)
Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
@@ -45,6 +45,16 @@ 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
diff --git a/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/debian/_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/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..ed34bb3c2 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -31,8 +31,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/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 2a90404e2..9e0aebf98 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -17,7 +17,7 @@ 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,
@@ -45,6 +45,16 @@ 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
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