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

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

update debian/changelog
drop unused lintian override in debian/control
place transitional packages in oldlibs/extra section to assist package managers
extend package description to include a note what libav actuall is
Bump shlibs for addition of new audio encoding API
Sync post v0.8b2 commits
Fix upgrade path from earlier versions of the 'ffmpeg' package
normalize fields with wrap-and-sort -s
start new upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3e76fd318d644e2bbe7a70e78e7ed9c5ed25af6d
X-Git-Newrev: 3d8e034dc47d5bdf21077046f46a7ae8bc490dc5

The following commit has been merged in the master branch:
commit 3d8e034dc47d5bdf21077046f46a7ae8bc490dc5
Merge: fc35acc36968c21f0472e3800d697b288290d86d 3e76fd318d644e2bbe7a70e78e7ed9c5ed25af6d
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Jan 17 18:22:37 2012 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/libav

diff --combined debian/rules
index 127200c,eb0fe21..bb0113c
--- a/debian/rules
+++ b/debian/rules
@@@ -4,7 -4,7 +4,7 @@@ EPOCH=4
  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 := 4:0.8~beta1~
+ SHLIBS_VERSION := 4:0.8~beta2-2
  
  LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
  DEV_PKGS := $(shell echo $(LIB_PKGS) | sed 's/[0-9]\+\>/-dev/g')
@@@ -22,23 -22,20 +22,23 @@@ endi
  endif
  
  include debian/confflags
 -OPT_FLAVOR := $(filter-out static shared, $(FLAVORS))
 +OPT_FLAVORS := $(filter-out static shared, $(FLAVORS))
  
  $(info FLAVORS = $(FLAVORS))
  $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
  $(info CFLAGS = $(CFLAGS))
  $(info LDFLAGS = $(LDFLAGS))
  
 +define dh_install_file_opt_flavor
 +	  grep @DEB_HOST_MULTIARCH_OPT@ < $(1).in | \
 +	  sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(2)_shlibdir):g' >> $(1)
 +
 +endef
 +
  DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(DEV_PKGS), debian/$(pkg).install)
  $(DH_INSTALL_FILES):
  	sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
 -ifneq (,$(OPT_FLAVOR))
 -	grep @DEB_HOST_MULTIARCH_OPT@ < $@.in | \
 -	sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(OPT_FLAVOR)_shlibdir):g' >> $@
 -endif
 +	$(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
  
  configure-%: configure-stamp-%
  configure-stamp-%: $(QUILT_STAMPFN)

-- 
Libav/FFmpeg packaging