[SCM] ffmpeg/master: Adapt lintian overrides to PIE by default.

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

The following commit has been merged in the master branch:
commit a9805b3099ef9b8cd1edcf7f544eea0d9310ca60
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Oct 22 22:08:18 2016 +0200

    Adapt lintian overrides to PIE by default.

diff --git a/debian/libavcodec-extra57.lintian-overrides b/debian/libavcodec-extra57.lintian-overrides
index 57e7f1a..0dad43a 100644
--- a/debian/libavcodec-extra57.lintian-overrides
+++ b/debian/libavcodec-extra57.lintian-overrides
@@ -1,8 +1,9 @@
 # According to Debian policy [1], non position independent code is permitted
 # in a shared library on i386 and position independent code may have a
 # 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
+# Upstream's hand-written assembler optimizations are not position independent
+# on i386.
+# 1: https://www.debian.org/doc/debian-policy/footnotes.html#f84
 libavcodec-extra57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavcodec.so.*
 
 # This is intentional, because this package provides an alternative variant with the same soname.
diff --git a/debian/libavcodec57.lintian-overrides b/debian/libavcodec57.lintian-overrides
index 951eecf..890de4e 100644
--- a/debian/libavcodec57.lintian-overrides
+++ b/debian/libavcodec57.lintian-overrides
@@ -1,6 +1,7 @@
 # According to Debian policy [1], non position independent code is permitted
 # in a shared library on i386 and position independent code may have a
 # 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
+# Upstream's hand-written assembler optimizations are not position independent
+# on i386.
+# 1: https://www.debian.org/doc/debian-policy/footnotes.html#f84
 libavcodec57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavcodec.so.*
diff --git a/debian/libavdevice57.lintian-overrides b/debian/libavdevice57.lintian-overrides
deleted file mode 100644
index e953e70..0000000
--- a/debian/libavdevice57.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# According to Debian policy [1], non position independent code is permitted
-# in a shared library on i386 and position independent code may have a
-# 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
-libavdevice57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavdevice.so.*
diff --git a/debian/libavfilter-extra6.lintian-overrides b/debian/libavfilter-extra6.lintian-overrides
index 5e6db9b..481cbff 100644
--- a/debian/libavfilter-extra6.lintian-overrides
+++ b/debian/libavfilter-extra6.lintian-overrides
@@ -1,8 +1,9 @@
 # According to Debian policy [1], non position independent code is permitted
 # in a shared library on i386 and position independent code may have a
 # 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
+# Upstream's hand-written assembler optimizations are not position independent
+# on i386.
+# 1: https://www.debian.org/doc/debian-policy/footnotes.html#f84
 libavfilter-extra6 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavfilter.so.*
 
 # This is intentional, because this package provides an alternative variant with the same soname.
diff --git a/debian/libavfilter6.lintian-overrides b/debian/libavfilter6.lintian-overrides
index 1dd5cc0..f42282a 100644
--- a/debian/libavfilter6.lintian-overrides
+++ b/debian/libavfilter6.lintian-overrides
@@ -1,6 +1,7 @@
 # According to Debian policy [1], non position independent code is permitted
 # in a shared library on i386 and position independent code may have a
 # 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
+# Upstream's hand-written assembler optimizations are not position independent
+# on i386.
+# 1: https://www.debian.org/doc/debian-policy/footnotes.html#f84
 libavfilter6 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavfilter.so.*
diff --git a/debian/libavformat57.lintian-overrides b/debian/libavformat57.lintian-overrides
index 37bafa9..2765418 100644
--- a/debian/libavformat57.lintian-overrides
+++ b/debian/libavformat57.lintian-overrides
@@ -1,9 +1,2 @@
 # [67] = "Psychadelic", /* sic, the misspelling is used in the specification */
 libavformat57: spelling-error-in-binary usr/lib/*/libavformat.so.* Psychadelic Psychedelic
-
-# According to Debian policy [1], non position independent code is permitted
-# in a shared library on i386 and position independent code may have a
-# 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
-libavformat57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavformat.so.*
diff --git a/debian/libavutil55.lintian-overrides b/debian/libavutil55.lintian-overrides
deleted file mode 100644
index 207247e..0000000
--- a/debian/libavutil55.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# According to Debian policy [1], non position independent code is permitted
-# in a shared library on i386 and position independent code may have a
-# 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
-libavutil55 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavutil.so.*
diff --git a/debian/libpostproc54.lintian-overrides b/debian/libpostproc54.lintian-overrides
index b0c9d88..f70827f 100644
--- a/debian/libpostproc54.lintian-overrides
+++ b/debian/libpostproc54.lintian-overrides
@@ -1,6 +1,7 @@
 # According to Debian policy [1], non position independent code is permitted
 # in a shared library on i386 and position independent code may have a
 # 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
+# Upstream's hand-written assembler optimizations are not position independent
+# on i386.
+# 1: https://www.debian.org/doc/debian-policy/footnotes.html#f84
 libpostproc54 [i386]: shlib-with-non-pic-code usr/lib/i386*/libpostproc.so.*
diff --git a/debian/libswresample2.lintian-overrides b/debian/libswresample2.lintian-overrides
index 0d86bff..925fb2a 100644
--- a/debian/libswresample2.lintian-overrides
+++ b/debian/libswresample2.lintian-overrides
@@ -1,6 +1,7 @@
 # According to Debian policy [1], non position independent code is permitted
 # in a shared library on i386 and position independent code may have a
 # 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
+# Upstream's hand-written assembler optimizations are not position independent
+# on i386.
+# 1: https://www.debian.org/doc/debian-policy/footnotes.html#f84
 libswresample2 [i386]: shlib-with-non-pic-code usr/lib/i386*/libswresample.so.*
diff --git a/debian/libswscale4.lintian-overrides b/debian/libswscale4.lintian-overrides
index 2eb539d..fe9245b 100644
--- a/debian/libswscale4.lintian-overrides
+++ b/debian/libswscale4.lintian-overrides
@@ -1,6 +1,7 @@
 # According to Debian policy [1], non position independent code is permitted
 # in a shared library on i386 and position independent code may have a
 # 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
+# Upstream's hand-written assembler optimizations are not position independent
+# on i386.
+# 1: https://www.debian.org/doc/debian-policy/footnotes.html#f84
 libswscale4 [i386]: shlib-with-non-pic-code usr/lib/i386*/libswscale.so.*

-- 
ffmpeg packaging