releasing version 3.20110707

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

diff --git a/debian/control b/debian/control
index c7d7e6544ffcf445963690aa6ede4b2c438017a5..b01c88ae3f31da795cf87e664b0df16d20951670 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -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,


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