Write out the fixed themes table into the SQL file.

Updated MANIFEST.
Bumped release no.

diff --git a/MANIFEST b/MANIFEST
index 8f5de7b..e06eace 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -17,6 +17,7 @@ html/_css/login.css
 html/_css/markup.css
 html/_css/standard.css
 html/_css/users.css
+html/_css/visualise_links.css
 html/_graphics/.cvsignore
 html/_graphics/arrow-down.png
 html/_graphics/arrow-up.png
@@ -31,6 +32,8 @@ html/_graphics/ok.png
 html/_graphics/tick.png
 html/_graphics/xml.png
 html/_js/editor.js
+html/_js/visualise_links.js
+html/_js/wz_jsgraphics.js
 html/_static/markup.html
 html/robots.txt
 scripts/.cvsignore
@@ -146,6 +149,7 @@ scripts/upload_file_form.ml
 scripts/upload_image.ml
 scripts/upload_image_form.ml
 scripts/users.ml
+scripts/visualise_links.ml
 scripts/what_links_here.ml
 scripts/wikilib.ml
 scripts/wikilib.mli
@@ -212,4 +216,5 @@ templates/undelete_image_form.html
 templates/upload_file_form.html
 templates/upload_image_form.html
 templates/users.html
+templates/visualise_links.html
 templates/what_links_here.html
\ No newline at end of file

diff --git a/Makefile b/Makefile
index 60e1fef..c99e7e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2004/09/26 17:49:46 rich Exp $
+# $Id: Makefile,v 1.9 2004/09/29 15:03:10 rich Exp $
 
 include Makefile.config
 
@@ -45,8 +45,13 @@ clean:
        find \( -name '*~' -o -name core \) -a -exec rm {} \;
        $(MAKE) -C scripts clean
 
+FIXED_TABLES := themes
+
 cocanwiki.sql:
        pg_dump --no-owner -i -s cocanwiki > $@
+       for table in $(FIXED_TABLES); do \
+         pg_dump --no-owner -i -a -t $$table cocanwiki >> $@; \
+       done
 
 dist:
        $(MAKE) check-manifest

diff --git a/cocanwiki.sql b/cocanwiki.sql
index 785ac70..247f915 100644 (file)
--- a/cocanwiki.sql
+++ b/cocanwiki.sql
@@ -904,3 +904,22 @@ COMMENT ON SCHEMA public IS 'Standard public namespace';
 COMMENT ON TABLE server_settings IS 'This table contains global settings for the server.  There should be only one row in this table.  If you modify any setting, you must restart the webserver for the change to take effect.  The "version" field is intended to be some sort of database version, but is currently unused.';
 
 
+--
+-- PostgreSQL database dump
+--
+
+SET client_encoding = 'UNICODE';
+SET check_function_bodies = false;
+
+SET search_path = public, pg_catalog;
+
+--
+-- Data for TOC entry 2 (OID 543499)
+-- Name: themes; Type: TABLE DATA; Schema: public; Owner: rich
+--
+
+COPY themes (theme_css, name, description) FROM stdin;
+/_css/easyweb.css      Merjis Easy Web Marketing       This is the easy web marketing stylesheet developed by Merjis Ltd.  Please see http://www.merjis.com/
+\.
+
+

diff --git a/debian/changelog b/debian/changelog
index 3ece95c..bb80527 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.1.2-2) unstable; urgency=low
+cocanwiki (1.1.2-3) unstable; urgency=low
 
   * Initial Release.