[SCM] ffmpeg/master.snapshot: simplify lintian-overrides

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 6f0c1c8d5175412fa283d4c3b50169ab33d0ab5e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 28 23:27:24 2011 +0100

    simplify lintian-overrides
    
    this makes the overrides also more robust for future upstream changes

diff --git a/debian/libavcodec52.lintian-overrides b/debian/libavcodec52.lintian-overrides
index 6c766c6..c0169c8 100644
--- a/debian/libavcodec52.lintian-overrides
+++ b/debian/libavcodec52.lintian-overrides
@@ -1,3 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavcodec52: shlib-with-non-pic-code usr/lib/i686/cmov/libavcodec.so.52.72.2
-libavcodec52: shlib-with-non-pic-code usr/lib/libavcodec.so.52.72.2
+libavcodec52: shlib-with-non-pic-code
diff --git a/debian/libavdevice52.lintian-overrides b/debian/libavdevice52.lintian-overrides
index b01618a..8c7d335 100644
--- a/debian/libavdevice52.lintian-overrides
+++ b/debian/libavdevice52.lintian-overrides
@@ -1,3 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavdevice52: shlib-with-non-pic-code usr/lib/i686/cmov/libavdevice.so.52.2.0
-libavdevice52: shlib-with-non-pic-code usr/lib/libavdevice.so.52.2.0
+libavdevice52: shlib-with-non-pic-code
diff --git a/debian/libavfilter1.lintian-overrides b/debian/libavfilter1.lintian-overrides
index bd463af..88661c6 100644
--- a/debian/libavfilter1.lintian-overrides
+++ b/debian/libavfilter1.lintian-overrides
@@ -1,3 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavfilter1: shlib-with-non-pic-code usr/lib/i686/cmov/libavfilter.so.1.19.0
-libavfilter1: shlib-with-non-pic-code usr/lib/libavfilter.so.1.19.0
+libavfilter1: shlib-with-non-pic-code
diff --git a/debian/libavformat52.lintian-overrides b/debian/libavformat52.lintian-overrides
index 44f5fc9..1f088ad 100644
--- a/debian/libavformat52.lintian-overrides
+++ b/debian/libavformat52.lintian-overrides
@@ -1,3 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavformat52: shlib-with-non-pic-code usr/lib/i686/cmov/libavformat.so.52.64.2
-libavformat52: shlib-with-non-pic-code usr/lib/libavformat.so.52.64.2
+libavformat52: shlib-with-non-pic-code
diff --git a/debian/libavutil50.lintian-overrides b/debian/libavutil50.lintian-overrides
index a9adefe..941bc45 100644
--- a/debian/libavutil50.lintian-overrides
+++ b/debian/libavutil50.lintian-overrides
@@ -1,3 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libavutil50: shlib-with-non-pic-code usr/lib/i686/cmov/libavutil.so.50.15.1
-libavutil50: shlib-with-non-pic-code usr/lib/libavutil.so.50.15.1
+libavutil50: shlib-with-non-pic-code
diff --git a/debian/libpostproc51.lintian-overrides b/debian/libpostproc51.lintian-overrides
index 0860481..10385af 100644
--- a/debian/libpostproc51.lintian-overrides
+++ b/debian/libpostproc51.lintian-overrides
@@ -1,3 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libpostproc51: shlib-with-non-pic-code usr/lib/i686/cmov/libpostproc.so.51.2.0
-libpostproc51: shlib-with-non-pic-code usr/lib/libpostproc.so.51.2.0
+libpostproc51: shlib-with-non-pic-code
diff --git a/debian/libswscale0.lintian-overrides b/debian/libswscale0.lintian-overrides
index 5509cf2..0e7f531 100644
--- a/debian/libswscale0.lintian-overrides
+++ b/debian/libswscale0.lintian-overrides
@@ -1,3 +1,2 @@
 # Overriding these fpic lintian errors. Please see bug #528080.
-libswscale0: shlib-with-non-pic-code usr/lib/i686/cmov/libswscale.so.0.11.0
-libswscale0: shlib-with-non-pic-code usr/lib/libswscale.so.0.11.0
+libswscale0: shlib-with-non-pic-code
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index c842671..4b980c3 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,4 +1,3 @@
 # The dependencies for packages within ffmpeg are different than the
 # dependencies for packages that depend on the ffmpeg libraries.
-ffmpeg source: debian-rules-calls-debhelper-in-odd-order dh_makeshlibs (line 174)
-ffmpeg source: debian-rules-calls-debhelper-in-odd-order dh_makeshlibs (line 178)
+ffmpeg source: debian-rules-calls-debhelper-in-odd-order

-- 
FFmpeg packaging