[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-48-g4412df3

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Feb 2 23:03:53 UTC 2009


The following commit has been merged in the master branch:
commit 8779c3ff10bfb56e0e909bf6139d7a54a9c809ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 23:05:55 2009 +0100

    use install instead of cp to install some files.
    
    install -D does create directories...

diff --git a/debian/rules b/debian/rules
index ed6c710..7adbe6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,11 +92,11 @@ install: build
 	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
 	dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
-	cp debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
+	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
 	# don't fail on binary-indep only builds.
 	[ ! -d doxy ] || cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html
-	cp doc/ffserver.conf debian/tmp/etc/
-	cp debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
+	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
 else

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list