Merge lp:~matttbe/ubuntu/quantal/libav/lp1011136 into lp:ubuntu/quantal/libav

[Matthieu Baerts]

Hello,

It seems ffmpeg's manpage is installed in ffmpeg and libav-tools packages. (LP: #1011136)
Here I've removed the manpage from ffmpeg package (but of course we can also add all manpage in libav-tools except this one).

[Matthieu Baerts (matttbe)]

It seems usr/bin/ffmpeg is also installed with libav-tools package.

[Matthieu Baerts (matttbe)]

Sorry for this new comment but it's maybe better to move all ffmpeg binaries and manpages to this new ffmpeg package. (the new rev 22 should do that).

I hope it will be helpful and thank you for maintaining this package! :)

[lp:~matttbe/ubuntu/quantal/libav/lp1011136]

22. By Matthieu Baerts on 2012-06-10

* debian/ffmpeg.install and debian/libav-tools.install:
 - Moved all ffmpeg binaries and manpages to ffmpeg package
   (LP: #1011136)

[Matthieu Baerts (matttbe)]

I confirm that the latest version fixes this bug (this new package is available on my ppa: https://launchpad.net/~matttbe/+archive/ppa/+sourcepub/2500878/+listing-archive-extra )

[Reinhard Tartler (siretart)]

thank you for your patch, I've integrated it here:

http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libav.git;a=commit;h=cfa466a8a36a6c9e49b5ff0f1fa2b50d5ab8c2b4

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-10 11:59:00 +0000
+++ debian/changelog	2012-06-10 14:56:23 +0000
@@ -1,3 +1,11 @@
+libav (4:0.8.1-0ubuntu4) quantal; urgency=low
+
+  * debian/ffmpeg.install and debian/libav-tools.install:
+   - Moved all ffmpeg binaries and manpages to ffmpeg package
+     (LP: #1011136)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Sun, 10 Jun 2012 14:05:11 +0200
+
 libav (4:0.8.1-0ubuntu3) quantal; urgency=low
 
   [ Andres Mejia ]

=== modified file 'debian/ffmpeg.install'
--- debian/ffmpeg.install	2012-06-10 11:59:00 +0000
+++ debian/ffmpeg.install	2012-06-10 14:56:23 +0000
@@ -1,2 +1,2 @@
-usr/bin/ffmpeg
-usr/share/man/man1/ffmpeg.1
+usr/bin/ff*
+usr/share/man/man1/ff*.1

=== modified file 'debian/libav-tools.install'
--- debian/libav-tools.install	2012-01-21 09:34:37 +0000
+++ debian/libav-tools.install	2012-06-10 14:56:23 +0000
@@ -1,4 +1,5 @@
 etc
-usr/bin
+usr/bin/av*
+usr/bin/qt-faststart
 usr/share/avconv/*.avpreset
-usr/share/man
+usr/share/man/man1/av*