aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-11-17 18:45:55 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-11-17 18:46:20 -0500
commit767bf9c4838277602b75522275c9f08d122f37a1 (patch)
tree3b6d1c8d67c4478297138bb2708d77f90649acb1 /debian
parentb56b282bf67321ff2c4f34693b26ec37146912b9 (diff)
downloadikiwiki-767bf9c4838277602b75522275c9f08d122f37a1.tar
ikiwiki-767bf9c4838277602b75522275c9f08d122f37a1.tar.gz
Change deb dependencies to list Text::Markdown before markdown (really this time).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ef46370d6..294cae6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
ikiwiki (2.71) UNRELEASED; urgency=low
* htmlbalance: New plugin contributed by Simon McVittie.
+ * Change deb dependencies to list Text::Markdown before markdown (really
+ this time).
-- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500
diff --git a/debian/control b/debian/control
index 20434e528..0db972ff7 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
Package: ikiwiki
Architecture: all
-Depends: ${perl:Depends}, markdown | libtext-markdown-perl, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
+Depends: ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl
Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng
Conflicts: ikiwiki-plugin-table