[SCM] smplayer packaging branch, master, updated. debian/0.6.8-1-5-g7a036cc

[lucidfox-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5f41cbd1d6f5e0726fcb6a72a44b520a5760f222
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sat Nov 21 13:56:57 2009 +0600

    Move mplayer-nogui first, so smplayer doesn't install the mplayer GUI by default if mplayer-nogui is available

diff --git a/debian/control b/debian/control
index 6adb1a7..cca3786 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://smplayer.sourceforge.net/
 
 Package: smplayer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer | mplayer-nogui
+Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer-nogui | mplayer
 Recommends: smplayer-translations, smplayer-themes
 Description: complete front-end for MPlayer
  Qt Mplayer front-end, with basic features like playing

-- 
smplayer packaging