diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-01-30 19:56:51 -0600 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-01-30 19:56:51 -0600 |
| commit | 8e752d09766da8b3ebb9ca9ba6f67be7168e63d1 (patch) | |
| tree | 1858451087b52a8c3fad036e053cfd704d8feb8f /debian | |
| parent | 51d0aa406d40aa8dede624736f64f2ed055360b9 (diff) | |
| parent | 111db0b6be5b8fc5881e1e383d5360b768f68845 (diff) | |
| download | ikiwiki-8e752d09766da8b3ebb9ca9ba6f67be7168e63d1.tar ikiwiki-8e752d09766da8b3ebb9ca9ba6f67be7168e63d1.tar.gz | |
Merge branch 'master' into cvs
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d014abd50..d196b49b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ ikiwiki (3.20120116) UNRELEASED; urgency=low * mdwn: Added nodiscount setting, which can be used to avoid using the markdown discount engine, when maximum compatability is needed. + * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533 + * cvs: Ensure text files are added in non-binary mode. (Amitai Schlair) + * cvs: Various cleanups and testing. (Amitai Schlair) + * calendar, prettydate: Fix strftime encoding bug. + * shortcuts: Fixed a broken shortcut to wikipedia (accidentially + made into a shortcut to wikiMedia). + * Various portability improvements. (Amitai Schlair) -- Joey Hess <joeyh@debian.org> Mon, 16 Jan 2012 13:41:14 -0400 diff --git a/debian/control b/debian/control index 922fe3c77..9403dfb44 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, 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 @@ -19,7 +19,7 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libtext-markdown-discount-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, |