[SCM] libav/ubuntu: logic error in LIB_PKGS/LIB_PKGS variables
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 11 18:50:33 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 9032934859ae09d720a43aaadd2458fed2a5360b
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Aug 11 19:45:34 2012 +0200
logic error in LIB_PKGS/LIB_PKGS variables
This should unbreak the shlibs files
diff --git a/debian/rules b/debian/rules
index 047a53d..b9dbf31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,21 +6,12 @@ DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
SHLIBS_VERSION := $(EPOCH)0.8.3-1~
-ifeq ($(DEB_SOURCE),libav)
-# these package do not build -extra variants
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-# these packages do build -extra variants
-LIB_PKGS2 :=
-# these packages are the -extra- variants
-LIB_EXTRA_PKGS :=
-else
# these package do not build -extra variants
LIB_PKGS :=
# these packages do build -extra variants
LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
# these packages are the -extra- variants
LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-endif
# these are the -dev packages
DEV_PKGS := $(shell echo $(LIB_PKGS) $(LIB_PKGS2) | sed 's/[0-9]\+\>/-dev/g')
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list