Updated documentation for version 1.2-5.

diff --git a/debian/README.Debian b/debian/README.Debian
index ced2817e33a1c4824fdaca0cac114bb34679ad51..6ca9bfca74a41a124eb2b4df49f79bacb30b765d 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,14 @@
-This Debian package of Memories configures any installed version of
-Apache with mod_perl so that Memories is available through the path
-/memories/.  This is controlled by /etc/memories/apache.conf.
+You can run Memories through CGI or Apache's mod_perl:
+
+- The CGI script is /usr/lib/cgi-bin/memories.cgi.
+
+- Use of mod_perl is configured in /etc/memories/apache.conf,
+  which by default uses the path /memories/.  If you use mod_perl
+  you must also enable mod_apreq.  If both these modules are
+  enabled for Apache 2 when Memories is installed or upgraded,
+  Memories is added to the Apache configuration automatically.
+  To do this later, run:
+      ln -s ../../memories/apache.conf /etc/apache2/conf.d/memories

 
 In order to run Memories you will need to set up a database with the
 schema given in /usr/share/memories/memories.sql and grant the
 
 In order to run Memories you will need to set up a database with the
 schema given in /usr/share/memories/memories.sql and grant the


@@ -21,4 +29,4 @@ You will almost certainly need to change the 'uri_base' and
 configuration.  You will also need to change the 'dsn' parameter if
 the database name is not 'memories'.
 
 configuration.  You will also need to change the 'dsn' parameter if
 the database name is not 'memories'.
 

- -- Ben Hutchings <ben@decadentplace.org.uk>  Fri, 17 Feb 2006 02:12:31 +0000
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 21 Aug 2007 00:37:26 +0100

diff --git a/debian/changelog b/debian/changelog
index 3e6012c2455ff3cdcde956cf63cfde7c5f05305f..498f7e8a5e2ff895d1be8b4c08a521923131a44d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+memories (1.2-5) unstable; urgency=low
+
+  * Changed to work with Apache 2, using Maypole 2.111 - closes: #432504
+  * Split changes into patches managed with quilt
+  * Fixed generation of thumbnail URIs in templates (102_fix-uris.diff)
+  * Added CGI script
+  * Added md5sums
+  * Updated policy version to 3.7.2 (no other changes required)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 17 Sep 2007 00:46:20 +0100
+

 memories (1.2-4) unstable; urgency=low
 
   * Disabled integration with Apache 2 since Memories does not yet work
 memories (1.2-4) unstable; urgency=low
 
   * Disabled integration with Apache 2 since Memories does not yet work