Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 2448673ac49169024aea08b0e8305d8a8622d414..0d68f27e5874b3331cbab851b1dafdfa06d21673 100644 (file)
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -73,7 +73,7 @@ sub darcs_rev($) {
        my $file = shift; # Relative to the repodir.
        my $repodir = $config{srcdir};
 
-       return "" if (! file_in_vc($repodir, $file));
+       return "" unless file_in_vc($repodir, $file);
        my $hash = darcs_info('hash', $repodir, $file);
        return defined $hash ? $hash : "";
 }

diff --git a/debian/control b/debian/control
index 3e2fdc537a220e431e04fea02b95c58f99647c4f..172e1b23db3bc217d4967ded3a36ffe6adcf87fb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends},
   libhtml-parser-perl, liburi-perl
 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
-  subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38),
+  subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
   libxml-simple-perl, libnet-openid-consumer-perl,
   liblwpx-paranoidagent-perl, libtimedate-perl,
   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),