diff options
| author | Robert Xu <robxu9@gmail.com> | 2011-08-20 22:17:03 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2011-08-20 22:17:03 -0400 |
| commit | 6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf (patch) | |
| tree | 141e44b1b831644c739f3ec4e0bef2d10ef71da7 /ubuntu/maverick/applications/kmplayer | |
| parent | 7621ba87b889eccdea4958715c25de4b403ad705 (diff) | |
| parent | 26f5630a822b38ef215210699e9e08e74143b38b (diff) | |
| download | tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.tar.gz tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kmplayer')
4 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick/applications/kmplayer/debian/changelog b/ubuntu/maverick/applications/kmplayer/debian/changelog index 75eac522e..00d0559a0 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/changelog +++ b/ubuntu/maverick/applications/kmplayer/debian/changelog @@ -6,7 +6,7 @@ kmplayer-trinity (1:0.10.0c-0ubuntu4) karmic; urgency=low kmplayer-trinity (1:0.10.0c-0ubuntu3) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 05 March 2009 29:52:00 -0600 diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control index 360ce4778..1b45021c4 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/control +++ b/ubuntu/maverick/applications/kmplayer/debian/control @@ -16,8 +16,8 @@ Architecture: any Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine1-x | libxine1 (<< 1.1.8-2) Recommends: kmplayer-plugin-trinity (= ${binary:Version}) Suggests: ffmpeg, vdr, xawtv, mplayer -Description: media player for KDE3 - A basic audio/video viewer application for KDE3. +Description: media player for Trinity + A basic audio/video viewer application for Trinity. . KMPlayer can: * play DVD (DVDNav only with the Xine player) diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install index a6db5e999..4590b56f4 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install +++ b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install @@ -1,5 +1,5 @@ -opt/trinity/lib/kde3/libkmplayerpart.so -opt/trinity/lib/kde3/libkmplayerpart.la +opt/trinity/lib/trinity/libkmplayerpart.so +opt/trinity/lib/trinity/libkmplayerpart.la /opt/trinity/share/apps/kmplayer/kmplayerpartui.rc /opt/trinity/share/apps/kmplayer/pluginsinfo /opt/trinity/share/services/kmplayer_part.desktop diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install index 6709895c4..3c2a5f5ff 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install +++ b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install @@ -1,5 +1,5 @@ opt/trinity/lib/libkdeinit_kmplayer.so -opt/trinity/lib/kde3/kmplayer.so +opt/trinity/lib/trinity/kmplayer.so opt/trinity/bin/kmplayer opt/trinity/bin/kxvplayer /opt/trinity/share/apps/kmplayer/kmplayerui.rc |