[SCM] ffmpeg/experimental: No longer add -ffmpeg to SONAME

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 37b8ce1dff8dd66b455a0ab95dfd7b5c6a09122f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Mar 7 00:35:42 2016 +0100

    No longer add -ffmpeg to SONAME
    
    There is no conflict with libav anymore.

diff --git a/debian/patches/Change-symbol-versioning.patch b/debian/patches/Change-symbol-versioning.patch
deleted file mode 100644
index da1ddb9..0000000
--- a/debian/patches/Change-symbol-versioning.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Add _FFMPEG to the symbol versions
- This is done to ensure that there is no confusion, if a binary is linked
- against FFmpeg and another shared library, which is linked against Libav.
-
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Forwarded: not-needed
-Last-Update: <2014-09-14>
-
---- a/libavcodec/libavcodec.v
-+++ b/libavcodec/libavcodec.v
-@@ -1,4 +1,4 @@
--LIBAVCODEC_$MAJOR {
-+LIBAVCODEC_FFMPEG_$MAJOR {
-         global: av*;
-                 #deprecated, remove after next bump
-                 audio_resample;
---- a/libavdevice/libavdevice.v
-+++ b/libavdevice/libavdevice.v
-@@ -1,4 +1,4 @@
--LIBAVDEVICE_$MAJOR {
-+LIBAVDEVICE_FFMPEG_$MAJOR {
-         global: avdevice_*; av_*;
-         local: *;
- };
---- a/libavfilter/libavfilter.v
-+++ b/libavfilter/libavfilter.v
-@@ -1,4 +1,4 @@
--LIBAVFILTER_$MAJOR {
-+LIBAVFILTER_FFMPEG_$MAJOR {
-         global: avfilter_*; av_*;
-         local: *;
- };
---- a/libavformat/libavformat.v
-+++ b/libavformat/libavformat.v
-@@ -1,4 +1,4 @@
--LIBAVFORMAT_$MAJOR {
-+LIBAVFORMAT_FFMPEG_$MAJOR {
-         global: av*;
-                 #FIXME those are for ffserver
-                 ff_inet_aton;
---- a/libavresample/libavresample.v
-+++ b/libavresample/libavresample.v
-@@ -1,4 +1,4 @@
--LIBAVRESAMPLE_$MAJOR {
-+LIBAVRESAMPLE_FFMPEG_$MAJOR {
-         global: av*;
-         local:  *;
- };
---- a/libavutil/libavutil.v
-+++ b/libavutil/libavutil.v
-@@ -1,4 +1,4 @@
--LIBAVUTIL_$MAJOR {
-+LIBAVUTIL_FFMPEG_$MAJOR {
-         global: av*;
-         local: *;
- };
---- a/libpostproc/libpostproc.v
-+++ b/libpostproc/libpostproc.v
-@@ -1,4 +1,4 @@
--LIBPOSTPROC_$MAJOR {
-+LIBPOSTPROC_FFMPEG_$MAJOR {
-         global: postproc_*; pp_*;
-         local: *;
- };
---- a/libswresample/libswresample.v
-+++ b/libswresample/libswresample.v
-@@ -1,4 +1,4 @@
--LIBSWRESAMPLE_$MAJOR {
-+LIBSWRESAMPLE_FFMPEG_$MAJOR {
-         global: swr_*; swresample_*;
-         local: *;
- };
---- a/libswscale/libswscale.v
-+++ b/libswscale/libswscale.v
-@@ -1,4 +1,4 @@
--LIBSWSCALE_$MAJOR {
-+LIBSWSCALE_FFMPEG_$MAJOR {
-         global: swscale_*; sws_*;
-         local: *;
- };
diff --git a/debian/patches/series b/debian/patches/series
index dcb90a7..504d6ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-Change-symbol-versioning.patch
 doc-make-apidoc-output-independent-of-SRC_PATH.patch
 build-make-out-of-tree-builds-bit-identical-to-in-tr.patch
diff --git a/debian/rules b/debian/rules
index fb5320f..92baa10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,10 +53,8 @@ FLAVORS = standard extra
 #    This could be used together with Breaks:, Replaces: against the corresponding Libav libraries.
 #  * With --enable-raise-major, the resulting binaries should be co-installable with the Libav ones and thus no conflicts would be necessary.
 #    But this could break versioned configure checks.
-#  * With --build-suffix="-ffmpeg" the library names are changed, so there can't be a conflict with Libav.
 CONFIG := --prefix=/usr \
 	--extra-version="$(DEB_REVISION)" \
-	--build-suffix="-ffmpeg" \
 	--toolchain=hardened \
 	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	--incdir=/usr/include/$(DEB_HOST_MULTIARCH) \
@@ -247,14 +245,6 @@ ifeq ($(DEB_HOST_ARCH),powerpc)
 	install -d debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
 	install -m 644 debian/altivec-extra/*/*.so.* debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
 endif
-	# Create symbolic links from the standard library lib*.so symlinks, pkg-config files and static libraries to the suffixed ones.
-	for lib in `find debian/ -name lib*-ffmpeg.so; find debian/ -name lib*.pc; find debian/ -name lib*.a`; do \
-		dir=`dirname $$lib`; \
-		base=`basename $$lib`; \
-		link=`echo $$base | sed 's/-ffmpeg//'`; \
-		ln -sf $$base $$link; \
-		mv $$link $$dir; \
-	done
 
 override_dh_install:
 	dh_install -N $(EXTRA_PKG)

-- 
ffmpeg packaging