[SCM] libav/master: Fix generation of shlibs file

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Aug 4 07:42:54 UTC 2012


The following commit has been merged in the master branch:
commit 8449283dd001b33b4a42c6416dccf7664092896c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 4 09:03:39 2012 +0200

    Fix generation of shlibs file
    
    Wrong make variables where used for the shlibs generation.
    
    Closes: #679542

diff --git a/debian/rules b/debian/rules
index e90da8d..fa5a4a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ EPOCH=6:
 DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
-SHLIBS_VERSION := 5:0.8-2~
+SHLIBS_VERSION := 6:0.8.3-1~
 
 # these package do not build -extra variants
 LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@ -176,7 +176,7 @@ binary-arch: build install
 	done
 	for pkg in $(LIB_PKGS2); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(DEB_VERSION))"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION))"; \
 	done
 	dh_shlibdeps
 	dh_installdeb

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list