[SCM] FFmpeg packaging branch, ubuntu, updated. debian/0.6-2ubuntu2

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Jul 31 20:19:10 UTC 2010


The following commit has been merged in the ubuntu branch:
commit 2b20f494ef84389b6079ece0327261dce08802e0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 20:40:55 2010 -0400

    weaken the dependencies for the -extra package
    
    In reality, the ffmpeg-extra package is likely to hang a bit behind the
    ffmpeg 'master' package. Since there is actually no real justification
    for this dependency to be that strict, let's loosen it until we actually
    find problems that are caused by this.

diff --git a/debian/rules b/debian/rules
index 534f5fb..dfd6175 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,7 +127,7 @@ binary-arch: build install codecs.txt formats.txt
 # strict internal dependencies
 	for pkg in $(LIB_PKGS); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_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

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list