(no commit message)

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

diff --git a/debian/control b/debian/control
index c7d7e6544ffcf445963690aa6ede4b2c438017a5..03b3ea8b386afc4a60a175d7e7cf71be9812a621 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libtimedate-perl, libhtml-template-perl,
   libhtml-scrubber-perl, wdg-html-validator,
   libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),
   libtimedate-perl, libhtml-template-perl,
   libhtml-scrubber-perl, wdg-html-validator,
   libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),

-  libfile-chdir-perl, libyaml-perl
+  libfile-chdir-perl, libyaml-perl, python-support

 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>

-Standards-Version: 3.9.1
+Standards-Version: 3.9.2

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


@@ -20,7 +20,7 @@ Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, 
   libtext-markdown-perl | markdown,
   libhtml-scrubber-perl, libhtml-template-perl,
 Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, 
   libtext-markdown-perl | markdown,
   libhtml-scrubber-perl, libhtml-template-perl,

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

 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,
 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,


@@ -28,9 +28,9 @@ Recommends: gcc | c-compiler,
   liblwpx-paranoidagent-perl, libtimedate-perl,
   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
   libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl,
   liblwpx-paranoidagent-perl, libtimedate-perl,
   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
   libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl,

-  libgravatar-url-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,
   libfile-mimeinfo-perl, file,
   python, python-docutils, polygen, tidy, libhtml-tree-perl,
   libxml-feed-perl, libmailtools-perl, perlmagick,
   libfile-mimeinfo-perl, file,


@@ -38,8 +38,9 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
   libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
   libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
   libsort-naturally-perl, libtext-textile-perl, libhighlight-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, libnet-inet6glue-perl
-Conflicts: ikiwiki-plugin-table, libyaml-libyaml-perl
+  po4a (>= 0.35-1), gettext, libnet-inet6glue-perl,
+  libtext-multimarkdown-perl
+Conflicts: ikiwiki-plugin-table

 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a wiki compiler
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a wiki compiler


@@ -54,6 +55,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.