Merge branch 'master' into cvs

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

diff --git a/debian/control b/debian/control
index 049a685b0d7fc3ce9b912f0e8f011b6d08533c5d..9403dfb442fdd5a45d5aeaebaad21fb87e9497f6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,41 +3,42 @@ Section: web
 Priority: optional
 Build-Depends: perl, debhelper (>= 7.0.50)
 Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
 Priority: optional
 Build-Depends: perl, debhelper (>= 7.0.50)
 Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,

-  libtext-markdown-perl | markdown, 
+  libtext-markdown-discount-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,
+  libfile-chdir-perl, libyaml-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.0
+Standards-Version: 3.9.2

 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
 Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, 
 
 Package: ikiwiki
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, 

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

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

-  libhtml-parser-perl, liburi-perl (>= 1.36)
+  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,
+  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-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
   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
+  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, 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, 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
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table


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