[SCM] ffmpeg/experimental: Merge qt-faststart back into 'ffmpeg'

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bd9acac4d7bb6c336a4b24acacdb05343cfe9bda
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 11 12:57:34 2015 -0400

    Merge qt-faststart back into 'ffmpeg'
    
    The libav-tools package is going away, so no point in having
    that in a separate package. Add proper Replaces relationships.

diff --git a/debian/control b/debian/control
index a3fc6f6..21e985f 100644
--- a/debian/control
+++ b/debian/control
@@ -158,7 +158,7 @@ Recommends:
 Suggests:
  ffmpeg-doc
 Breaks: libav-tools (<< 6:9~)
-Replaces: libav-tools (<< 6:9~)
+Replaces: libav-tools (<< 6:12~)
 Description: Tools for transcoding, streaming and playing of multimedia files
  FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
  mux, demux, stream, filter and play pretty much anything that humans and
diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
index 0950dc3..c1d6581 100644
--- a/debian/ffmpeg.install
+++ b/debian/ffmpeg.install
@@ -3,3 +3,4 @@ usr/bin/ff*
 usr/share/man/man1
 usr/share/ffmpeg/*.ffpreset
 RELEASE_NOTES						usr/share/doc/ffmpeg
+tools/qt-faststart					usr/bin
diff --git a/debian/ffmpeg.manpages b/debian/ffmpeg.manpages
new file mode 100644
index 0000000..308bde3
--- /dev/null
+++ b/debian/ffmpeg.manpages
@@ -0,0 +1 @@
+debian/qt-faststart.1
diff --git a/debian/qt-faststart.install b/debian/qt-faststart.install
deleted file mode 100644
index 2633cbb..0000000
--- a/debian/qt-faststart.install
+++ /dev/null
@@ -1,2 +0,0 @@
-tools/qt-faststart					usr/bin
-debian/qt-faststart.1				usr/share/man/man1
diff --git a/debian/qt-faststart.postrm b/debian/qt-faststart.postrm
deleted file mode 100755
index 66ce178..0000000
--- a/debian/qt-faststart.postrm
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-# postrm script for qt-faststart
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# Move the diverted files from libav-tools back
-if [ remove = "$1" ]; then
-   dpkg-divert --package qt-faststart --remove --rename \
-      --divert /usr/bin/qt-faststart.libav /usr/bin/qt-faststart
-   dpkg-divert --package qt-faststart --remove --rename \
-      --divert /usr/share/man/man1/qt-faststart.libav.1.gz /usr/share/man/man1/qt-faststart.1.gz
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/qt-faststart.preinst b/debian/qt-faststart.preinst
deleted file mode 100755
index c9208d2..0000000
--- a/debian/qt-faststart.preinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-# preinst script for qt-faststart
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# Divert the necessary files from libav-tools
-if [ install = "$1" -o upgrade = "$1" ]; then
-   dpkg-divert --package qt-faststart --add --rename \
-      --divert /usr/bin/qt-faststart.libav /usr/bin/qt-faststart
-   dpkg-divert --package qt-faststart --add --rename \
-      --divert /usr/share/man/man1/qt-faststart.libav.1.gz /usr/share/man/man1/qt-faststart.1.gz
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-

-- 
ffmpeg packaging