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.

diff --git a/Bundle/IkiWiki.pm b/Bundle/IkiWiki.pm
index d6c344d6a0a2b7b6bfacec2abb49edb77a085a09..532006baf5960a50300a7fba07f621b19a21aa52 100644 (file)
--- a/Bundle/IkiWiki.pm
+++ b/Bundle/IkiWiki.pm
@@ -28,6 +28,7 @@ CGI::Session
 Mail::Sendmail
 CGI
 Data::Dumper
 Mail::Sendmail
 CGI
 Data::Dumper

+YAML

 
 =head1 AUTHOR
 
 
 =head1 AUTHOR
 

diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm
index 64e907306544b150a48cc0668ded1f3cccae745e..8b97d893da8a99ede7e679470b306a0e41207950 100644 (file)
--- a/Bundle/IkiWiki/Extras.pm
+++ b/Bundle/IkiWiki/Extras.pm
@@ -34,7 +34,6 @@ Text::WikiCreole
 Term::ReadLine::Gnu
 HTML::Tree
 Sort::Naturally
 Term::ReadLine::Gnu
 HTML::Tree
 Sort::Naturally

-YAML

 
 =head1 AUTHOR
 
 
 =head1 AUTHOR
 

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1c05a7aa55215d638400831066b1ee17496b15b9..fdf3e5c471441a8af1b5605ea12213177df4b757 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -485,7 +485,7 @@ sub getsetup () {
        },
        setuptype => {
                type => "internal",
        },
        setuptype => {
                type => "internal",

-               default => "Standard",
+               default => "Yaml",

                description => "perl class to use to dump setup file",
                safe => 0,
                rebuild => 0,
                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};
        }
        foreach my $key (keys %s) {
                push @ret, $key, $s{$key}->{default};
        }

-       use Data::Dumper;

        return @ret;
 }
 
        return @ret;
 }
 

diff --git a/debian/changelog b/debian/changelog
index b483c29cc2839d914fda82e291c5d56396c0f339..e0036af23dffdf1238cf99087a8133d693bafa2d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 ikiwiki (3.20110322) UNRELEASED; urgency=low
 
 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.
 
   * 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 71c9e18bbf9bf09c818d65f15010d54f470b9ae1..0cbee1502a43a6dffe11086f96d4559386fde2a0 100644 (file)
--- 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,
 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,
 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,
   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
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table