Merge branch 'darcs'

Conflicts:
	debian/changelog

diff --combined IkiWiki/Setup/Automator.pm
index c194d34be8ed1314416a465af6f28bce829e2320,8a451d386319d801b8440b50131cddea6bcdba1f..5111541e48d5865ef056018306a3a23b09d54ba5
--- 1/IkiWiki/Setup/Automator.pm
--- 2/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@@ -58,6 -58,9 +58,9 @@@ sub import (@) 
                elsif ($config{rcs} eq 'monotone') {
                        $config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
                }
+               elsif ($config{rcs} eq 'darcs') {
+                       $config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper";
+               }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO
                }
@@@ -117,7 -120,6 +120,7 @@@
                for (;;) {
                        print "Choose a password: ";
                        chomp($password=<STDIN>);
 +                      print "\n";
                        print "Confirm password: ";
                        chomp($password2=<STDIN>);
  

diff --combined debian/changelog
index 7810241463ecfb99aa0cf0b24f60eb959a28fda1,2b1f938b30fe6fb7df5a6b1b42d7236fc976df2e..bbc7e6f136df7c661740e4c34a84e27d168757f6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,16 @@@
  ikiwiki (3.10) UNRELEASED; urgency=low
  
+   * darcs: Finally added support for this VCS, thanks to many
+     contributors:
+     - Thomas Schwinge wrote the original file, implementing only rcs_commit.
+     - Benjamin A'Lee contributed an alternative implementation.
+     - Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges.
+     - Simon Michael contributed multiple changes.
+     - Petr Ročkai fixed rcs_recentchanges.
+     - Sven M. Hallberg merged the above and added missing features.
 +  * Add missing newline to Confirm Password prompt.
  
-  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 18:25:33 -0400
+  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 17:47:36 -0400
  
  ikiwiki (3.09) unstable; urgency=low