Merge branch 'master' into cvs

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

diff --git a/debian/control b/debian/control
index ee59c85155704a7fb6cf74b93afba95ca9bc41f9..9403dfb442fdd5a45d5aeaebaad21fb87e9497f6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,24 +3,23 @@ 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, libyaml-perl, python-support
+  libfile-chdir-perl, libyaml-libyaml-perl, python-support

 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.9.2
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.9.2
 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), libyaml-perl, libjson-perl
+  libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-libyaml-perl, libjson-perl

 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
   git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
   git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,