[SCM] x264/master: remove unnecessary Conflicts/Replaces on non-existing package x264-bin

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a31d0c7692e91d3b6bbe04b4937023b07d125072
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 31 19:44:10 2011 +0100

    remove unnecessary Conflicts/Replaces on non-existing package x264-bin
    
    These packages have never existed neither in Debian nor Ubuntu.

diff --git a/debian/control b/debian/control
index 9512573..37b468e 100644
--- a/debian/control
+++ b/debian/control
@@ -24,10 +24,6 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
- x264-bin
-Replaces:
- x264-bin
 Description: video encoder for the H.264/MPEG-4 AVC standard
  x264 is an advanced commandline encoder for creating H.264 (MPEG-4 AVC)
  video streams.

-- 
x264 packaging