Index: installers/debian/openacs/changelog
===================================================================
RCS file: /usr/local/cvsroot/installers/debian/openacs/changelog,v
diff -u -r1.1 -r1.2
--- installers/debian/openacs/changelog	4 Apr 2008 14:10:31 -0000	1.1
+++ installers/debian/openacs/changelog	9 Apr 2008 13:37:39 -0000	1.2
@@ -1,4 +1,4 @@
-openacs (5.4.0) unstable; urgency=low
+openacs (5.4.1) unstable; urgency=low
 
   * Initial release
 
Index: installers/debian/openacs/control
===================================================================
RCS file: /usr/local/cvsroot/installers/debian/openacs/control,v
diff -u -r1.1 -r1.2
--- installers/debian/openacs/control	4 Apr 2008 14:10:31 -0000	1.1
+++ installers/debian/openacs/control	9 Apr 2008 13:37:39 -0000	1.2
@@ -10,6 +10,6 @@
 Architecture: all
 Depends: ${misc:Depends}, aolserver4, aolserver4-nscache, aolserver4-nspostgres, aolserver4-nssha1, postgresql-client, adduser, tclthread (>= 1:2.6.5-3), tcllib, tcl8.4, wwwconfig-common, debconf, xotcl, aolserver4-xotcl, imagemagick 
 Recommends: postgresql-8.2, daemontools-installer
-Description: OpenACS (Open Architecture Community System)
+Description: Open Architecture Community System
  OpenACS (Open Architecture Community System) is a toolkit for building 
  scalable, community-oriented web applications.
Index: installers/debian/openacs/rules
===================================================================
RCS file: /usr/local/cvsroot/installers/debian/openacs/rules,v
diff -u -r1.1 -r1.2
--- installers/debian/openacs/rules	4 Apr 2008 14:10:31 -0000	1.1
+++ installers/debian/openacs/rules	9 Apr 2008 13:37:39 -0000	1.2
@@ -45,7 +45,6 @@
 	
 	# Deleting some unneeded files
 	rm debian/openacs/var/log/aolserver4/openacs/log.txt
-	rm debian/openacs/usr/share/openacs/packages/theme-selva/www/resources/Selva/default/images/.DS_Store
 	rm debian/openacs/usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/img/Thumbs.db
 
 	# Setting up correct permissions
Index: installers/debian/openacs/patches/config.dpatch
===================================================================
RCS file: /usr/local/cvsroot/installers/debian/openacs/patches/config.dpatch,v
diff -u -r1.1 -r1.2
--- installers/debian/openacs/patches/config.dpatch	4 Apr 2008 14:10:31 -0000	1.1
+++ installers/debian/openacs/patches/config.dpatch	9 Apr 2008 13:37:39 -0000	1.2
@@ -1,79 +1,59 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## config.dpatch by  <root@localhost>
+## config.dpatch by  <geox@localhost>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adaptation of config.tcl and daemontools/run to debian install. 
+## DP: No description.
 
 @DPATCH@
-diff -urNad dotlrn-2.3.1~/etc/config.tcl dotlrn-2.3.1/etc/config.tcl
---- dotlrn-2.3.1~/etc/config.tcl	2008-03-26 14:33:23.000000000 +0100
-+++ dotlrn-2.3.1/etc/config.tcl	2008-03-27 13:25:56.000000000 +0100
-@@ -19,17 +19,16 @@
- # setting the address to 0.0.0.0 means aolserver listens on all interfaces
- set hostname                  [ns_info hostname]
- #set address                   [ns_info address]
--set address                   0.0.0.0
-+set address                   127.0.0.1
- 
- # Note: If port is privileged (usually < 1024), OpenACS must be
+diff -urNad openacs-5.4.1~/etc/config.tcl openacs-5.4.1/etc/config.tcl
+--- openacs-5.4.1~/etc/config.tcl	2008-02-01 04:24:30.000000000 +0100
++++ openacs-5.4.1/etc/config.tcl	2008-04-09 14:24:53.000000000 +0200
+@@ -24,10 +24,11 @@
  # started by root, and, in AOLserver 4, the run script have a 
  # '-b address' flag which matches the address according to settings (above)
  
 -set server                    "service0" 
 -set servername                "New OpenACS Installation - Development"
--
--set serverroot                "/var/lib/aolserver/${server}"
--
-+set server                    	"dotlrn" 
-+set servername                	"dotLRN"
-+set serverroot                	"/usr/share/dotlrn"
-+set pidfile         		/var/run/aolserver4/${server}.pid
++set server                    "openacs" 
++set servername                "New OpenACS Installation"
+ 
+-set serverroot                "/var/www/${server}"
++set serverroot                "/usr/share/openacs"
++set pidfile                    /var/run/aolserver4/${server}.pid
+ 
  #---------------------------------------------------------------------
  # which database do you want? postgres or oracle
- set database              postgres 
-@@ -39,17 +38,18 @@
- if { $database == "oracle" } {
+@@ -38,9 +39,8 @@
+ if { $database eq "oracle" } {
      set db_password           "mysitepassword"
  } else {
 -    set db_host               localhost
 -    set db_port               ""
 -    set db_user               $server
-+
 +## Beginning of the conf changed by debconf ##
 +##############################################
-+
  }
  
  #---------------------------------------------------------------------
- # if debug is false, all debugging will be turned off
- set debug false
- 
--set homedir                   /usr/local/aolserver
--set bindir                    [file dirname [ns_info nsd]] 
-+set homedir                   /usr/lib/aolserver4
-+set bindir                    /usr/lib/aolserver4/bin 
- 
- 
- set max_file_upload_mb        20
-@@ -86,7 +86,7 @@
+@@ -85,7 +85,7 @@
      ns_param   maxbackup          5
      ns_param   debug              $debug
  #    ns_param   mailhost           localhost 
 -
-+    ns_param   pidfile		  ${pidfile}
++    ns_param   pidfile           ${pidfile}
      # setting to Unicode by default
      # see http://dqd.com/~mayoff/encoding-doc.html
      ns_param   HackContentType    1     
-@@ -101,7 +101,7 @@
+@@ -100,7 +100,7 @@
  ns_section ns/threads 
      ns_param   mutexmeter         true      ;# measure lock contention 
      # The per-thread stack size must be a multiple of 8k for AOLServer to run under MacOS X
--    ns_param   stacksize          [expr 128 * 8192]
-+    ns_param   stacksize          [expr 512 * 8192]
+-    ns_param   stacksize          [expr {128 * 8192}]
++    ns_param   stacksize          [expr {512 * 8192}]
  
  # 
  # MIME types. 
-@@ -660,12 +660,10 @@
+@@ -659,9 +659,7 @@
      }
  
      # nsthread library which should become standard in 5.3
@@ -82,22 +62,24 @@
 -    }
 +    ns_param libthread  [lindex [glob /usr/lib/tcltk/thread*/libthread*-aolserver[info sharedlibextension]] 0]
  
- ns_log notice "nsd.tcl: using threadsafe tcl: [info exists tcl_platform(threaded)]"
+     if {[ns_info version] >= 4.5} {
+         ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
+@@ -671,4 +669,4 @@
  ns_log notice "nsd.tcl: finished reading config file."
  if {[ns_info version] >= 4.5} {
      ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
 -}
 \ No newline at end of file
 +}
-diff -urNad dotlrn-2.3.1~/etc/daemontools/run dotlrn-2.3.1/etc/daemontools/run
---- dotlrn-2.3.1~/etc/daemontools/run	2008-03-26 14:33:23.000000000 +0100
-+++ dotlrn-2.3.1/etc/daemontools/run	2008-03-27 13:20:29.000000000 +0100
+diff -urNad openacs-5.4.1~/etc/daemontools/run openacs-5.4.1/etc/daemontools/run
+--- openacs-5.4.1~/etc/daemontools/run	2008-01-14 10:35:56.000000000 +0100
++++ openacs-5.4.1/etc/daemontools/run	2008-04-09 14:25:23.000000000 +0200
 @@ -9,7 +9,7 @@
  # see http://openacs.org/forums/message-view?message_id=176100
  sleep 4
  
--exec /usr/local/aolserver/bin/nsd-postgres -it /var/lib/aolserver/service0/etc/config.tcl -u service0 -g web
-+exec /usr/lib/aolserver4/bin/nsd -it /etc/dotlrn/config.tcl -u www-data -g www-data
+-exec /usr/lib/aolserver4/bin/nsd -it /var/www/service0/etc/config.tcl -u service0 -g web
++exec /usr/lib/aolserver4/bin/nsd -it /etc/openacs/config.tcl -u www-data -g www-data 
  
  # For AOLserver 4 using privileged ports (usually < 1024), add the flag
  # -b youraddress:yourport to the nsd command
Index: installers/debian/openacs/patches/interpreters-path.dpatch
===================================================================
RCS file: /usr/local/cvsroot/installers/debian/openacs/patches/interpreters-path.dpatch,v
diff -u -r1.1 -r1.2
--- installers/debian/openacs/patches/interpreters-path.dpatch	4 Apr 2008 14:10:31 -0000	1.1
+++ installers/debian/openacs/patches/interpreters-path.dpatch	9 Apr 2008 13:37:39 -0000	1.2
@@ -5,80 +5,80 @@
 ## DP: Fixes some routes for interpreters on scripts. 
 
 @DPATCH@
-diff -urNad dotlrn-2.3.1~/bin/ad-context-server.pl dotlrn-2.3.1/bin/ad-context-server.pl
---- dotlrn-2.3.1~/bin/ad-context-server.pl	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/bin/ad-context-server.pl	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/bin/ad-context-server.pl openacs-5.4.1/bin/ad-context-server.pl
+--- openacs-5.4.1~/bin/ad-context-server.pl	2001-03-13 23:59:26.000000000 +0100
++++ openacs-5.4.1/bin/ad-context-server.pl	2008-04-09 14:41:12.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  ##########################################################
  # ArsDigita Context Server
-diff -urNad dotlrn-2.3.1~/bin/create-sql-drop-file.pl dotlrn-2.3.1/bin/create-sql-drop-file.pl
---- dotlrn-2.3.1~/bin/create-sql-drop-file.pl	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/bin/create-sql-drop-file.pl	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/bin/create-sql-drop-file.pl openacs-5.4.1/bin/create-sql-drop-file.pl
+--- openacs-5.4.1~/bin/create-sql-drop-file.pl	2001-03-13 23:59:26.000000000 +0100
++++ openacs-5.4.1/bin/create-sql-drop-file.pl	2008-04-09 14:41:27.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w
  
  # @author: Jim Guggemoos		created it
  # @author: Christian Brechbuehler	some maintenance
-diff -urNad dotlrn-2.3.1~/bin/data-dictionary-diff.pl dotlrn-2.3.1/bin/data-dictionary-diff.pl
---- dotlrn-2.3.1~/bin/data-dictionary-diff.pl	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/bin/data-dictionary-diff.pl	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/bin/data-dictionary-diff.pl openacs-5.4.1/bin/data-dictionary-diff.pl
+--- openacs-5.4.1~/bin/data-dictionary-diff.pl	2001-03-13 23:59:26.000000000 +0100
++++ openacs-5.4.1/bin/data-dictionary-diff.pl	2008-04-09 14:41:39.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  # by Jin Choi <jsc@arsdigita.com>, 2000-03-20
  
-diff -urNad dotlrn-2.3.1~/bin/encode64.pl dotlrn-2.3.1/bin/encode64.pl
---- dotlrn-2.3.1~/bin/encode64.pl	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/bin/encode64.pl	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/bin/encode64.pl openacs-5.4.1/bin/encode64.pl
+--- openacs-5.4.1~/bin/encode64.pl	2001-03-13 23:59:26.000000000 +0100
++++ openacs-5.4.1/bin/encode64.pl	2008-04-09 14:42:08.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  #
  # Encode a file from stdin as base64
  #
-diff -urNad dotlrn-2.3.1~/bin/plsql-diff.pl dotlrn-2.3.1/bin/plsql-diff.pl
---- dotlrn-2.3.1~/bin/plsql-diff.pl	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/bin/plsql-diff.pl	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/bin/plsql-diff.pl openacs-5.4.1/bin/plsql-diff.pl
+--- openacs-5.4.1~/bin/plsql-diff.pl	2001-03-13 23:59:26.000000000 +0100
++++ openacs-5.4.1/bin/plsql-diff.pl	2008-04-09 14:42:24.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  # by Jin Choi <jsc@arsdigita.com>, 2000-03-21
  
-diff -urNad dotlrn-2.3.1~/bin/triggers-diff.pl dotlrn-2.3.1/bin/triggers-diff.pl
---- dotlrn-2.3.1~/bin/triggers-diff.pl	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/bin/triggers-diff.pl	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/bin/triggers-diff.pl openacs-5.4.1/bin/triggers-diff.pl
+--- openacs-5.4.1~/bin/triggers-diff.pl	2001-03-13 23:59:26.000000000 +0100
++++ openacs-5.4.1/bin/triggers-diff.pl	2008-04-09 14:42:36.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  # by Jin Choi <jsc@arsdigita.com>, 2000-03-26
  
-diff -urNad dotlrn-2.3.1~/etc/deploy.sh dotlrn-2.3.1/etc/deploy.sh
---- dotlrn-2.3.1~/etc/deploy.sh	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/etc/deploy.sh	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/etc/deploy.sh openacs-5.4.1/etc/deploy.sh
+--- openacs-5.4.1~/etc/deploy.sh	2004-03-03 14:18:35.000000000 +0100
++++ openacs-5.4.1/etc/deploy.sh	2008-04-09 14:42:59.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/bin/tclsh
 +#!/usr/bin/tclsh
  # process command line arguments
  foreach arg $argv {
      switch -glob -- $arg {
-diff -urNad dotlrn-2.3.1~/etc/install/functions.sh dotlrn-2.3.1/etc/install/functions.sh
---- dotlrn-2.3.1~/etc/install/functions.sh	2004-04-25 11:32:27.000000000 +0200
-+++ dotlrn-2.3.1/etc/install/functions.sh	2008-04-03 11:33:47.000000000 +0200
+diff -urNad openacs-5.4.1~/etc/install/functions.sh openacs-5.4.1/etc/install/functions.sh
+--- openacs-5.4.1~/etc/install/functions.sh	2004-04-25 11:32:27.000000000 +0200
++++ openacs-5.4.1/etc/install/functions.sh	2008-04-09 14:43:33.000000000 +0200
 @@ -1,3 +1,4 @@
 +#!/bin/sh
  # Access config parameters in the TCL file through this function
  
  get_config_param () {
-diff -urNad dotlrn-2.3.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt dotlrn-2.3.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt
---- dotlrn-2.3.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt	2008-04-03 11:27:23.000000000 +0200
-+++ dotlrn-2.3.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt	2008-04-03 11:33:25.000000000 +0200
+diff -urNad openacs-5.4.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt openacs-5.4.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt
+--- openacs-5.4.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt	2003-06-24 05:19:17.000000000 +0200
++++ openacs-5.4.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt	2008-04-09 14:44:21.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/sh
 +#!/bin/sh
@@ -92,27 +92,11 @@
 -svc -u $1
 \ No newline at end of file
 +svc -u $1
-diff -urNad dotlrn-2.3.1~/packages/acs-lang/bin/functions.sh dotlrn-2.3.1/packages/acs-lang/bin/functions.sh
---- dotlrn-2.3.1~/packages/acs-lang/bin/functions.sh	2003-10-31 13:58:29.000000000 +0100
-+++ dotlrn-2.3.1/packages/acs-lang/bin/functions.sh	2008-04-03 11:34:02.000000000 +0200
+diff -urNad openacs-5.4.1~/packages/acs-lang/bin/functions.sh openacs-5.4.1/packages/acs-lang/bin/functions.sh
+--- openacs-5.4.1~/packages/acs-lang/bin/functions.sh	2003-10-31 13:58:29.000000000 +0100
++++ openacs-5.4.1/packages/acs-lang/bin/functions.sh	2008-04-09 14:44:48.000000000 +0200
 @@ -1,3 +1,4 @@
 +#!/bin/sh
  # Functions re-used by scripts in acs-lang/bin
  #
  # @author Peter Marklund
-diff -urNad dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/images.pl dotlrn-2.3.1/packages/theme-selva/www/doc/howto/images.pl
---- dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/images.pl	2005-07-26 16:28:31.000000000 +0200
-+++ dotlrn-2.3.1/packages/theme-selva/www/doc/howto/images.pl	2008-04-03 11:34:44.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/perl
- # LaTeX2HTML 2002-2-1 (1.70)
- # Associate images original text with physical files.
- 
-diff -urNad dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/labels.pl dotlrn-2.3.1/packages/theme-selva/www/doc/howto/labels.pl
---- dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/labels.pl	2005-07-26 16:28:30.000000000 +0200
-+++ dotlrn-2.3.1/packages/theme-selva/www/doc/howto/labels.pl	2008-04-03 11:35:54.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/perl
- # LaTeX2HTML 2002-2-1 (1.70)
- # Associate labels original text with physical files.
-