Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / debian / control

diff --git a/debian/control b/debian/control
index dbecfe0607174cc19e026d314fa2f0c2b704d5b6..9f228c75b4194b40d7ce592ee8f1dde4c25b9798 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,28 +7,35 @@ Build-Depends:
 Build-Depends-Indep:
  dpkg-dev (>= 1.9.0),
  ghostscript,
+ git (>= 1:1.7),
  libcgi-formbuilder-perl,
  libcgi-pm-perl,
  libcgi-session-perl,
  libfile-chdir-perl,
+ libfile-mimeinfo-perl,
  libhtml-parser-perl,
  libhtml-scrubber-perl,
  libhtml-template-perl,
- libmagickcore-6.q16-2-extra | libmagickcore-extra,
+ libimage-magick-perl | perlmagick,
+ libmagickcore-extra,
+ libnet-openid-consumer-perl,
  librpc-xml-perl,
  libtext-markdown-discount-perl,
  libtimedate-perl,
  liburi-perl (>= 1.36),
+ libxml-feed-perl,
+ libxml-parser-perl,
  libxml-simple-perl,
+ libxml-twig-perl,
  libyaml-libyaml-perl,
- perlmagick,
  po4a (>= 0.34),
 Maintainer: Simon McVittie <smcv@debian.org>
 Uploaders:
  Josh Triplett <josh@freedesktop.org>,
-Standards-Version: 3.9.5
-Homepage: http://ikiwiki.info/
+Standards-Version: 3.9.8
+Homepage: https://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
+Vcs-Browser: http://source.ikiwiki.branchable.com/?p=source.git;a=summary
 Testsuite: autopkgtest-pkg-perl
 
 Package: ikiwiki
@@ -69,6 +76,7 @@ Suggests:
  libfile-mimeinfo-perl,
  libhighlight-perl,
  libhtml-tree-perl,
+ libimage-magick-perl | perlmagick,
  liblocale-gettext-perl (>= 1.05-1),
  libmagickcore-extra,
  libmailtools-perl,
@@ -85,7 +93,6 @@ Suggests:
  libtext-wikiformat-perl,
  libxml-feed-perl,
  libxml-writer-perl,
- perlmagick,
  po4a (>= 0.35-1),
  polygen,
  python,
@@ -100,7 +107,7 @@ Replaces:
  ikiwiki-plugin-table,
 Provides:
  ikiwiki-plugin-table,
-Description: a wiki compiler
+Description: wiki compiler
  Ikiwiki converts a directory full of wiki pages into HTML pages suitable
  for publishing on a website. Unlike many wikis, ikiwiki does not have its
  own ad-hoc means of storing page history, and instead uses a revision