[SCM] libav/master: Remove the makeinfo patch

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 68bbb7c877af90aa7d902c5dcc97fb517a414262
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 22 08:11:36 2014 -0500

    Remove the makeinfo patch
    
    See the thread starting at
    http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2014-January/036198.html

diff --git a/debian/patches/makeinfo.patch b/debian/patches/makeinfo.patch
deleted file mode 100644
index 2310bc1..0000000
--- a/debian/patches/makeinfo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Transition from the `texi2html' utility to the `makeinfo' utility from
- the texinfo package, fixes build-depends-on-obsolete-package lintian error and
- addresses <https://lists.debian.org/debian-devel/2013/05/msg01516.html>.
-
---- a/configure
-+++ b/configure
-@@ -1797,7 +1797,7 @@ avprobe_deps="avcodec avformat"
- avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
- avserver_extralibs='$ldl'
- 
--doc_deps="texi2html"
-+doc_deps="makeinfo"
- 
- # default parameters
- 
-@@ -3533,7 +3533,7 @@ if check_pkg_config sdl SDL_events.h SDL
-     check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
- fi
- 
--texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
-+makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
- 
- check_header linux/fb.h
- check_header linux/videodev2.h
---- a/doc/platform.texi
-+++ b/doc/platform.texi
-@@ -251,7 +251,7 @@ llrint() in its C library.
- Install your Cygwin with all the "Base" packages, plus the
- following "Devel" ones:
- @example
--binutils, gcc4-core, make, git, mingw-runtime, texi2html
-+binutils, gcc4-core, make, git, mingw-runtime, texinfo
- @end example
- 
- In order to run FATE you will also need the following "Utils" packages:
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -29,7 +29,7 @@ $(GENTEXI): doc/avoptions_%.texi: doc/pr
- doc/%.html: TAG = HTML
- doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
- 	$(Q)$(TEXIDEP)
--	$(M)texi2html -I doc -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
-+	$(M)makeinfo --html -I doc --no-split --css-ref=t2h.init --output $@ $<
- 
- doc/%.pod: TAG = POD
- doc/%.pod: doc/%.texi $(GENTEXI)
diff --git a/debian/patches/series b/debian/patches/series
index b89e7b2..828a23a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 03-disable-configuration-warnings.patch
-makeinfo.patch
 spelling-errors.patch
 freetype-api.patch
 support-opus-in-ogg.patch

-- 
Libav/FFmpeg packaging