Merge branch 'master' into debian-jessie-backports

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

diff --git a/debian/control b/debian/control
index fb841bcb3d4c708a3f3edebe5c6a9a5e88636c8c..9f228c75b4194b40d7ce592ee8f1dde4c25b9798 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep:
  libhtml-scrubber-perl,
  libhtml-template-perl,
  libimage-magick-perl | perlmagick,
- libmagickcore-6.q16-2-extra | libmagickcore-extra,
+ libmagickcore-extra,
  libnet-openid-consumer-perl,
  librpc-xml-perl,
  libtext-markdown-discount-perl,
@@ -32,7 +32,7 @@ Build-Depends-Indep:
 Maintainer: Simon McVittie <smcv@debian.org>
 Uploaders:
  Josh Triplett <josh@freedesktop.org>,
-Standards-Version: 3.9.6
+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