[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-33-g141ca8c

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Jan 20 14:10:57 UTC 2009


The following commit has been merged in the master branch:
commit d3aeae532cace9e7f8c455fa01698feec18f659e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 13:23:11 2009 +0100

    duplicate the for loop for shlibs generation.
    
    it seems that make doesn't like preprocessor statements inside the a
    multiline line.

diff --git a/debian/rules b/debian/rules
index 1656dd7..3023e63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,14 +137,16 @@ else
 endif
 	dh_compress
 	dh_fixperms
+ifeq ($(DEB_SOURCE),ffmpeg-debian)
 	for pkg in $(LIB_PKGS); do \
-ifneq ($(DEB_SOURCE),ffmpeg-debian)
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+	done
 else
+	for pkg in $(LIB_PKGS); do \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
-endif
 	done
+endif
 	dh_installdeb
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	dh_shlibdeps

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list