[SCM] libav/master: Transition from 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>.

[Reinhard Tartler]

Hi Fabian,

On Mon, Oct 14, 2013 at 6:36 AM,  <fabian-guest at users.alioth.debian.org> wrote:
> The following commit has been merged in the master branch:
> commit 38434eecc7c6064c47db072399ac560b9410580a
> Author: Fabian Greffrath <fabian+debian at greffrath.com>
> Date:   Mon Oct 14 12:31:21 2013 +0200
>
>     Transition from 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>.
>
> diff --git a/debian/README.source b/debian/README.source
> index 29b5ee0..986051d 100644
> --- a/debian/README.source
> +++ b/debian/README.source
> @@ -18,8 +18,7 @@ feature set that are still usable to build other packages.
>  Using the nomenclature of the EmdebianSprint2011 [0,1] one would write e.g.:
>
>   Build-Depends-Bootstrap1:
> -  debhelper (>= 8.1.3~),
> -  texi2html
> +  debhelper (>= 8.1.3~)
>
>  [0] http://wiki.debian.org/DebianBootstrap/EmdebianSprint2011
>  [1] http://lists.debian.org/debian-devel-announce/2011/03/msg00000.html
> diff --git a/debian/control b/debian/control
> index ef6e2f9..ca8f5b4 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -55,7 +55,7 @@ Build-Depends:
>   libxfixes-dev,
>   libxvidcore-dev,
>   libxvmc-dev,
> - texi2html,
> + texinfo,
>   yasm [any-amd64 any-i386],
>   zlib1g-dev
>
> diff --git a/debian/patches/makeinfo.patch b/debian/patches/makeinfo.patch
> new file mode 100644
> index 0000000..c273308
> --- /dev/null
> +++ b/debian/patches/makeinfo.patch
> @@ -0,0 +1,47 @@
> +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=$(SRC_PATH)/doc/t2h.init --output $@ $<
> +
> + doc/%.pod: TAG = POD
> + doc/%.pod: doc/%.texi $(GENTEXI)
> diff --git a/debian/patches/series b/debian/patches/series
> index 3199e41..0a42e78 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1 +1,2 @@
>  03-disable-configuration-warnings.patch
> +makeinfo.patch
>

Are you really sure that this patch works? AFAIUI, because of your
change in configure, you no longer get CONFIG_TEXI2HTML, but
CONFIG_MAKEINFO set. This makes the htmlpages converted from info no
longer been built.

I've tried to fix that, but I get errors from makinfo this way. I fear
that this conversion is not as easy as it seems, and that I think we
should revert the patch (or update the patch to just don't use
makeinfo/texi2html at all).

Fabian, what do you think?

Reinhard


-- 
regards,
    Reinhard