[SCM] libav/experimental: Merge branch 'experimental' of ssh://git.debian.org/git/pkg-multimedia/libav into experimental

[siretart at users.alioth.debian.org]

Some fixes and leftovers from soname bumps
Make libavcodec-dev depend on libavresample-dev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: a23a1d4300c2db8adca08ee0a0e1739026625459
X-Git-Newrev: 72af2caf5c2dea6d59cf58dbe77daf7a67be97c0

The following commit has been merged in the experimental branch:
commit b1aa5d3c78670def19c6e6c64169f9faa03cff9f
Merge: 3df2f989cc640c58ff3475a53bc4e8dcae5e8d32 a23a1d4300c2db8adca08ee0a0e1739026625459
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 30 11:00:00 2014 -0400

    Merge branch 'experimental' of ssh://git.debian.org/git/pkg-multimedia/libav into experimental

diff --combined debian/control
index 6c90035,7e3c3c8..33d77dc
--- a/debian/control
+++ b/debian/control
@@@ -24,7 -24,7 +24,7 @@@ Build-Depends
   libcdio-paranoia-dev,
   libdc1394-22-dev [linux-any],
   libfreetype6-dev (>= 2.5.1),
 - libgnutls-dev,
 + libgnutls28-dev,
   libgsm1-dev,
   libjack-dev,
   libmp3lame-dev,
@@@ -212,10 -212,6 +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.
@@@ -244,6 -240,7 +240,7 @@@ Depends
   libavcodec56 (<= ${source:Upstream-Version}-99) | libavcodec-extra-56 (<= ${source:Upstream-Version}-99),
   libavcodec56 (>= ${binary:Version}) | libavcodec-extra-56 (>= ${binary:Version}),
   libavutil-dev (= ${binary:Version}),
+  libavresample-dev (= ${binary:Version}),
   ${misc:Depends}
  Suggests:
   libdc1394-22-dev [linux-any],
diff --combined debian/rules
index f375ed3,8c582bc..72227f5
--- a/debian/rules
+++ b/debian/rules
@@@ -4,7 -4,7 +4,7 @@@ EPOCH=6
  DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
  DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
  UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 -SHLIBS_VERSION := $(EPOCH)10~beta1~
 +SHLIBS_VERSION := $(EPOCH)11~beta1
  
  # The libavcodec-extra package is necessary because it links against
  # libraries that are GPLv3 licensed. Make sure that you do not link
@@@ -147,9 -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