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

[siretart at users.alioth.debian.org]

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

    rename the package 'ffmpeg' -> 'libav'
    
    (cherry picked from commit 720fb5d22b75a7f94564b39441ea9d0aa1528a23)
    
    Conflicts:
    
    	debian/control
    	debian/rules

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 0092c50..ac20718 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,16 +84,16 @@ install: build
 	dh_testroot
 	dh_prep
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
-	dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
+	dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/libav \
 		--list-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: install
 

-- 
libav-extra packaging