[SCM] libav/master: Remove Multi-arch header from the empty, transitional -extra- packages

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a55d079b01da2c81de68af0ebdb86d07aec5f5c7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 10 07:44:40 2012 +0200

    Remove Multi-arch header from the empty, transitional -extra- packages
    
    According to
    https://wiki.ubuntu.com/MultiarchSpec#Dependencies_involving_Architecture:_all_packages,
    Multi-arch: same is explicitly forbidden on Arch: all packages. However,
    not specifing the Multi-arch field has the intended effect.

diff --git a/debian/changelog b/debian/changelog
index 2109838..c717ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ libav (6:0.8.3-4) unstable; urgency=low
 
   * Declare a 'Breaks' relationship against mplayer, Closes: #671934
   * Bug fix: "Multi-Arch: foreign libraries", thanks to Stepan Golosunov.
-    Mark the transitional packages as Multi-arch: same
+    Drop the Multi-arch field on the transitional packages
     to avoid that the dependency can be satisfied by packages of other
     architectures, which would break applications. Closes: #680613
 
diff --git a/debian/control b/debian/control
index b53e320..526f658 100644
--- a/debian/control
+++ b/debian/control
@@ -486,7 +486,6 @@ Package: libavutil-extra-51
 Section: oldlibs
 Priority: extra
 Architecture: all
-Multi-Arch: same
 Depends:
  libavutil51,
  ${misc:Depends},
@@ -531,7 +530,6 @@ Package: libavdevice-extra-53
 Section: oldlibs
 Priority: extra
 Architecture: all
-Multi-Arch: same
 Depends:
  libavdevice53,
  ${misc:Depends},
@@ -546,7 +544,6 @@ Package: libavfilter-extra-2
 Section: oldlibs
 Priority: extra
 Architecture: all
-Multi-Arch: same
 Depends:
  libavfilter2,
  ${misc:Depends},
@@ -561,7 +558,6 @@ Package: libpostproc-extra-52
 Section: oldlibs
 Priority: extra
 Architecture: all
-Multi-Arch: same
 Depends:
  libpostproc52,
  ${misc:Depends},
@@ -576,7 +572,6 @@ Package: libavformat-extra-53
 Section: oldlibs
 Priority: extra
 Architecture: all
-Multi-Arch: same
 Depends:
  libavformat53,
  ${misc:Depends},
@@ -591,7 +586,6 @@ Package: libswscale-extra-2
 Section: oldlibs
 Priority: extra
 Architecture: all
-Multi-Arch: same
 Depends:
  libswscale2,
  ${misc:Depends},

-- 
Libav/FFmpeg packaging