[SCM] ffmpeg/master: restrict shlib-with-non-pic-code lintian override to i386

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

The following commit has been merged in the master branch:
commit 9a772b0e0f54a7aa96fd460bd14923dad422753d
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Wed Jun 10 21:35:05 2015 +0200

    restrict shlib-with-non-pic-code lintian override to i386

diff --git a/debian/changelog b/debian/changelog
index 72feecd..764c3c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ffmpeg (7:2.7-1) UNRELEASED; urgency=medium
   * Change maintainer to the pkg-multimedia team and move myself to uploaders.
   * Let ffmpeg suggest ffmpeg-doc.
   * Fix encdec autopkgtest to not fail, when skipping tests.
+  * Restrict shlib-with-non-pic-code lintian override to i386.
+    Thanks to Jakub Wilk for the hint.
 
  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Fri, 05 Jun 2015 14:23:01 +0200
 
diff --git a/debian/libavcodec-ffmpeg56.lintian-overrides b/debian/libavcodec-ffmpeg56.lintian-overrides
index 269d955..dde166b 100644
--- a/debian/libavcodec-ffmpeg56.lintian-overrides
+++ b/debian/libavcodec-ffmpeg56.lintian-overrides
@@ -3,4 +3,4 @@
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libavcodec-ffmpeg56: shlib-with-non-pic-code usr/lib/i386*/libavcodec-ffmpeg.so.*
+libavcodec-ffmpeg56 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavcodec-ffmpeg.so.*
diff --git a/debian/libavdevice-ffmpeg56.lintian-overrides b/debian/libavdevice-ffmpeg56.lintian-overrides
index 54183f7..831d55c 100644
--- a/debian/libavdevice-ffmpeg56.lintian-overrides
+++ b/debian/libavdevice-ffmpeg56.lintian-overrides
@@ -7,4 +7,4 @@ libavdevice-ffmpeg56: embedded-library usr/lib/*/libavdevice-ffmpeg.so.*: libavd
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libavdevice-ffmpeg56: shlib-with-non-pic-code usr/lib/i386*/libavdevice-ffmpeg.so.*
+libavdevice-ffmpeg56 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavdevice-ffmpeg.so.*
diff --git a/debian/libavfilter-ffmpeg5.lintian-overrides b/debian/libavfilter-ffmpeg5.lintian-overrides
index 24b5968..6020281 100644
--- a/debian/libavfilter-ffmpeg5.lintian-overrides
+++ b/debian/libavfilter-ffmpeg5.lintian-overrides
@@ -7,4 +7,4 @@ libavfilter-ffmpeg5: embedded-library usr/lib/*/libavfilter-ffmpeg.so.*: libavfi
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libavfilter-ffmpeg5: shlib-with-non-pic-code usr/lib/i386*/libavfilter-ffmpeg.so.*
+libavfilter-ffmpeg5 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavfilter-ffmpeg.so.*
diff --git a/debian/libavformat-ffmpeg56.lintian-overrides b/debian/libavformat-ffmpeg56.lintian-overrides
index a3fa5de..480e4e0 100644
--- a/debian/libavformat-ffmpeg56.lintian-overrides
+++ b/debian/libavformat-ffmpeg56.lintian-overrides
@@ -6,4 +6,4 @@ libavformat-ffmpeg56: spelling-error-in-binary usr/lib/*/libavformat-ffmpeg.so.*
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libavformat-ffmpeg56: shlib-with-non-pic-code usr/lib/i386*/libavformat-ffmpeg.so.*
+libavformat-ffmpeg56 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavformat-ffmpeg.so.*
diff --git a/debian/libavresample-ffmpeg2.lintian-overrides b/debian/libavresample-ffmpeg2.lintian-overrides
index 4cdc8e5..c3f5d7e 100644
--- a/debian/libavresample-ffmpeg2.lintian-overrides
+++ b/debian/libavresample-ffmpeg2.lintian-overrides
@@ -3,4 +3,4 @@
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libavresample-ffmpeg2: shlib-with-non-pic-code usr/lib/i386*/libavresample-ffmpeg.so.*
+libavresample-ffmpeg2 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavresample-ffmpeg.so.*
diff --git a/debian/libavutil-ffmpeg54.lintian-overrides b/debian/libavutil-ffmpeg54.lintian-overrides
index a49ea63..c587711 100644
--- a/debian/libavutil-ffmpeg54.lintian-overrides
+++ b/debian/libavutil-ffmpeg54.lintian-overrides
@@ -7,4 +7,4 @@ libavutil-ffmpeg54: embedded-library usr/lib/*/libavutil-ffmpeg.so.*: libavutil
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libavutil-ffmpeg54: shlib-with-non-pic-code usr/lib/i386*/libavutil-ffmpeg.so.*
+libavutil-ffmpeg54 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavutil-ffmpeg.so.*
diff --git a/debian/libpostproc-ffmpeg53.lintian-overrides b/debian/libpostproc-ffmpeg53.lintian-overrides
index 3958326..d7c8c50 100644
--- a/debian/libpostproc-ffmpeg53.lintian-overrides
+++ b/debian/libpostproc-ffmpeg53.lintian-overrides
@@ -7,4 +7,4 @@ libpostproc-ffmpeg53: embedded-library usr/lib/*/libpostproc-ffmpeg.so.*: libpos
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libpostproc-ffmpeg53: shlib-with-non-pic-code usr/lib/i386*/libpostproc-ffmpeg.so.*
+libpostproc-ffmpeg53 [i386]: shlib-with-non-pic-code usr/lib/i386*/libpostproc-ffmpeg.so.*
diff --git a/debian/libswresample-ffmpeg1.lintian-overrides b/debian/libswresample-ffmpeg1.lintian-overrides
index 131d116..3f8c984 100644
--- a/debian/libswresample-ffmpeg1.lintian-overrides
+++ b/debian/libswresample-ffmpeg1.lintian-overrides
@@ -3,4 +3,4 @@
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libswresample-ffmpeg1: shlib-with-non-pic-code usr/lib/i386*/libswresample-ffmpeg.so.*
+libswresample-ffmpeg1 [i386]: shlib-with-non-pic-code usr/lib/i386*/libswresample-ffmpeg.so.*
diff --git a/debian/libswscale-ffmpeg3.lintian-overrides b/debian/libswscale-ffmpeg3.lintian-overrides
index 2994cfd..0fedd5a 100644
--- a/debian/libswscale-ffmpeg3.lintian-overrides
+++ b/debian/libswscale-ffmpeg3.lintian-overrides
@@ -3,4 +3,4 @@
 # performance penalty, especially on i386.
 # Therefore -fPIC is not used by the upstream build system on i386.
 # 1: https://www.debian.org/doc/debian-policy/footnotes.html#f83
-libswscale-ffmpeg3: shlib-with-non-pic-code usr/lib/i386*/libswscale-ffmpeg.so.*
+libswscale-ffmpeg3 [i386]: shlib-with-non-pic-code usr/lib/i386*/libswscale-ffmpeg.so.*

-- 
ffmpeg packaging