Version 1.3.11. Removed debian/ subdir, now stored on alioth.debian.org

diff --git a/Makefile.config b/Makefile.config
index 83da3eb..df86c5a 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,7 +1,7 @@
-# $Id: Makefile.config,v 1.19 2004/11/22 11:12:25 rich Exp $
+# $Id: Makefile.config,v 1.20 2005/03/31 14:04:18 rich Exp $
 
 PACKAGE := cocanwiki
-VERSION := 1.3.9
+VERSION := 1.3.11
 
 # Normally ignored.  However, if you are installing centrally (using
 # 'make pkg-install'), then the components are installed in the

diff --git a/debian/.cvsignore b/debian/.cvsignore
deleted file mode 100644 (file)
index 8bb990a..0000000
--- a/debian/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-tmp
-files
-cocanwiki
-*.substvars

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index a76c4d6..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-cocanwiki (1.3.9-2) unstable; urgency=low
-
-  * Initial Release.
-
- -- Richard W.M. Jones <rich@annexia.org>  Sat,  1 Nov 2003 12:41:34 +0000
-

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 45527f9..0000000
--- a/debian/control
+++ /dev/null
@@ -1,21 +0,0 @@
-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, libgregoriandate-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml (>= 1.3.3), libtemplate-ocaml-dev (>= 1.3.3), 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.3),
- libtemplate-ocaml-dev (>= 1.3.3),
- libocamlnet-ocaml-dev (>= 0.98),
- imagemagick, curl (>= 7.12.1)
-Suggests: apache
-Recommends: graphviz
-Description: A Wiki written in Objective CAML (OCaml)
- This is a Wiki written entirely in Objective CAML (OCaml).
- .
- More information is available at http://sandbox.merjis.com/

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index 84f94d2..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,11 +0,0 @@
-This package was debianized by Richard W.M. Jones <rich@annexia.org> on
-Sat,  1 Nov 2003 12:41:34 +0000.
-
-Upstream Author: Richard W.M. Jones <rich@annexia.org>
-
-Copyright: Copyright (C) 2004 Merjis Ltd.
-
-Copyright by the author and redistributable under the terms of the GNU
-General Public License. On Debian Linux systems, the complete text of
-the GNU General Public License can be found in
-`/usr/share/common-licenses/GPL'.

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index 8d3ffe5..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-       dh_testdir
-
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-
-       -$(MAKE) clean
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       $(MAKE) pkg-install DESTDIR=$(CURDIR)/debian/cocanwiki
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-#      dh_strip                # Nothing to strip, hopefully.
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_python
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/html/_css/basic.css b/html/_css/basic.css
index 432db66..3642a4e 100644 (file)
--- a/html/_css/basic.css
+++ b/html/_css/basic.css
@@ -1,5 +1,5 @@
 /* Minimal list of CSS required for all COCANWIKIs.
- * $Id: basic.css,v 1.1 2004/10/18 13:34:21 rich Exp $
+ * $Id: basic.css,v 1.2 2005/03/31 14:04:19 rich Exp $
  */
 
 /* Links. */
@@ -38,7 +38,7 @@ div#old_version {
   padding: 4px;
   width: 80%;
   margin-left: 10%;
-  clear: both;
+  /* clear: both; */
 }
 
 /* Highlighting search terms. */