diff -Nru mplayer-1.0~rc3+svn20100713/debian/changelog mplayer-1.0~rc3+svn20100713/debian/changelog
--- mplayer-1.0~rc3+svn20100713/debian/changelog	2010-07-16 03:19:49.000000000 +0100
+++ mplayer-1.0~rc3+svn20100713/debian/changelog	2010-07-19 20:56:34.000000000 +0100
@@ -1,4 +1,4 @@
-mplayer (2:1.0~rc3+svn20100713-0ubuntu1~lucid~multimediappa1) lucid; urgency=low
+mplayer (2:1.0~rc3+svn20100713-0ubuntu1~lucid~multimediappa2) lucid; urgency=low
 
   * New upstream snapshot with revised vaapi patches.
 
diff -Nru mplayer-1.0~rc3+svn20100713/debian/control mplayer-1.0~rc3+svn20100713/debian/control
--- mplayer-1.0~rc3+svn20100713/debian/control	2010-07-19 14:53:39.000000000 +0100
+++ mplayer-1.0~rc3+svn20100713/debian/control	2010-07-19 20:56:23.000000000 +0100
@@ -200,8 +200,9 @@
           fontconfig
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: mplayer-nogui
 Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
-          mplayer-nogui (<< 2:1.0~rc3+svn20090426-2),
+          mplayer-nogui,
           mencoder (<< 2:1.0~rc3+svn20090426-2)
 Description: movie player for Unix-like systems
  MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,