improve warning message for multiple sources for page

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

diff --git a/debian/control b/debian/control
index 88ed205620e66c87f46ce9b23504b1f247ee963a..60d0e82dbc008bc60fdcef21510e8b8e18208bdf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Build-Depends-Indep:
  libhtml-parser-perl,
  libhtml-scrubber-perl,
  libhtml-template-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,
  libnet-openid-consumer-perl,
  librpc-xml-perl,
  libtext-markdown-discount-perl,


@@ -27,14 +28,14 @@ Build-Depends-Indep:
  libxml-simple-perl,
  libxml-twig-perl,
  libyaml-libyaml-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>,
  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.6
+Homepage: https://ikiwiki.info/

 Vcs-Git: git://git.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
 Testsuite: autopkgtest-pkg-perl
 
 Package: ikiwiki


@@ -75,6 +76,7 @@ Suggests:
  libfile-mimeinfo-perl,
  libhighlight-perl,
  libhtml-tree-perl,
  libfile-mimeinfo-perl,
  libhighlight-perl,
  libhtml-tree-perl,

+ libimage-magick-perl | perlmagick,

  liblocale-gettext-perl (>= 1.05-1),
  libmagickcore-extra,
  libmailtools-perl,
  liblocale-gettext-perl (>= 1.05-1),
  libmagickcore-extra,
  libmailtools-perl,


@@ -91,7 +93,6 @@ Suggests:
  libtext-wikiformat-perl,
  libxml-feed-perl,
  libxml-writer-perl,
  libtext-wikiformat-perl,
  libxml-feed-perl,
  libxml-writer-perl,

- perlmagick,

  po4a (>= 0.35-1),
  polygen,
  python,
  po4a (>= 0.35-1),
  polygen,
  python,


@@ -106,7 +107,7 @@ Replaces:
  ikiwiki-plugin-table,
 Provides:
  ikiwiki-plugin-table,
  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
  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