[SCM] libav/experimental: Some fixes and leftovers from soname bumps

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

The following commit has been merged in the experimental branch:
commit a23a1d4300c2db8adca08ee0a0e1739026625459
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Tue Aug 26 16:06:30 2014 +0200

    Some fixes and leftovers from soname bumps

diff --git a/debian/control b/debian/control
index e547120..7e3c3c8 100644
--- a/debian/control
+++ b/debian/control
@@ -212,10 +212,6 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Replaces:
- libswscale-extra-2
-Breaks:
- libswscale-extra-2 (<< 5:0.8.1-2)
 Description: Libav video scaling library
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
diff --git a/debian/libavcodec-extra-56.lintian-overrides b/debian/libavcodec-extra-56.lintian-overrides
index 3299a5c..295b2ff 100644
--- a/debian/libavcodec-extra-56.lintian-overrides
+++ b/debian/libavcodec-extra-56.lintian-overrides
@@ -1,3 +1,3 @@
-# This is the sister package of libavcodec54
+# This is the sister package of libavcodec56
 libavcodec-extra-56: package-name-doesnt-match-sonames
 libavcodec-extra-56: shlib-with-non-pic-code
diff --git a/debian/rules b/debian/rules
index 3e7fab6..8c582bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,9 +147,9 @@ install: build $(DH_INSTALL_FILES)
 	$(foreach flavor,$(filter-out static,$(FLAVORS)),$(call install_flavor_extra,$(flavor)))
 	dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) --fail-missing \
 		--sourcedir=debian/tmp/extra
-	$(call call_and_install_avconv_dump,libavformat55,formats)
-	$(call call_and_install_avconv_dump,libavcodec55,codecs)
-	$(call call_and_install_avconv_dump,libavcodec-extra-55,codecs)
+	$(call call_and_install_avconv_dump,libavformat56,formats)
+	$(call call_and_install_avconv_dump,libavcodec56,codecs)
+	$(call call_and_install_avconv_dump,libavcodec-extra-56,codecs)
 
 binary-indep:
 	dh_testdir

-- 
Libav/FFmpeg packaging