rename todo/merge_tincho-osm_branch.mdwn to todo/merge_tina-osm_branch.mdwn

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

diff --git a/debian/control b/debian/control
index 88ed205620e66c87f46ce9b23504b1f247ee963a..c1c74f0bbf7fecb2d8fce8c444a823d5fb74ed60 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,9 @@ Build-Depends-Indep:
  libhtml-parser-perl,
  libhtml-scrubber-perl,
  libhtml-template-perl,
- libmagickcore-6.q16-2-extra | libmagickcore-extra,
+ libipc-run-perl,
+ libimage-magick-perl | perlmagick,
+ libmagickcore-6.q16-3-extra | libmagickcore-extra,
  libnet-openid-consumer-perl,
  librpc-xml-perl,
  libtext-markdown-discount-perl,
@@ -27,14 +29,14 @@ Build-Depends-Indep:
  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: 4.1.3
+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
@@ -51,7 +53,7 @@ Depends:
  ${perl:Depends},
 Recommends:
  gcc | c-compiler,
- git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
+ git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr | brz | mercurial | monotone (>= 0.38) | darcs,
  libauthen-passphrase-perl,
  libc6-dev | libc-dev,
  libcgi-formbuilder-perl (>= 3.05),
@@ -75,6 +77,7 @@ Suggests:
  libfile-mimeinfo-perl,
  libhighlight-perl,
  libhtml-tree-perl,
+ libimage-magick-perl | perlmagick,
  liblocale-gettext-perl (>= 1.05-1),
  libmagickcore-extra,
  libmailtools-perl,
@@ -91,11 +94,10 @@ Suggests:
  libtext-wikiformat-perl,
  libxml-feed-perl,
  libxml-writer-perl,
- perlmagick,
  po4a (>= 0.35-1),
  polygen,
- python,
- python-docutils,
+ python3,
+ python3-docutils,
  texlive,
  tidy,
  viewvc | gitweb | viewcvs,
@@ -106,7 +108,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