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

[Andres Mejia]

FYI, I placed the ffmpeg program in the transitional package. Reason
being that once people migrate, they can then uninstall the
transitional package and thus ffmpeg as well.

I still think the other binaries should be separated into their own
packages, especially the server. Users can deploy their minimal setup
of avserver if they choose to do so.

On Tue, Mar 27, 2012 at 2:44 PM,  <ceros-guest at users.alioth.debian.org> wrote:
> The following commit has been merged in the master branch:
> commit ea819ac5706a98397a834d8f9a6972d92210e969
> Author: Andres Mejia <amejia004 at gmail.com>
> Date:   Tue Mar 27 14:44:27 2012 -0400
>
>    Seperate the ffmpeg program into the transitional package.
>
> diff --git a/debian/control b/debian/control
> index 2f6df67..1421f10 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -64,6 +64,8 @@ Build-Depends:
>  Package: libav-tools
>  Section: video
>  Architecture: any
> +Provides:
> + ffmpeg
>  Replaces:
>  ffmpeg (<< 4:0.8~),
>  libavcodec-extra-53 (<< 4:0.6~),
> @@ -88,7 +90,7 @@ Description: Multimedia player, server, encoder and transcoder
>  Package: ffmpeg
>  Section: oldlibs
>  Priority: extra
> -Architecture: all
> +Architecture: any
>  Depends:
>  libav-tools,
>  ${misc:Depends},
> @@ -97,8 +99,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
> @@ -116,13 +119,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}),
>  libavdevice53 (= ${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 9748ecc..b955a6c 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -125,10 +125,13 @@ 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)) -Xusr/share/doc/libav-doc \
> +       dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xusr/bin/ffmpeg \
> +               -Xusr/share/man/man1/ffmpeg.1 -Xusr/share/doc/libav-doc \
>                -Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
> -       dh_strip $(addprefix -N,$(LIB_PKGS2)) --dbg-package=libav-dbg
> +       dh_install -pffmpeg --sourcedir=debian/tmp
> +       dh_strip $(addprefix -N,$(LIB_PKGS2)) -Nffmpeg --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.txt
>        env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
>
> --
> Libav/FFmpeg packaging
>
> _______________________________________________
> pkg-multimedia-commits mailing list
> pkg-multimedia-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits



-- 
~ Andres