[SCM] libav/master: Fix arch-dependent files in M-A: same package

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b0e1a5d8cef2bb242d03247c5828cc235cfe03d0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jun 1 10:48:06 2015 +0200

    Fix arch-dependent files in M-A: same package
    
    Closes: #787406

diff --git a/debian/libavcodec-extra-56.lintian-overrides b/debian/libavcodec-extra-56.lintian-overrides
index 3091e02..98894f1 100644
--- a/debian/libavcodec-extra-56.lintian-overrides
+++ b/debian/libavcodec-extra-56.lintian-overrides
@@ -1,2 +1,4 @@
 # This is the sister package of libavcodec56
 libavcodec-extra-56: package-name-doesnt-match-sonames
+# Overriding these fpic lintian errors. Please see bug #528080.
+libavcodec-extra-56 [i386]: shlib-with-non-pic-code
diff --git a/debian/libavcodec-extra-56.lintian-overrides.i386 b/debian/libavcodec-extra-56.lintian-overrides.i386
deleted file mode 100644
index 295b2ff..0000000
--- a/debian/libavcodec-extra-56.lintian-overrides.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is the sister package of libavcodec56
-libavcodec-extra-56: package-name-doesnt-match-sonames
-libavcodec-extra-56: shlib-with-non-pic-code
diff --git a/debian/libavformat56.lintian-overrides.i386 b/debian/libavcodec56.lintian-overrides
similarity index 58%
rename from debian/libavformat56.lintian-overrides.i386
rename to debian/libavcodec56.lintian-overrides
index 8f15f1c..0ee4270 100644
--- a/debian/libavformat56.lintian-overrides.i386
+++ b/debian/libavcodec56.lintian-overrides
@@ -1,2 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavformat56: shlib-with-non-pic-code
+libavcodec56 [i386]: shlib-with-non-pic-code
diff --git a/debian/libavcodec56.lintian-overrides.i386 b/debian/libavdevice55.lintian-overrides
similarity index 58%
copy from debian/libavcodec56.lintian-overrides.i386
copy to debian/libavdevice55.lintian-overrides
index 999dd7e..2b06909 100644
--- a/debian/libavcodec56.lintian-overrides.i386
+++ b/debian/libavdevice55.lintian-overrides
@@ -1,2 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavcodec56: shlib-with-non-pic-code
+libavdevice55 [i386]: shlib-with-non-pic-code
diff --git a/debian/libavcodec56.lintian-overrides.i386 b/debian/libavformat56.lintian-overrides
similarity index 58%
copy from debian/libavcodec56.lintian-overrides.i386
copy to debian/libavformat56.lintian-overrides
index 999dd7e..5c682fe 100644
--- a/debian/libavcodec56.lintian-overrides.i386
+++ b/debian/libavformat56.lintian-overrides
@@ -1,2 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavcodec56: shlib-with-non-pic-code
+libavformat56 [i386]: shlib-with-non-pic-code
diff --git a/debian/libavcodec56.lintian-overrides.i386 b/debian/libavresample2.lintian-overrides
similarity index 57%
copy from debian/libavcodec56.lintian-overrides.i386
copy to debian/libavresample2.lintian-overrides
index 999dd7e..5387d72 100644
--- a/debian/libavcodec56.lintian-overrides.i386
+++ b/debian/libavresample2.lintian-overrides
@@ -1,2 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavcodec56: shlib-with-non-pic-code
+libavresample2 [i386]: shlib-with-non-pic-code
diff --git a/debian/libavresample2.lintian-overrides.i386 b/debian/libavresample2.lintian-overrides.i386
deleted file mode 100644
index 3f86247..0000000
--- a/debian/libavresample2.lintian-overrides.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-# Overriding these fpic lintian errors. Please see bug #528080.
-libavresample2: shlib-with-non-pic-code
diff --git a/debian/libavcodec56.lintian-overrides.i386 b/debian/libavutil54.lintian-overrides
similarity index 59%
rename from debian/libavcodec56.lintian-overrides.i386
rename to debian/libavutil54.lintian-overrides
index 999dd7e..69f3d98 100644
--- a/debian/libavcodec56.lintian-overrides.i386
+++ b/debian/libavutil54.lintian-overrides
@@ -1,2 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavcodec56: shlib-with-non-pic-code
+libavutil54 [i386]: shlib-with-non-pic-code
diff --git a/debian/libavutil54.lintian-overrides.i386 b/debian/libavutil54.lintian-overrides.i386
deleted file mode 100644
index eb64862..0000000
--- a/debian/libavutil54.lintian-overrides.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-# Overriding these fpic lintian errors. Please see bug #528080.
-libavutil54: shlib-with-non-pic-code
diff --git a/debian/libavdevice55.lintian-overrides.i386 b/debian/libswscale3.lintian-overrides
similarity index 59%
rename from debian/libavdevice55.lintian-overrides.i386
rename to debian/libswscale3.lintian-overrides
index e07bc71..91d9c81 100644
--- a/debian/libavdevice55.lintian-overrides.i386
+++ b/debian/libswscale3.lintian-overrides
@@ -1,2 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavdevice55: shlib-with-non-pic-code
+libswscale3 [i386]: shlib-with-non-pic-code
diff --git a/debian/libswscale3.lintian-overrides.i386 b/debian/libswscale3.lintian-overrides.i386
deleted file mode 100644
index eb53acd..0000000
--- a/debian/libswscale3.lintian-overrides.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-# Overriding these fpic lintian errors. Please see bug #528080.
-libswscale3: shlib-with-non-pic-code

-- 
Libav/FFmpeg packaging