diff -u ffmpeg-0.6.1/debian/changelog ffmpeg-0.6.1/debian/changelog
--- ffmpeg-0.6.1/debian/changelog
+++ ffmpeg-0.6.1/debian/changelog
@@ -1,8 +1,16 @@
-ffmpeg (4:0.6.1-5ubuntu1~ppa1~lucid1) lucid; urgency=low
+ffmpeg (4:0.6.1-5ubuntu2~ppa1~lucid1) lucid; urgency=low
 
-  * Backport to Lucidbleed ppa.
+  * Backport to Lucidbleed.
 
- -- Nicola Ferralis <feranick@hotmail.com>  Wed, 16 Feb 2011 11:22:05 -0500
+ -- Nicola Ferralis <feranick@hotmail.com>  Mon, 21 Mar 2011 14:58:58 -0400
+
+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@trac>  Mon, 14 Mar 2011 13:47:24 +0200
 
 ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
 
diff -u ffmpeg-0.6.1/debian/rules ffmpeg-0.6.1/debian/rules
--- ffmpeg-0.6.1/debian/rules
+++ ffmpeg-0.6.1/debian/rules
@@ -91,7 +91,7 @@
 	$(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 \