Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

6 files changed, 7 insertions, 7 deletions

diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/maverick/applications/amarok.cmake/debian/control
index def456393..97b65afb1 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 0b36962a8..a87ed3475 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/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control
index 091af9d3e..99f3db1ad 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/control
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.methylblue.com/filelight/
 
 Package: filelight-l10n-trinity
 Architecture: any
-Depends: ${shlibs:Depends} , filelight-trinity (>= ${source:Version})
+Depends: ${shlibs:Depends} , filelight-trinity
 Replaces: filelight-l10n-kde3 (<< 4:3.5.13)
 Breaks: filelight-l10n-kde3 (<< 4:3.5.13)
 Description: Localization (l10n) for Filelight, disk space usage tool [Trinity]
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/control b/ubuntu/maverick/applications/soundkonverter/debian/control
index 77c4c1dd7..b6553d7d1 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)
diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake.1 b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.1
index 7b404d01e..7b404d01e 100644
--- a/ubuntu/maverick/applications/yakuake/debian/yakuake.1
+++ b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.1
diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages
index 72280ef49..f9a1365b5 100644
--- a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages
+++ b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages
@@ -1 +1 @@
-debian/yakuake.1
+debian/yakuake-trinity.1