[libhtml-formatexternal-perl] 03/12: Merge tag 'upstream/24'

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libhtml-formatexternal-perl.

commit 1d2d1b4e01e2aa80b93f5ee2185bb56f98a9c33e
Merge: 4c57398 d532eaa
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jun 14 17:48:14 2015 +0200

    Merge tag 'upstream/24'
    
    Upstream version 24
    
    Conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/source/format
    	debian/watch
    	devel/wide.pl

 Changes                            |  11 +-
 MANIFEST                           |   7 +-
 MANIFEST.SKIP                      |   8 +-
 META.json                          |  63 +++++++
 META.yml                           |  62 +++---
 Makefile.PL                        |  72 ++++---
 SIGNATURE                          |  77 ++++----
 debian/rules                       |   4 -
 devel/base.html                    |   5 +-
 devel/output-charset.pl            |  52 +++++
 devel/run.pl                       | 275 +++++++++++++++++++++++++--
 devel/wide.pl                      |  29 +++
 inc/my_pod2html                    |   4 +-
 lib/HTML/FormatExternal.pm         | 378 +++++++++++++++++++++++++------------
 lib/HTML/FormatText/Elinks.pm      |  30 +--
 lib/HTML/FormatText/Html2text.pm   |  99 ++++++----
 lib/HTML/FormatText/Links.pm       |  36 ++--
 lib/HTML/FormatText/Lynx.pm        |  52 +++--
 lib/HTML/FormatText/Netrik.pm      |  41 +++-
 lib/HTML/FormatText/Vilistextum.pm |  52 +++--
 lib/HTML/FormatText/W3m.pm         |  14 +-
 lib/HTML/FormatText/Zen.pm         |  36 +++-
 t/Elinks.t                         |   4 +-
 t/FormatExternal.t                 |  11 +-
 t/Links.t                          |   4 +-
 t/taint.t                          |  93 +++++++++
 t/wide.t                           | 114 +++++++++++
 xt/0-Test-YAML-Meta.t              |  56 +++---
 xt/0-examples-xrefs.t              |   2 +-
 xt/0-file-is-part-of.t             |   9 +-
 xtools/my-check-copyright-years.sh |  31 ++-
 xtools/my-check-spelling.sh        |   4 +-
 xtools/my-deb.sh                   |   5 +-
 xtools/my-pc.sh                    |   4 +-
 34 files changed, 1288 insertions(+), 456 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-formatexternal-perl.git