Use the GregorianDate library.

diff --git a/debian/control b/debian/control
index 3eef237..b1d9a6a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: cocanwiki
 Priority: optional
 Maintainer: Richard W.M. Jones <rich@annexia.org>
-Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml (>= 1.3.2), libtemplate-ocaml-dev (>= 1.3.2), ocamldsort (>= 0.14.2)
+Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, libgregoriandate-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml (>= 1.3.2), libtemplate-ocaml-dev (>= 1.3.2), ocamldsort (>= 0.14.2)
 Standards-Version: 3.6.1
 
 Package: cocanwiki
 Section: web
 Architecture: all
 Depends: libpgsql-ocaml, libdbi-ocaml (>= 0.9.9), libpcre-ocaml,
+ libgregoriandate-ocaml,
  ocaml-base-nox-3.08, libapache-mod-caml (>= 1.3.2),
  libtemplate-ocaml-dev (>= 1.3.2),
  libocamlnet-ocaml-dev (>= 0.98),

diff --git a/scripts/Makefile b/scripts/Makefile
index c24a331..cca402c 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,13 +1,12 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.44 2004/10/21 11:48:21 rich Exp $
+# $Id: Makefile,v 1.45 2004/10/24 19:25:20 rich Exp $
 
 include ../Makefile.config
 
 OCAMLC := ocamlc
-# XXX Move GregorianDate out of +merjis.
 OCAMLCFLAGS := -w s \
        -I +apache -I +pcre -I +dbi -I +extlib -I +netstring \
-       -I +merjis -I lib
+       -I +gregoriandate -I lib
 CPP := cpp
 
 SRCS := $(wildcard *.ml)