[SCM] libav/experimental: remove deprecated ffmpeg package

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7ae80b0e1763e7adfac375a61b6ddbc603de5b4d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 29 17:51:20 2012 +0200

    remove deprecated ffmpeg package

diff --git a/debian/control b/debian/control
index 62774df..adc7adf 100644
--- a/debian/control
+++ b/debian/control
@@ -63,17 +63,12 @@ Build-Depends:
 Package: libav-tools
 Section: video
 Architecture: any
-Provides:
- ffmpeg
 Replaces:
- ffmpeg (<< 4:0.8~),
  libavcodec-extra-53 (<< 4:0.6~),
  libavcodec53 (<< ${source:Version})
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Breaks:
- ffmpeg (<< 4:0.8~)
 Conflicts:
  ffprobe
 Description: Multimedia player, server, encoder and transcoder
@@ -86,41 +81,6 @@ Description: Multimedia player, server, encoder and transcoder
  OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
  DV...).
 
-Package: ffmpeg
-Section: oldlibs
-Priority: extra
-Architecture: any
-Depends:
- libav-tools,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Multimedia player, server, encoder and transcoder (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- 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
-Priority: extra
-Architecture: any
-Depends:
- libav-dbg,
- ${misc:Depends}
-Description: Debug symbols for Libav related packages (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains debug data of the Libav related shared libraries.
- .
- Most people will not need this package. Please install it to produce useful
- stacktraces to help debugging the Libav libraries.
- .
- 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
@@ -179,24 +139,6 @@ Description: Debug symbols for Libav related packages
  Most people will not need this package. Please install it to produce useful
  stacktraces to help debugging the Libav library.
 
-Package: ffmpeg-doc
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libav-doc,
- ${misc:Depends}
-Description: Documentation of the Libav API (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the html doxygen documentation of the Libav API.
- .
- Only application developers will find this package useful.
- .
- This package is only used for transitional purposes and can be safely
- removed.
-
 Package: libav-doc
 Section: doc
 Architecture: all
diff --git a/debian/ffmpeg.NEWS b/debian/ffmpeg.NEWS
deleted file mode 100644
index ccb4765..0000000
--- a/debian/ffmpeg.NEWS
+++ /dev/null
@@ -1,9 +0,0 @@
-libav (5:0.8.1-3) unstable; urgency=low
-
-  * The ffmpeg program has been deprecated and replaced with avconv.
-    The ffmpeg program is only provided for compatibility purposes and
-    will be removed in a future release. For a list of the
-    incompatible changes between the two programs, see
-    /usr/share/doc/ffmpeg/changelog.gz.
-
- -- Andres Mejia <amejia at debian.org>  Thu, 29 Mar 2012 12:54:59 -0400
diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
deleted file mode 100644
index 793de72..0000000
--- a/debian/ffmpeg.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/ffmpeg
-usr/share/man/man1/ffmpeg.1
diff --git a/debian/rules b/debian/rules
index 0dab236..ad466e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,13 +125,11 @@ install-common: build $(DH_INSTALL_FILES)
 	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 $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xffmpeg \
-		-Xffmpeg.1 -Xusr/share/doc/libav-doc \
+	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
+		-Xusr/share/doc/libav-doc \
 		-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
-	dh_install -pffmpeg --sourcedir=debian/tmp
-	dh_strip $(addprefix -N,$(LIB_PKGS2)) -Nffmpeg --dbg-package=libav-dbg
+	dh_strip $(addprefix -N,$(LIB_PKGS2)) --dbg-package=libav-dbg
 	dh_strip $(addprefix -p,$(LIB_PKGS2)) --dbg-package=libav-regular-dbg
-	dh_strip -pffmpeg --dbg-package=ffmpeg-dbg
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -formats | tee formats-$(DEB_HOST_ARCH).txt
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \

-- 
Libav/FFmpeg packaging