diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-05-19 13:07:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-05-19 13:07:47 -0400 |
| commit | ef003f48f4a3fe8fb67fda62c70a299b07d75976 (patch) | |
| tree | cb5972026e6beed91b5eca2fa4962790244062bd /debian/control | |
| parent | 53b1c6f559c1d09fbdbc28c8e4d5090dd455cd26 (diff) | |
| parent | 4c5987d150b26f638494638f7861fb7646542a37 (diff) | |
| download | ikiwiki-ef003f48f4a3fe8fb67fda62c70a299b07d75976.tar ikiwiki-ef003f48f4a3fe8fb67fda62c70a299b07d75976.tar.gz | |
Merge branch 'master' into po
Conflicts:
debian/changelog
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 8e7806de3..05ccd0df3 100644 --- a/debian/control +++ b/debian/control @@ -9,14 +9,14 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libhtml-parser-perl, liburi-perl, perlmagick Maintainer: Joey Hess <joeyh@debian.org> Uploaders: Josh Triplett <josh@freedesktop.org> -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 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}, +Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl |