[SCM] libav/master: Simplify internal dependencies
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Mon May 14 20:18:28 UTC 2012
The following commit has been merged in the master branch:
commit 8fc5e9f74472862599991a9f3eb84060cfc0dfec
Author: Reinhard Tartler <siretart at tauware.de>
Date: Mon May 14 21:37:50 2012 +0200
Simplify internal dependencies
Closes: #672791
diff --git a/debian/rules b/debian/rules
index ad29631..1aa22fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,29 +175,14 @@ binary-arch: build install
dh_fixperms
dh_strip
-# strict internal dependencies
for pkg in $(LIB_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION))"; \
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)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
- done
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
- dh_shlibdeps $(addprefix -N,$(LIB_EXTRA_PKGS)) $(addprefix -L,$(LIB_PKGS))
- for pkg in $(LIB_EXTRA_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
- done
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
- dh_shlibdeps $(addprefix -p,$(LIB_EXTRA_PKGS)) $(addprefix -L,$(LIB_EXTRA_PKGS))
-# target dependencies for external packages
- for pkg in $(LIB_PKGS) $(LIB_EXTRA_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
- done
- for pkg in $(LIB_PKGS2); do \
- upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(DEB_VERSION))"; \
done
+ dh_shlibdeps
dh_installdeb
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
dh_md5sums
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list