[SCM] libav/master: rename the package 'ffmpeg' -> 'libav'

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 720fb5d22b75a7f94564b39441ea9d0aa1528a23
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Dec 31 00:08:28 2011 +0100

    rename the package 'ffmpeg' -> 'libav'

diff --git a/debian/control b/debian/control
index 811652e..e7848fc 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 8.1.3~),
  yasm,
  zlib1g-dev
 
-Package: ffmpeg
+Package: libav
 Section: video
 Architecture: any
 Replaces: libavcodec53 (<< ${source:Version}),
@@ -55,10 +55,21 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: ffprobe
 Description: Multimedia player, server, encoder and transcoder
- This package contains the ffplay multimedia player, the ffserver streaming
- server and the ffmpeg audio and video encoder. They support most existing
- file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
- DivX, MPEG4, AC3, DV...).
+ This package contains the avplay multimedia player, the avserver
+ streaming server, the avconv audio and video encoder, and the avprobe
+ stream analyzer.  They support most existing file formats (AVI, MPEG,
+ OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
+ DV...).
+
+Package: ffmpeg
+Section: video
+Architecture: all
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libav
+Description: Multimedia player, server, encoder and transcoder (transitional package)
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
 
 Package: ffmpeg-dbg
 Section: debug
@@ -85,7 +96,7 @@ Depends: libavutil51 (= ${binary:Version}),
  libpostproc52 (= ${binary:Version}),
  libavformat53 (= ${binary:Version}),
  libswscale2 (= ${binary:Version}),
- ffmpeg (= ${binary:Version}),
+ libav (= ${binary:Version}),
  ${misc:Depends}
 Description: Debug symbols for Libav related packages
  This package contains debug data of the Libav related shared libraries.
diff --git a/debian/ffmpeg.docs b/debian/ffmpeg.docs
deleted file mode 100644
index 8a6ecc7..0000000
--- a/debian/ffmpeg.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/ffmpeg/html
diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
deleted file mode 100644
index 98227ed..0000000
--- a/debian/ffmpeg.install
+++ /dev/null
@@ -1,4 +0,0 @@
-etc
-usr/bin
-usr/share/man
-usr/share/ffmpeg/*.ffpreset
diff --git a/debian/libav.docs b/debian/libav.docs
new file mode 100644
index 0000000..4ccec0b
--- /dev/null
+++ b/debian/libav.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/libav/html
diff --git a/debian/libav.install b/debian/libav.install
new file mode 100644
index 0000000..2b5ee17
--- /dev/null
+++ b/debian/libav.install
@@ -0,0 +1,4 @@
+etc
+usr/bin
+usr/share/man
+usr/share/avconv/*.avpreset
diff --git a/debian/rules b/debian/rules
index 93b471b..5deb5a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,33 +81,32 @@ install: build
 	tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
 		 --exclude 'debian*' --exclude .git  --exclude .pc --exclude '*-stamp' \
 		 --transform 's,^./,libav/,'
-	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
+	dh_installdirs -ptmp usr/share/doc/libav/html etc
 	dh_installdirs -ptmp usr/share/doc/libav-doc/html
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
 	# don't fail on binary-indep only builds.
 	[ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc
-	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
-	install -m 644 -D doc/ffserver.conf debian/tmp/etc/
+	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
+	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/ffmpeg \
+	dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/libav \
 		--fail-missing --sourcedir=debian/tmp
 
 formats.txt: install
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
-	debian/tmp/usr/bin/ffmpeg -formats | tee $@
+	debian/tmp/usr/bin/avconv -formats | tee $@
 
 codecs.txt: install
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
-	debian/tmp/usr/bin/ffmpeg -codecs | tee $@
+	debian/tmp/usr/bin/avconv -codecs | tee $@
 
 binary-indep: build-doxy install
 
 binary-arch: build install codecs.txt formats.txt
 	dh_testdir
 	dh_testroot
-	dh_installman -pffmpeg debian/qt-faststart.1
+	dh_installman -plibav debian/qt-faststart.1
 	dh_installdocs doc/optimization.txt
-	dh_installdocs -A CREDITS doc/TODO
 	dh_installdocs -A debian/README.Debian
 	dh_installdocs -p libavcodec53 codecs.txt
 	dh_installdocs -p libavformat53 formats.txt
@@ -115,8 +114,8 @@ binary-arch: build install codecs.txt formats.txt
 		-plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
 		-plibswscale-dev -plibavutil-dev -plibav-doc \
 		doc/APIchanges
-	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
-	dh_installexamples -plibavcodec-dev libavcodec/api-example.c
+	dh_installexamples -p libav doc/avserver.conf debian/recordshow.sh
+	dh_installexamples -p libavcodec-dev libavcodec/api-example.c
 	dh_installchangelogs Changelog
 	dh_lintian
 	dh_link

-- 
Libav/FFmpeg packaging