[SCM] libav/ubuntu: Seperate the ffmpeg program into the transitional package.

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 5a0c6b445bc6313d026efc9cfd269c8a5fbc8760
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Tue Mar 27 14:44:27 2012 -0400

    Seperate the ffmpeg program into the transitional package.
    
    (cherry picked from commit ea819ac5706a98397a834d8f9a6972d92210e969)
    
    Conflicts:
    
    	debian/rules

diff --git a/debian/control b/debian/control
index 7ee5c40..18c7596 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,8 @@ Build-Depends:
 Package: libav-tools
 Section: video
 Architecture: any
+Provides:
+ ffmpeg
 Replaces:
  ffmpeg (<< 4:0.8~),
  libavcodec-extra-53 (<< 4:0.6~),
@@ -76,7 +78,7 @@ Description: Multimedia player, server, encoder and transcoder
 Package: ffmpeg
 Section: oldlibs
 Priority: extra
-Architecture: all
+Architecture: any
 Depends:
  libav-tools,
  ${misc:Depends},
@@ -85,8 +87,9 @@ Description: Multimedia player, server, encoder and transcoder (transitional pac
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
  .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
+ This package contains the deprecated ffmpeg program. This package also serves
+ as a transitional package to libav-tools. Users are advised to use avconv from
+ the libav-tools package instead of ffmpeg.
 
 Package: ffmpeg-dbg
 Section: oldlibs
@@ -104,13 +107,19 @@ Description: Debug symbols for Libav related packages (transitional package)
  Most people will not need this package. Please install it to produce useful
  stacktraces to help debugging the Libav libraries.
  .
- This package is only used for transitional purposes and can be safely
- removed.
+ This package contains the debug symbols for the deprecated ffmpeg program.
+ It also serves as a transitional package to libav-tools-dbg.
 
 Package: libav-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Provides:
+ ffmpeg-dbg
+Replaces:
+ ffmpeg-dbg (<< 5:0.8.1-3)
+Breaks:
+ ffmpeg-dbg (<< 5:0.8.1-3)
 Depends:
  libav-tools (= ${binary:Version}),
  libavcodec53 (= ${binary:Version}),
diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
new file mode 100644
index 0000000..793de72
--- /dev/null
+++ b/debian/ffmpeg.install
@@ -0,0 +1,2 @@
+usr/bin/ffmpeg
+usr/share/man/man1/ffmpeg.1
diff --git a/debian/rules b/debian/rules
index 10e28f8..cbf607b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,9 @@ install: build $(DH_INSTALL_FILES)
 	install -m 644 -D doc/avserver.conf debian/tmp/etc/
 	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 	dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/libav \
+		-Xusr/share/man/man1/ffmpeg.1 -Nffmpeg \
 		--fail-missing --sourcedir=debian/tmp
+	dh_install -pffmpeg --sourcedir=debian/tmp
 
 formats.txt: install
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -135,7 +137,8 @@ binary-arch: build install codecs.txt formats.txt
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_strip --dbg-package=libav-dbg
+	dh_strip -Nffmpeg --dbg-package=libav-dbg
+	dh_strip -pffmpeg --dbg-package=ffmpeg-dbg
 
 # strict internal dependencies
 	for pkg in $(LIB_PKGS); do \

-- 
Libav/FFmpeg packaging