diff options
| -rw-r--r-- | Bundle/IkiWiki.pm | 1 | ||||
| -rw-r--r-- | Bundle/IkiWiki/Extras.pm | 1 | ||||
| -rw-r--r-- | IkiWiki.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 4 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Bundle/IkiWiki.pm b/Bundle/IkiWiki.pm index d6c344d6a..532006baf 100644 --- a/Bundle/IkiWiki.pm +++ b/Bundle/IkiWiki.pm @@ -28,6 +28,7 @@ CGI::Session Mail::Sendmail CGI Data::Dumper +YAML =head1 AUTHOR diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm index 64e907306..8b97d893d 100644 --- a/Bundle/IkiWiki/Extras.pm +++ b/Bundle/IkiWiki/Extras.pm @@ -34,7 +34,6 @@ Text::WikiCreole Term::ReadLine::Gnu HTML::Tree Sort::Naturally -YAML =head1 AUTHOR diff --git a/IkiWiki.pm b/IkiWiki.pm index 1c05a7aa5..fdf3e5c47 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -485,7 +485,7 @@ sub getsetup () { }, setuptype => { type => "internal", - default => "Standard", + default => "Yaml", description => "perl class to use to dump setup file", safe => 0, rebuild => 0, @@ -505,7 +505,6 @@ sub defaultconfig () { foreach my $key (keys %s) { push @ret, $key, $s{$key}->{default}; } - use Data::Dumper; return @ret; } 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 |