From 0b02ced9871710b3f791697536f447c8870b5f58 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 01:45:59 -0600 Subject: [PATCH] Fix amarok and soundkonverter dependencies on libqt0-ruby1.8-trinity on Debian and Ubuntu This closes Bug 469 (cherry picked from commit 8538bf77ad7aac0939ec917258c8fd9403372555) --- debian/lenny/applications/amarok.cmake/debian/control | 4 ++-- debian/lenny/applications/amarok/debian/control | 4 ++-- debian/lenny/applications/soundkonverter/debian/control | 2 +- debian/squeeze/applications/amarok.cmake/debian/control | 4 ++-- debian/squeeze/applications/amarok/debian/control | 4 ++-- debian/squeeze/applications/soundkonverter/debian/control | 2 +- ubuntu/maverick/applications/amarok.cmake/debian/control | 4 ++-- ubuntu/maverick/applications/amarok/debian/control | 4 ++-- ubuntu/maverick/applications/soundkonverter/debian/control | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/lenny/applications/amarok.cmake/debian/control b/debian/lenny/applications/amarok.cmake/debian/control index 3f9f0a8d2..b0f632bea 100644 --- a/debian/lenny/applications/amarok.cmake/debian/control +++ b/debian/lenny/applications/amarok.cmake/debian/control @@ -20,7 +20,7 @@ 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} Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-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. @@ -48,7 +48,7 @@ Package: amarok-common-trinity Architecture: all Depends: ruby Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 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 diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control index dbb0f8232..36e829012 100644 --- a/debian/lenny/applications/amarok/debian/control +++ b/debian/lenny/applications/amarok/debian/control @@ -20,7 +20,7 @@ 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} Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-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. @@ -48,7 +48,7 @@ Package: amarok-common-trinity Architecture: all Depends: ruby Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 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 diff --git a/debian/lenny/applications/soundkonverter/debian/control b/debian/lenny/applications/soundkonverter/debian/control index 1d04a540a..71531fbb7 100644 --- a/debian/lenny/applications/soundkonverter/debian/control +++ b/debian/lenny/applications/soundkonverter/debian/control @@ -31,7 +31,7 @@ Description: audio converter frontend for Trinity Package: soundkonverter-amarok-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity Description: audio converter frontend for Trinity (Amarok script) Amarok script for soundKonverter. It allows you to easily transcode files when transferring them to your media device. diff --git a/debian/squeeze/applications/amarok.cmake/debian/control b/debian/squeeze/applications/amarok.cmake/debian/control index 3f9f0a8d2..b0f632bea 100644 --- a/debian/squeeze/applications/amarok.cmake/debian/control +++ b/debian/squeeze/applications/amarok.cmake/debian/control @@ -20,7 +20,7 @@ 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} Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-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. @@ -48,7 +48,7 @@ Package: amarok-common-trinity Architecture: all Depends: ruby Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 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 diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control index dbb0f8232..36e829012 100644 --- a/debian/squeeze/applications/amarok/debian/control +++ b/debian/squeeze/applications/amarok/debian/control @@ -20,7 +20,7 @@ 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} Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-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. @@ -48,7 +48,7 @@ Package: amarok-common-trinity Architecture: all Depends: ruby Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 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 diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/squeeze/applications/soundkonverter/debian/control index 1d04a540a..71531fbb7 100644 --- a/debian/squeeze/applications/soundkonverter/debian/control +++ b/debian/squeeze/applications/soundkonverter/debian/control @@ -31,7 +31,7 @@ Description: audio converter frontend for Trinity Package: soundkonverter-amarok-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity Description: audio converter frontend for Trinity (Amarok script) Amarok script for soundKonverter. It allows you to easily transcode files when transferring them to your media device. diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/maverick/applications/amarok.cmake/debian/control index 24c254a21..3b2edf097 100644 --- a/ubuntu/maverick/applications/amarok.cmake/debian/control +++ b/ubuntu/maverick/applications/amarok.cmake/debian/control @@ -22,7 +22,7 @@ Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini Replaces: amarok-kde3 (<< 4:3.5.13) Breaks: amarok-kde3 (<< 4:3.5.13) Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-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. @@ -52,7 +52,7 @@ Depends: ruby Replaces: amarok-common-kde3 (<< 4:3.5.13) Breaks: amarok-common-kde3 (<< 4:3.5.13) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 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 diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index 073eae0ce..ee8a85c29 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/applications/amarok/debian/control @@ -22,7 +22,7 @@ Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini Replaces: amarok-kde3 (<< 4:3.5.13) Breaks: amarok-kde3 (<< 4:3.5.13) Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-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. @@ -52,7 +52,7 @@ Depends: ruby Replaces: amarok-common-kde3 (<< 4:3.5.13) Breaks: amarok-common-kde3 (<< 4:3.5.13) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 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 diff --git a/ubuntu/maverick/applications/soundkonverter/debian/control b/ubuntu/maverick/applications/soundkonverter/debian/control index 822cd2878..c1e8ca71e 100644 --- a/ubuntu/maverick/applications/soundkonverter/debian/control +++ b/ubuntu/maverick/applications/soundkonverter/debian/control @@ -33,7 +33,7 @@ Description: audio converter frontend for Trinity Package: soundkonverter-amarok-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity Replaces: soundkonverter-amarok-kde3 (<< 4:3.5.13) Breaks: soundkonverter-amarok-kde3 (<< 4:3.5.13) Description: audio converter frontend for Trinity (Amarok script)