[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-1-2-g03bdeab

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0b8ab0ba16f6c152efa8e46becb9a5ffbf4fb40e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 12:40:01 2009 +0200

    change the shlibs file
    
    the shlibs file should now make packages depend on the '-extra-'
    variants instead of the -unstripped- ones. this makes the job of apt's
    dependency solver much easier.

diff --git a/debian/rules b/debian/rules
index 149e86d..47e7cd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ ifeq ($(SVN_VERSION),)
 $(error UPSTREAM_VERSION: $(UPSTREAM_VERSION) - but SVN_VERSION is empty! - check debian/rules)
 endif
 
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-unstripped-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 # Support multiple makes at once
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -124,14 +124,14 @@ binary-arch: build install formats.txt
 
 # strict internal dependencies
 	for pkg in $(LIB_PKGS); do \
-	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
+	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
 	done
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	dh_shlibdeps
 # target dependencies for external packages
 	for pkg in $(LIB_PKGS); do \
-	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
+	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
 	done
 	dh_installdeb

-- 
FFmpeg packaging