[SCM] libav/ubuntu.extra: fixup from last merge to make the package actually build
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 10 19:20:20 UTC 2012
The following commit has been merged in the ubuntu.extra branch:
commit 342796be3e97f6f048adebdace6e7d901288b436
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Jun 10 21:14:12 2012 +0200
fixup from last merge to make the package actually build
diff --git a/debian/rules b/debian/rules
index fc32f02..830d40c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ define dh_install_file_opt_flavor
endef
-DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(DEV_PKGS), debian/$(pkg).install)
+DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS), debian/$(pkg).install)
$(DH_INSTALL_FILES):
sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
$(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
@@ -45,7 +45,7 @@ libav/configure:
tar xvf /usr/src/libav-source.tar.gz
configure-%: configure-stamp-%
-configure-stamp-%: snapshot_version libav/configure
+configure-stamp-%: libav/configure
dh_testdir
mkdir -p debian-$*
cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/libav/configure \
@@ -96,7 +96,7 @@ install: build $(DH_INSTALL_FILES)
dh_prep
$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
- --warn-missing --sourcedir=debian/tmp
+ --list-missing --sourcedir=debian/tmp
formats.txt: install
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -112,7 +112,6 @@ binary-arch: build install codecs.txt formats.txt
dh_testdir
dh_testroot
dh_installdocs $(extradoc) libav/doc/optimization.txt
- dh_installdocs -A libav/CREDITS libav/doc/TODO
dh_installdocs -A debian/README.Debian
dh_installdocs -p libavcodec-extra-53 codecs.txt
dh_installdocs -p libavformat-extra-53 formats.txt
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list