diff options
| author | Joey Hess <joey@kitenet.net> | 2011-03-24 21:30:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-24 21:30:18 -0400 |
| commit | 9df8971e5746a801449e85da38d54dea071b7303 (patch) | |
| tree | 00e1082773b6e5a0e297d114abf71d7a6b905d1f /debian | |
| parent | 7821965ef0c8c49b233d8abb621af33f1f7a31bd (diff) | |
Yaml formatted setup files are now produced by default
This has been a while coming. It turns out that non-excutable setup files
have a number of benefits. Also, I find YAML setup files easier to edit
myself, and I suspect many users will prefer not needing to deal with
perl syntax.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b483c29cc..e0036af23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ ikiwiki (3.20110322) UNRELEASED; urgency=low + * Yaml formatted setup files are now produced by default. + (Perl formatted setup files can still be used.) * Add timezone setting in setup file. This alows time zone to be configured via the web. diff --git a/debian/control b/debian/control index 71c9e18bb..0cbee1502 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, - libhtml-parser-perl, liburi-perl (>= 1.36) + libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl 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, @@ -37,7 +37,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-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 Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table |