[SCM] libav/experimental: fix the shlibs file in the -extra- variants

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 926fda7ad258cb82007953256e349ae1ac1de573
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 19 11:56:34 2013 +0100

    fix the shlibs file in the -extra- variants
    
    The shlibs file in the -extra- variants need to be alternative as well
    
    Git-dch: ignore

diff --git a/debian/rules b/debian/rules
index 9607129..151a17d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -230,12 +230,12 @@ endif
 	for pkg in $(LIB_PKGS); do \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
 	done
-	# operate e.g. the -extra- packages, produce shlibs on their counterparts
+	# operate e.g. the -extra- packages, produce shlibs that have alternative dependencies
 	for pkg in $(LIB_EXTRA_PKGS); do \
 	    npkg=$$(echo "$$pkg" | sed -r 's/-extra-//'); \
-	    dh_makeshlibs -p"$$pkg" -V"$$npkg (>= $(SHLIBS_VERSION))"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$npkg (>= $(SHLIBS_VERSION)) | $$pkg (>= $(EPOCH)$(UPSTREAM_VERSION))"; \
 	done
-	# operate on libavcodec54 - these produce shlibs that have alternative dependencies
+	# operate on packages with -extra- variants such as libavcodec54 - produce shlibs that have alternative dependencies
 	for pkg in $(LIB_PKGS2); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION))"; \

-- 
Libav/FFmpeg packaging