r1549 - /experimental/ffmpeg-debian/debian/rules

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Nov 8 12:40:17 UTC 2008


Author: siretart
Date: Sat Nov  8 12:40:17 2008
New Revision: 1549

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1549
Log:
unbreak the build with -unstripped- packages

Modified:
    experimental/ffmpeg-debian/debian/rules

Modified: experimental/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/rules?rev=1549&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/rules (original)
+++ experimental/ffmpeg-debian/debian/rules Sat Nov  8 12:40:17 2008
@@ -6,9 +6,9 @@
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
-SHLIBS_VERSION := 3:0.svn20080925-1
+SHLIBS_VERSION := 3:0.svn20081101-1
 
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-unstripped-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 # we don't need to strip if we are not building the package ffmpeg-debian
 ifneq ($(DEB_SOURCE),ffmpeg-debian)
@@ -133,6 +133,7 @@
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
 	done
 	dh_installdeb
+	env LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib \
 	dh_shlibdeps
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums




More information about the pkg-multimedia-commits mailing list