[SCM] libav/master: 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 master branch:
commit ee8fd0df4f12a62edb2f881e51b0365fe7b89da7
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.

diff --git a/debian/control b/debian/control
index 7157b9e..7220e05 100644
--- a/debian/control
+++ b/debian/control
@@ -243,10 +243,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
- libavcodec-extra-53
 Breaks:
- libavcodec-extra-53 (<< 4:0.8.0.2)
+ libavcodec-extra-53
 Description: Libav codec library
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
@@ -501,31 +499,28 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
- libavcodec53
 Replaces:
  libavcodec53
 Breaks:
+ libavcodec53,
  mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
-Enhances:
- libavcodec53
-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 libavcodec53 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