[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-31-ge5ba810

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e5ba8104bd5792a78327f2a7700006d517b04438
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 14 09:01:36 2009 +0200

    revert to strict internal libavcodec dependencies
    
    In the following commit, we implemented different internal dependencies
    to what is specified in the (also generated) shlibs file without using
    an shlibs.local file.
    
    commit a1229f8ace3f5cf129685b26d9ef212637caa3b9
    Author: Fabian Greffrath <fabian at debian-unofficial.org>
    Date:   Wed Jan 28 15:10:58 2009 +0100
    
        Use an alternative approach to achieve strict internal dependencies
        by calling dh_makeshlibs twice in debian/rules instead of a
        debian/shlibs.local file.
    
    This patch reinstantiates this behavior. The previous commit did not
    clearly indicate that it was the intention to change this behavior.
    
    This reverts parts of commit 3ed1b06fc000290545cdb5f92f0cf39f32e60ce7

diff --git a/debian/rules b/debian/rules
index 74f402c..4a878ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -164,6 +164,8 @@ else
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
 	done
 endif
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
+	dh_shlibdeps
 # target dependencies for external packages
 ifeq ($(DEB_SOURCE),ffmpeg-debian)
 	for pkg in $(LIB_PKGS); do \
@@ -175,8 +177,6 @@ else
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
 	done
 endif
-	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
-	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums

-- 
FFmpeg packaging