[SCM] ffmpeg/experimental: Update lintian overrides

Mon Mar 7 21:48:23 UTC 2016

The following commit has been merged in the experimental branch:
commit 859a07cb38a62607e4d8687f70119867c9067a2e
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Mar 7 01:21:07 2016 +0100

    Update lintian overrides

diff --git a/debian/libavcodec-extra57.lintian-overrides b/debian/libavcodec-extra57.lintian-overrides
index 5992eea..869b685 100644
--- a/debian/libavcodec-extra57.lintian-overrides
+++ b/debian/libavcodec-extra57.lintian-overrides
@@ -3,8 +3,8 @@
 # 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-ffmpeg-extra56 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavcodec-ffmpeg.so.*
+libavcodec-extra57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavcodec.so.*
 # The two packages provide the same API/ABI, so the alternative dependency is correct.
-libavcodec-ffmpeg-extra56: symbols-declares-dependency-on-other-package libavcodec-ffmpeg* #MINVER#
+libavcodec-extra57: symbols-declares-dependency-on-other-package libavcodec* #MINVER#
 # This is intentional, because this package provides an alternative variant with the same soname.
-libavcodec-ffmpeg-extra56: package-name-doesnt-match-sonames libavcodec-ffmpeg*
+libavcodec-extra57: package-name-doesnt-match-sonames libavcodec*
diff --git a/debian/libavcodec57.lintian-overrides b/debian/libavcodec57.lintian-overrides
index 330d759..2264920 100644
--- a/debian/libavcodec57.lintian-overrides
+++ b/debian/libavcodec57.lintian-overrides
@@ -3,6 +3,6 @@
 # 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 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavcodec-ffmpeg.so.*
+libavcodec57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavcodec.so.*
 # The two packages provide the same API/ABI, so the alternative dependency is correct.
-libavcodec-ffmpeg56: symbols-declares-dependency-on-other-package libavcodec-ffmpeg-extra* #MINVER#
+libavcodec57: symbols-declares-dependency-on-other-package libavcodec-extra* #MINVER#
diff --git a/debian/libavdevice57.lintian-overrides b/debian/libavdevice57.lintian-overrides
index c2a85b5..e953e70 100644
--- a/debian/libavdevice57.lintian-overrides
+++ b/debian/libavdevice57.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
-libavdevice-ffmpeg56 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavdevice-ffmpeg.so.*
+libavdevice57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavdevice.so.*
diff --git a/debian/libavfilter6.lintian-overrides b/debian/libavfilter6.lintian-overrides
index c04319a..1dd5cc0 100644
--- a/debian/libavfilter6.lintian-overrides
+++ b/debian/libavfilter6.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
-libavfilter-ffmpeg5 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavfilter-ffmpeg.so.*
+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 480e4e0..37bafa9 100644
--- a/debian/libavformat57.lintian-overrides
+++ b/debian/libavformat57.lintian-overrides
@@ -1,9 +1,9 @@
 # [67] = "Psychadelic", /* sic, the misspelling is used in the specification */
-libavformat-ffmpeg56: spelling-error-in-binary usr/lib/*/libavformat-ffmpeg.so.* Psychadelic Psychedelic
+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
-libavformat-ffmpeg56 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavformat-ffmpeg.so.*
+libavformat57 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavformat.so.*
diff --git a/debian/libavresample3.lintian-overrides b/debian/libavresample3.lintian-overrides
index c3f5d7e..c5fb72c 100644
--- a/debian/libavresample3.lintian-overrides
+++ b/debian/libavresample3.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 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavresample-ffmpeg.so.*
+libavresample3 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavresample.so.*
diff --git a/debian/libavutil55.lintian-overrides b/debian/libavutil55.lintian-overrides
index 04ca826..207247e 100644
--- a/debian/libavutil55.lintian-overrides
+++ b/debian/libavutil55.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
-libavutil-ffmpeg54 [i386]: shlib-with-non-pic-code usr/lib/i386*/libavutil-ffmpeg.so.*
+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 d7c8c50..2d0f52f 100644
--- a/debian/libpostproc54.lintian-overrides
+++ b/debian/libpostproc54.lintian-overrides
@@ -1,10 +1,10 @@
 # This is a bug in lintian thinking only libav (and not also FFmpeg) build libpostproc.
 # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729203#430
-libpostproc-ffmpeg53: embedded-library usr/lib/*/libpostproc-ffmpeg.so.*: libpostproc
+libpostproc54: embedded-library usr/lib/*/libpostproc.so.*: libpostproc
 
 # 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
-libpostproc-ffmpeg53 [i386]: shlib-with-non-pic-code usr/lib/i386*/libpostproc-ffmpeg.so.*
+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 3f8c984..0d86bff 100644
--- a/debian/libswresample2.lintian-overrides
+++ b/debian/libswresample2.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 [i386]: shlib-with-non-pic-code usr/lib/i386*/libswresample-ffmpeg.so.*
+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 0fedd5a..2eb539d 100644
--- a/debian/libswscale4.lintian-overrides
+++ b/debian/libswscale4.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 [i386]: shlib-with-non-pic-code usr/lib/i386*/libswscale-ffmpeg.so.*
+libswscale4 [i386]: shlib-with-non-pic-code usr/lib/i386*/libswscale.so.*

-- 
ffmpeg packaging

