Use cvs2cl.pl instead of rcs2log for ChangeLog generation

diff --git a/Makefile.am b/Makefile.am
index cf478c0..a725fd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,15 @@ EXTRA_DIST+= \
 MAINTAINERCLEANFILES+= \
                ChangeLog
 
-# FIXME: replace by cvs2cl.pl !
+CLEANFILES+= \
+               ChangeLog.bak
+
+if MAINTAINER_MODE
+ChangeLog:
+       cvs2cl.pl --usermap cvs2cl-usermap --window 3600 --separate-header --no-wrap --file $@
+
+else
 ChangeLog:
-       rcs2log >$@
+       touch $@
+
+endif

diff --git a/autogen.pl b/autogen.pl
index 8450a26..63dcec9 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -35,6 +35,7 @@ AutoGen->run(
                "clean"=>[qw(
                                .include_test_false.c
                                .include_test_all.stamp
+                               ./ChangeLog.bak
                                ./doc/*-pod.*
                                ./doc/apiref/captive.types
                                ./src/client/cmdline/captivecmdline

diff --git a/cvs2cl-usermap b/cvs2cl-usermap
new file mode 100644 (file)
index 0000000..a2fb6d8
--- /dev/null
+++ b/cvs2cl-usermap
@@ -0,0 +1,2 @@
+short:Jan Kratochvil <project-captive@jankratochvil.net>
+lace:Jan Kratochvil <project-captive@jankratochvil.net>