[SCM] libav/experimental: Clarify relations between libavcodec53 and libavcodec-extra-53 in debian/control.\n\nConflicts seems too strong, Breaks should be enough, Enhances is plain wrong.

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

The following commit has been merged in the experimental branch:
commit ff3d1f7c844ebd6d229e60fe8f87ff4e593a8a0a
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Wed Jun 13 17:35:29 2012 +0200

    Clarify relations between libavcodec53 and libavcodec-extra-53 in debian/control.\n\nConflicts seems too strong, Breaks should be enough, Enhances is plain wrong.
    
    Conflicts:
    	debian/control

diff --git a/debian/control b/debian/control
index 8ce9095..d022ed7 100644
--- a/debian/control
+++ b/debian/control
@@ -420,31 +420,28 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
- libavcodec54
 Replaces:
  libavcodec54
 Breaks:
+ libavcodec54,
  mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
-Enhances:
- libavcodec54
-Description: Libav codec library
+Description: Libav codec library (additional codecs)
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
  .
  This is the codec library from Libav (both encoding and decoding).
  .
- This package is an enhancement to the regular libavcodec library package.
- This package contains the following additional codecs.
+ This package is a replacement for the regular libavcodec54 library package;
+ it contains the following additional codecs:
  .
   * OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band (Encoder/Decoder)
   * OpenCORE Adaptive Multi-Rate (AMR) Wide-Band (Decoder)
   * Android VisualOn AAC (Encoder)
   * Android VisualOn Adaptive Multi-Rate (AMR) Wide-Band (Encoder)
  .
- Because this package links against libraries that are licensed
- under Apache License 2.0, the resulting binaries are distributed under the
- GPL version 3.
+ Because this package links against libraries that are licensed under
+ Apache License 2.0, the resulting binaries are distributed under the
+ GPL version 3 or later.
 
 Package: libavdevice-extra-53
 Section: oldlibs

-- 
Libav/FFmpeg packaging