[SCM] ffmpeg/master: Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679)
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Fri Mar 18 11:33:21 UTC 2011
The following commit has been merged in the master branch:
commit 482f041614b134b32bc2c0ac0ce788c77c81ef98
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Fri Mar 18 12:33:40 2011 +0100
Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679)
diff --git a/debian/rules b/debian/rules
index 291796e..58fa8d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,9 +89,9 @@ 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)))
- 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
+ [ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/ffmpeg-doc
+ install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
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
dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list