[SCM] ffmpeg/ubuntu: Imported Debian patch 0.6.1-5ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 450bfc1e1c555e30acf07dec8aafe4f9f3d8b208
Author: Gal Shalif <gal-fourier at trac>
Date:   Mon Mar 14 13:47:24 2011 +0200

    Imported Debian patch 0.6.1-5ubuntu2

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b408e6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.pc
diff --git a/debian/changelog b/debian/changelog
index 964149b..0f5dea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ffmpeg (4:0.6.1-5ubuntu2) natty; urgency=low
+
+  * Replace cp with tar to avoid an error of "/bin/cp: Argument list too long" on the ARM platform (running under a QEMU chroot environment) (LP: #734331)
+    - Check on a Ubuntu "pbuilder" environment on Ubuntu 10.10/maverick x86
+    - Restore a "Doxygen" file that excidentaly got into the changeset of the bug
+
+ -- Gal Shalif <gal-fourier at trac>  Mon, 14 Mar 2011 13:47:24 +0200
+
 ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
 
   * Merge from debian. Remaining changes:
diff --git a/debian/rules b/debian/rules
index 291796e..29b7063 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ install: build
 	$(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 ] || tar -C doxy -cf - html | tar -C debian/tmp/usr/share/doc/ffmpeg-doc -xf -
 	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 \

-- 
Libav/FFmpeg packaging