summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Setup/Automator.pm3
-rw-r--r--debian/changelog6
2 files changed, 9 insertions, 0 deletions
diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index d1594d7ea..7af93e73c 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -72,6 +72,9 @@ sub import (@) {
elsif ($config{rcs} eq 'mercurial') {
# TODO
}
+ elsif ($config{rcs} eq 'cvs') {
+ $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
+ }
else {
error sprintf(gettext("unsupported revision control system %s"),
$config{rcs});
diff --git a/debian/changelog b/debian/changelog
index 1408e4dce..c693be513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20091203) UNRELEASED; urgency=low
+
+ * cvs: Add missing bit to Automator.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 02 Dec 2009 17:22:21 -0500
+
ikiwiki (3.20091202) unstable; urgency=low
* meta: Generate meta description tags even when the html scrubber is