[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-17-gc8d8dad

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Wed May 13 04:10:31 UTC 2009


The following commit has been merged in the master branch:
commit 3ed1b06fc000290545cdb5f92f0cf39f32e60ce7
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:27:06 2009 -0400

    Use <package>.docs files to add ffmpeg and ffmpeg-doc documentation.
    Add lines to install lintian overrides but don't enable them yet.
    Fix ordering of dh_* calls in binary-arch target.

diff --git a/debian/rules b/debian/rules
index 0f779c0..b15e185 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,9 +116,11 @@ install: build
 	install -m 644 -D doc/ffserver.conf debian/tmp/etc/
 	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 ifneq ($(DEB_SOURCE),ffmpeg-debian)
-	dh_install --list-missing --sourcedir=debian/tmp
+	dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
+		--list-missing --sourcedir=debian/tmp
 else
-	dh_install --fail-missing --sourcedir=debian/tmp
+	dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
+		--fail-missing --sourcedir=debian/tmp
 endif
 
 formats.txt: install
@@ -134,10 +136,17 @@ endif
 binary-arch: build install formats.txt
 	dh_testdir
 	dh_testroot
+#	install -D -m 0644 debian/libswscale0.override \
+#		$(CURDIR)/debian/libswscale0/usr/share/lintian/overrides/libswscale0
+#	install -D -m 0644 debian/libpostproc51.override \
+#		$(CURDIR)/debian/libpostproc51/usr/share/lintian/overrides/libpostproc51
+#	install -D -m 0644 debian/libavcodec52.override \
+#		$(CURDIR)/debian/libavcodec52/usr/share/lintian/overrides/libavcodec52
+	dh_installman -pffmpeg debian/qt-faststart.1
 	dh_installdocs $(extradoc) doc/optimization.txt
 	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
 	dh_installdocs -A debian/README.Debian
-	dh_installdocs LICENSE RELEASE
+	dh_installdocs RELEASE
 ifeq ($(DEB_SOURCE),ffmpeg)
 	dh_installdocs -p libavcodec-unstripped-52 formats.txt
 else
@@ -147,13 +156,13 @@ endif
 	dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
 	dh_installchangelogs Changelog
 	dh_link
+	dh_compress
+	dh_fixperms
 ifneq ($(DEB_SOURCE),ffmpeg-debian)
 	dh_strip
 else
 	dh_strip --dbg-package=ffmpeg-dbg
 endif
-	dh_compress
-	dh_fixperms
 # strict internal dependencies
 ifeq ($(DEB_SOURCE),ffmpeg-debian)
 	for pkg in $(LIB_PKGS); do \
@@ -165,8 +174,6 @@ else
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
 	done
 endif
-	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
-	dh_shlibdeps
 # target dependencies for external packages
 ifeq ($(DEB_SOURCE),ffmpeg-debian)
 	for pkg in $(LIB_PKGS); do \
@@ -178,6 +185,8 @@ else
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
 	done
 endif
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
+	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list