Merge lp:~gal-fourier/ubuntu/natty/ffmpeg/bug-734331 into lp:ubuntu/natty/ffmpeg

[Gal Shalif]

== Subject ==
 * Fix a minor bug in debian/rules: replace "cp" with "tar"

== Details ==
 * /bin/cp can not handle too many files (that are automatically generated doxygen) and exit with error: "/bin/cp: Argument list too long"

== Reproduce the Bug ==
 * ARM (armel) maverick
 * Note: The bug do NOT manifest on X86 (i386) maverick

== Bug diff -u (not including the changelog) ==
diff -u natty/debian/rules bug-734331/debian/rules
--- natty/debian/rules 2011-03-13 17:04:28.765717000 +0200
+++ bug-734331/debian/rules 2011-03-13 18:52:27.848451776 +0200
@@ -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 \

[Dustin Kirkland  (kirkland)]

Looks good, thanks!

review: Approve

[Dustin Kirkland  (kirkland)]

On Mon, Mar 14, 2011 at 10:51 AM, Gal Shalif <email address hidden> wrote:
>> Looks good, thanks!
>
> My first upload to Ubuntu :-)

Congrads, and thanks :-)

Please see the way I modified your change, attaching it as a patch in
debian/patches.

And please do forward your patch to the upstream lirc project.

Thanks,
Dustin

[Dustin Kirkland  (kirkland)]

On Mon, Mar 14, 2011 at 11:30 AM, Gal Shalif <email address hidden> wrote:
> Gal: Where can I view the changeset as a patch/ (i.e. debian/patches)?
> Gal: The changeset that I had found is at:
> Gal: 1.
> http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/natty/ffmpeg/natty/view/head:/debian/rules
> line # 94.
> Gal: 2.
> http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/natty/ffmpeg/natty/view/head:/debian/changelog
> lines 1-7
>
>> And please do forward your patch to the upstream lirc project.
>
> Gal: What is the LIRC project (LIRC is probably not the infra-red remote
> control support)?
> Gal: P.S. My next step was to inform the FFmpeg at the Debian project.

Doh! Sorry. All of my comments were intended for someone else.
ETOOMANYTHINGSATONCE!

Dustin

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-13 20:04:06 +0000
+++ debian/changelog	2011-03-14 12:48:38 +0000
@@ -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@trac>  Mon, 14 Mar 2011 13:47:24 +0200
+
 ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
 
   * Merge from debian. Remaining changes:

=== modified file 'debian/rules'
--- debian/rules	2011-02-13 20:04:06 +0000
+++ debian/rules	2011-03-14 12:48:38 +0000
@@ -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 \