[SCM] libav/master: Use a Provides field to provide transitional packages instead of Conflicts. (Closes: #666401)

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

The following commit has been merged in the master branch:
commit d52c720c80f072aa11d4c88f4dfb4701707bc898
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Fri Mar 30 10:08:05 2012 -0400

    Use a Provides field to provide transitional packages instead of Conflicts. (Closes: #666401)

diff --git a/debian/control b/debian/control
index 1421f10..0bd75f9 100644
--- a/debian/control
+++ b/debian/control
@@ -223,7 +223,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
+Provides:
  libavutil-extra-51
 Replaces:
  libavutil-extra-51
@@ -260,7 +260,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
+Provides:
  libavdevice-extra-53
 Replaces:
  libavdevice-extra-53
@@ -279,7 +279,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
+Provides:
  libavformat-extra-53
 Replaces:
  libavformat-extra-53
@@ -301,7 +301,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
+Provides:
  libavfilter-extra-2
 Replaces:
  libavfilter-extra-2
@@ -320,7 +320,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
+Provides:
  libpostproc-extra-52
 Replaces:
  libpostproc-extra-52
@@ -339,7 +339,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
+Provides:
  libswscale-extra-2
 Replaces:
  libswscale-extra-2

-- 
Libav/FFmpeg packaging