From: Simon McVittie <smcv@debian.org>
Date: Wed, 26 Nov 2014 11:58:05 +0000 (+0000)
Subject: Merge branch 'ready/html5'
X-Git-Tag: 3.20150107~67
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6c51b764bca2981b8962d7fcfd78efa533291283?ds=inline;hp=--cc

Merge branch 'ready/html5'
---

6c51b764bca2981b8962d7fcfd78efa533291283
diff --cc debian/control
index 78bb68341,c0e6d7d02..a5cac3c01
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,14 +5,14 @@@ Build-Depends: perl, debhelper (>= 9
  Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
    libtext-markdown-discount-perl,
    libtimedate-perl, libhtml-template-perl,
-   libhtml-scrubber-perl, wdg-html-validator,
+   libhtml-scrubber-perl,
    libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),
 -  libfile-chdir-perl, libyaml-libyaml-perl, python-support, librpc-xml-perl,
 -  libcgi-session-perl, ghostscript,
 -  libmagickcore-6.q16-2-extra | libmagickcore-extra
 -Maintainer: Joey Hess <joeyh@debian.org>
 -Uploaders: Josh Triplett <josh@freedesktop.org>,
 -  Simon McVittie <smcv@debian.org>
 +  libfile-chdir-perl, libyaml-libyaml-perl, librpc-xml-perl,
 +  libcgi-pm-perl, libcgi-session-perl, ghostscript,
 +  libmagickcore-6.q16-2-extra | libmagickcore-extra,
 +  libcgi-formbuilder-perl
 +Maintainer: Simon McVittie <smcv@debian.org>
 +Uploaders: Josh Triplett <josh@freedesktop.org>
  Standards-Version: 3.9.5
  Homepage: http://ikiwiki.info/
  Vcs-Git: git://git.ikiwiki.info/