Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/debian/control b/debian/control
index b98f0e0c717349c8f905039c929020e771ed4587..a5cac3c016c9d70a3a9540d4e48dce9d00f4e803 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,51 +1,56 @@
 Source: ikiwiki
 Section: web
 Priority: optional
 Source: ikiwiki
 Section: web
 Priority: optional

-Build-Depends: perl, debhelper (>= 7.0.50)
+Build-Depends: perl, debhelper (>= 9)

 Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
 Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,

-  libtext-markdown-perl | markdown, 
+  libtext-markdown-discount-perl,

   libtimedate-perl, libhtml-template-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),
   libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),

-  libfile-chdir-perl, libyaml-perl
-Maintainer: Joey Hess <joeyh@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>
 Uploaders: Josh Triplett <josh@freedesktop.org>

-Standards-Version: 3.9.1
+Standards-Version: 3.9.5

 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/

-Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki

 
 Package: ikiwiki
 Architecture: all
 
 Package: ikiwiki
 Architecture: all

-Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, 
-  libtext-markdown-perl | markdown,
+Depends: ${misc:Depends}, ${perl:Depends},
+  libtext-markdown-discount-perl,

   libhtml-scrubber-perl, libhtml-template-perl,
   libhtml-scrubber-perl, libhtml-template-perl,

-  libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl
+  libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-libyaml-perl, libjson-perl

 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,

-  subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
-  libxml-simple-perl, libnet-openid-consumer-perl,
-  liblwpx-paranoidagent-perl, libtimedate-perl,
+  git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
+  libxml-simple-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl,
+  liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-pm-perl,

   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),

-  libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl
+  libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl,
+  libgravatar-url-perl, librpc-xml-perl,

 Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
 Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,

-  xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl,
+  xapian-omega (>= 1.0.5), libtext-wikiformat-perl,

   python, python-docutils, polygen, tidy, libhtml-tree-perl,
   libxml-feed-perl, libmailtools-perl, perlmagick,
   python, python-docutils, polygen, tidy, libhtml-tree-perl,
   libxml-feed-perl, libmailtools-perl, perlmagick,

-  libfile-mimeinfo-perl, file, libcrypt-ssleay-perl,
+  libfile-mimeinfo-perl, file,

   liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
   libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
   libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
   libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
   liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
   libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
   libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
   libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,

-  po4a (>= 0.35-1), gettext
+  po4a (>= 0.35-1), gettext, libnet-inet6glue-perl,
+  libtext-multimarkdown-perl, libxml-writer-perl,
+  ghostscript, libmagickcore-extra

 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a 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
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a 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 control
- system such as Subversion or Git.
+ own ad-hoc means of storing page history, and instead uses a revision
+ control system such as Subversion or Git.

  .
  Ikiwiki implements all of the other standard features of a wiki, including
  web-based page editing, user registration and logins, a RecentChanges
  .
  Ikiwiki implements all of the other standard features of a wiki, including
  web-based page editing, user registration and logins, a RecentChanges


@@ -53,6 +58,6 @@ Description: a wiki compiler
  resolution, and page locking.
  .
  Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
  resolution, and page locking.
  .
  Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.

- ikiwiki provides a plugin system which allows many other features to be
+ Ikiwiki provides a plugin system which allows many other features to be

  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.
  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.