--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
--- Please enter the report below this line. ---
Hi Relase Team!
Please unblock package dotlrn. It fixes an important bug (#677060) and a minor patch issue.
Unfortunately, and I apologize for that, the previous version (2.5.0+dfsg-7) also included the migration of the package format to the new 3.0 one (#661038), but didn't reach testing on time before the freeze, so the version now in unstable (2.5.0+dfsg-8) also differs from the testing one (2.5.0+dfsg-6) in the package format issue.
Please find in attachment the debdiff between testing and unstable versions.
Kind regards,
Héctor Romojaro
unblock: dotlrn/2.5.0+dfsg-8
--- System information. ---
Architecture: amd64
Kernel: Linux 3.2.0-3-amd64
Debian Release: wheezy/sid
500 unstable www.debian-multimedia.org
500 unstable ftp.uk.debian.org
500 stable dl.google.com
500 maverick ppa.launchpad.net
500 karmic ppa.launchpad.net
1 experimental ftp.uk.debian.org
--- Package information. ---
Package's Depends field is empty.
Package's Recommends field is empty.
Package's Suggests field is empty.
diff -Nru dotlrn-2.5.0+dfsg/debian/changelog dotlrn-2.5.0+dfsg/debian/changelog
--- dotlrn-2.5.0+dfsg/debian/changelog 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/changelog 2012-07-09 15:22:51.000000000 +0200
@@ -1,3 +1,17 @@
+dotlrn (2.5.0+dfsg-8) unstable; urgency=low
+
+ * Fixed call to ucf on postrm. Closes: #677060
+ * Fixed interpreters-path.patch
+ * Policy bumped to 3.9.3 without changes.
+
+ -- Hector Romojaro <hromojaro@dia.uned.es> Thu, 28 Jun 2012 16:32:23 +0200
+
+dotlrn (2.5.0+dfsg-7) unstable; urgency=low
+
+ * Updated to 3.0 packaging format. Closes: #661038
+
+ -- Hector Romojaro <hromojaro@dia.uned.es> Sat, 03 Mar 2012 12:54:39 +0100
+
dotlrn (2.5.0+dfsg-6) unstable; urgency=low
* Updated Dutch translation. Closes: #660229
diff -Nru dotlrn-2.5.0+dfsg/debian/control dotlrn-2.5.0+dfsg/debian/control
--- dotlrn-2.5.0+dfsg/debian/control 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/control 2012-07-09 15:22:51.000000000 +0200
@@ -4,8 +4,8 @@
Maintainer: Hector Romojaro <hromojaro@dia.uned.es>
Uploaders: Francesco Paolo Lovergine <frankie@debian.org>
Build-Depends-Indep: po-debconf
-Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-tcltk/dotlrn/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-tcltk/dotlrn/trunk
Homepage: http://www.dotlrn.org/
@@ -15,7 +15,7 @@
Depends: ${misc:Depends}, aolserver4-daemon (>= 4.5.1-11), aolserver4-nspostgres, aolserver4-nssha1, postgresql-client,
adduser, tclthread (>= 1:2.6.5-3), tcllib, tcl (>= 8.4), wwwconfig-common, debconf, xotcl,
aolserver4-xotcl, imagemagick, zip, unzip, tdom (>= 0.8.3~20080525)
-Suggests: postgresql, daemontools, daemontools-run
+Suggests: postgresql-8.4, daemontools, daemontools-run
Description: e-learning portal system based on OpenACS
dotLRN is a complete Learning Management System that integrates course
and content administration tools and collaborative tools into a
diff -Nru dotlrn-2.5.0+dfsg/debian/docs dotlrn-2.5.0+dfsg/debian/docs
--- dotlrn-2.5.0+dfsg/debian/docs 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/docs 2012-07-09 15:22:51.000000000 +0200
@@ -1,2 +1 @@
-debian/README.source
debian/README.daemontools
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/00list dotlrn-2.5.0+dfsg/debian/patches/00list
--- dotlrn-2.5.0+dfsg/debian/patches/00list 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-config.dpatch
-interpreters-path.dpatch
-interpreters-bashisms.dpatch
-install.dpatch
-xinha-iconset.dpatch
-securityfix.dpatch
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/config.dpatch dotlrn-2.5.0+dfsg/debian/patches/config.dpatch
--- dotlrn-2.5.0+dfsg/debian/patches/config.dpatch 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/patches/config.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,147 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 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.
-
-@DPATCH@
-diff -urNad trunk~/etc/config.tcl trunk/etc/config.tcl
---- trunk~/etc/config.tcl 2009-03-31 19:14:52.000000000 +0200
-+++ trunk/etc/config.tcl 2009-10-16 20:36:07.000000000 +0200
-@@ -9,8 +9,10 @@
- ######################################################################
-
- #---------------------------------------------------------------------
--# change to 80 and 443 for production use
--set httpport 8000
-+# Defined in /etc/aolserver4/conf.d/openacs.sh
-+set httpport [exec grep "^AOL_PORT" /etc/aolserver4/conf.d/dotlrn.sh | sed s/AOL_PORT=//]
-+set address [exec grep "^AOL_ADDRESS" /etc/aolserver4/conf.d/dotlrn.sh | sed s/AOL_ADDRESS=//]
-+
- set httpsport 8443
- # If setting port below 1024 with AOLServer 4, read comments in file:
- # /var/lib/aolserver/service0/packages/etc/daemontools/run
-@@ -18,16 +20,16 @@
- # The hostname and address should be set to actual values.
- # setting the address to 0.0.0.0 means aolserver listens on all interfaces
- set hostname localhost
--set address 127.0.0.1
-
- # Note: If port is privileged (usually < 1024), OpenACS must be
- # 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 server "dotlrn"
-+set servername "dotLRN"
-
--set serverroot "/var/www/${server}"
-+set serverroot "/usr/share/${server}"
-+set pidfile /var/run/aolserver4/${server}.pid
-
- #---------------------------------------------------------------------
- # which database do you want? postgres or oracle
-@@ -38,9 +40,8 @@
- if { $database eq "oracle" } {
- set db_password "mysitepassword"
- } else {
-- set db_host localhost
-- set db_port ""
-- set db_user $server
-+## Debconf changes (DO NOT EDIT BYHAND) ##
-+## End Debconf Changes ###################
- }
-
- #---------------------------------------------------------------------
-@@ -85,6 +86,7 @@
- ns_param maxbackup 5
- ns_param debug $debug
- # ns_param mailhost localhost
-+ ns_param pidfile ${pidfile}
-
- # setting to Unicode by default
- # see http://dqd.com/~mayoff/encoding-doc.html
-@@ -100,7 +102,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}]
-
- #
- # MIME types.
-@@ -569,7 +571,7 @@
- ns_param driver postgres
- ns_param datasource ${db_host}:${db_port}:${db_name}
- ns_param user $db_user
-- ns_param password ""
-+ ns_param password $db_password
- }
-
- ns_section ns/db/pool/pool2
-@@ -588,7 +590,7 @@
- ns_param driver postgres
- ns_param datasource ${db_host}:${db_port}:${db_name}
- ns_param user $db_user
-- ns_param password ""
-+ ns_param password $db_password
- }
-
- ns_section ns/db/pool/pool3
-@@ -607,7 +609,7 @@
- ns_param driver postgres
- ns_param datasource ${db_host}:${db_port}:${db_name}
- ns_param user $db_user
-- ns_param password ""
-+ ns_param password $db_password
- }
-
- ns_section ns/server/${server}/db
-@@ -621,12 +623,14 @@
- ns_section ns/server/${server}/modules
- ns_param nssock ${bindir}/nssock.so
- ns_param nslog ${bindir}/nslog.so
-- ns_param nssha1 ${bindir}/nssha1.so
-+ ns_param nssha1 ${bindir}/nssha1.so
-+
- # since aolserver version 4.5.1 built-in ns_cache, so we dont
- # need to load the nscache module.
- if {[ns_info version] < 4.5 || [ns_info patchlevel] eq "4.5.0"} {
- ns_param nscache ${bindir}/nscache.so
- }
-+
- # openacs versions earlier than 5.x requires nsxml
- # ns_param nsxml ${bindir}/nsxml.so
-
-@@ -662,7 +666,7 @@
- }
-
- # nsthread library which should become standard in 5.3
-- ns_param libthread [lindex [glob ${homedir}/lib/thread*/libthread*[info sharedlibextension]] 0]
-+ ns_param libthread [lindex [glob /usr/lib/tcltk/thread*/libthread*-aolserver[info sharedlibextension]] 0]
-
- if {[ns_info version] >= 4.5} {
- ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
-@@ -673,3 +677,4 @@
- if {[ns_info version] >= 4.5} {
- ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
- }
-+
-diff -urNad trunk~/etc/daemontools/run trunk/etc/daemontools/run
---- trunk~/etc/daemontools/run 2008-01-14 10:35:56.000000000 +0100
-+++ trunk/etc/daemontools/run 2009-10-16 20:39:39.000000000 +0200
-@@ -9,7 +9,12 @@
- # see http://openacs.org/forums/message-view?message_id=176100
- sleep 4
-
--exec /usr/lib/aolserver4/bin/nsd -it /var/www/service0/etc/config.tcl -u service0 -g web
-+. /etc/aolserver4/conf.d/dotlrn.sh
-+
-+DAEMON="/usr/lib/aolserver4/bin/nsd"
-+CONF="/etc/dotlrn/config.tcl"
-+
-+exec $DAEMON -it $CONF -u $AOL_USER -g $AOL_GROUP -b $AOL_ADDRESS:$AOL_PORT
-
- # For AOLserver 4 using privileged ports (usually < 1024), add the flag
- # -b youraddress:yourport to the nsd command
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/config.patch dotlrn-2.5.0+dfsg/debian/patches/config.patch
--- dotlrn-2.5.0+dfsg/debian/patches/config.patch 1970-01-01 01:00:00.000000000 +0100
+++ dotlrn-2.5.0+dfsg/debian/patches/config.patch 2012-07-09 15:22:51.000000000 +0200
@@ -0,0 +1,140 @@
+Author: <geox@localhost>
+Description: Adaptation of config.tcl and daemontools/run to debian install.
+--- a/etc/config.tcl
++++ b/etc/config.tcl
+@@ -9,8 +9,10 @@
+ ######################################################################
+
+ #---------------------------------------------------------------------
+-# change to 80 and 443 for production use
+-set httpport 8000
++# Defined in /etc/aolserver4/conf.d/openacs.sh
++set httpport [exec grep "^AOL_PORT" /etc/aolserver4/conf.d/dotlrn.sh | sed s/AOL_PORT=//]
++set address [exec grep "^AOL_ADDRESS" /etc/aolserver4/conf.d/dotlrn.sh | sed s/AOL_ADDRESS=//]
++
+ set httpsport 8443
+ # If setting port below 1024 with AOLServer 4, read comments in file:
+ # /var/lib/aolserver/service0/packages/etc/daemontools/run
+@@ -18,16 +20,16 @@
+ # The hostname and address should be set to actual values.
+ # setting the address to 0.0.0.0 means aolserver listens on all interfaces
+ set hostname localhost
+-set address 127.0.0.1
+
+ # Note: If port is privileged (usually < 1024), OpenACS must be
+ # 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 server "dotlrn"
++set servername "dotLRN"
+
+-set serverroot "/var/www/${server}"
++set serverroot "/usr/share/${server}"
++set pidfile /var/run/aolserver4/${server}.pid
+
+ #---------------------------------------------------------------------
+ # which database do you want? postgres or oracle
+@@ -38,9 +40,8 @@
+ if { $database eq "oracle" } {
+ set db_password "mysitepassword"
+ } else {
+- set db_host localhost
+- set db_port ""
+- set db_user $server
++## Debconf changes (DO NOT EDIT BYHAND) ##
++## End Debconf Changes ###################
+ }
+
+ #---------------------------------------------------------------------
+@@ -85,6 +86,7 @@
+ ns_param maxbackup 5
+ ns_param debug $debug
+ # ns_param mailhost localhost
++ ns_param pidfile ${pidfile}
+
+ # setting to Unicode by default
+ # see http://dqd.com/~mayoff/encoding-doc.html
+@@ -100,7 +102,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}]
+
+ #
+ # MIME types.
+@@ -569,7 +571,7 @@
+ ns_param driver postgres
+ ns_param datasource ${db_host}:${db_port}:${db_name}
+ ns_param user $db_user
+- ns_param password ""
++ ns_param password $db_password
+ }
+
+ ns_section ns/db/pool/pool2
+@@ -588,7 +590,7 @@
+ ns_param driver postgres
+ ns_param datasource ${db_host}:${db_port}:${db_name}
+ ns_param user $db_user
+- ns_param password ""
++ ns_param password $db_password
+ }
+
+ ns_section ns/db/pool/pool3
+@@ -607,7 +609,7 @@
+ ns_param driver postgres
+ ns_param datasource ${db_host}:${db_port}:${db_name}
+ ns_param user $db_user
+- ns_param password ""
++ ns_param password $db_password
+ }
+
+ ns_section ns/server/${server}/db
+@@ -621,12 +623,14 @@
+ ns_section ns/server/${server}/modules
+ ns_param nssock ${bindir}/nssock.so
+ ns_param nslog ${bindir}/nslog.so
+- ns_param nssha1 ${bindir}/nssha1.so
++ ns_param nssha1 ${bindir}/nssha1.so
++
+ # since aolserver version 4.5.1 built-in ns_cache, so we dont
+ # need to load the nscache module.
+ if {[ns_info version] < 4.5 || [ns_info patchlevel] eq "4.5.0"} {
+ ns_param nscache ${bindir}/nscache.so
+ }
++
+ # openacs versions earlier than 5.x requires nsxml
+ # ns_param nsxml ${bindir}/nsxml.so
+
+@@ -662,7 +666,7 @@
+ }
+
+ # nsthread library which should become standard in 5.3
+- ns_param libthread [lindex [glob ${homedir}/lib/thread*/libthread*[info sharedlibextension]] 0]
++ ns_param libthread [lindex [glob /usr/lib/tcltk/thread*/libthread*-aolserver[info sharedlibextension]] 0]
+
+ if {[ns_info version] >= 4.5} {
+ ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
+@@ -673,3 +677,4 @@
+ if {[ns_info version] >= 4.5} {
+ ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
+ }
++
+--- a/etc/daemontools/run
++++ b/etc/daemontools/run
+@@ -9,7 +9,12 @@
+ # see http://openacs.org/forums/message-view?message_id=176100
+ sleep 4
+
+-exec /usr/lib/aolserver4/bin/nsd -it /var/www/service0/etc/config.tcl -u service0 -g web
++. /etc/aolserver4/conf.d/dotlrn.sh
++
++DAEMON="/usr/lib/aolserver4/bin/nsd"
++CONF="/etc/dotlrn/config.tcl"
++
++exec $DAEMON -it $CONF -u $AOL_USER -g $AOL_GROUP -b $AOL_ADDRESS:$AOL_PORT
+
+ # For AOLserver 4 using privileged ports (usually < 1024), add the flag
+ # -b youraddress:yourport to the nsd command
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/install.dpatch dotlrn-2.5.0+dfsg/debian/patches/install.dpatch
--- dotlrn-2.5.0+dfsg/debian/patches/install.dpatch 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/patches/install.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install.dpatch by <geox@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad trunk~/packages/acs-bootstrap-installer/installer/install.tcl trunk/packages/acs-bootstrap-installer/installer/install.tcl
---- trunk~/packages/acs-bootstrap-installer/installer/install.tcl 2009-01-06 03:07:21.000000000 +0100
-+++ trunk/packages/acs-bootstrap-installer/installer/install.tcl 2009-11-21 01:16:15.000000000 +0100
-@@ -169,9 +169,9 @@
-
- ns_write "<b>Installation finished</b>
-
--<p> The server has been shut down. Normally, it should come back up by itself after a minute or so. </p>
-+<p> The server has been shut down. To restart it, please use the following command (as root):</p>
-
--<p> If not, please check your server error log, or contact your system administrator. </p>"
-+<p># /etc/init.d/aolserver4 restart</p>"
-
- if { $post_installation_message ne "" } {
- ns_write $post_installation_message
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/install.patch dotlrn-2.5.0+dfsg/debian/patches/install.patch
--- dotlrn-2.5.0+dfsg/debian/patches/install.patch 1970-01-01 01:00:00.000000000 +0100
+++ dotlrn-2.5.0+dfsg/debian/patches/install.patch 2012-07-09 15:22:51.000000000 +0200
@@ -0,0 +1,16 @@
+Author: <geox@localhost>
+Description: No description.
+--- a/packages/acs-bootstrap-installer/installer/install.tcl
++++ b/packages/acs-bootstrap-installer/installer/install.tcl
+@@ -169,9 +169,9 @@
+
+ ns_write "<b>Installation finished</b>
+
+-<p> The server has been shut down. Normally, it should come back up by itself after a minute or so. </p>
++<p> The server has been shut down. To restart it, please use the following command (as root):</p>
+
+-<p> If not, please check your server error log, or contact your system administrator. </p>"
++<p># /etc/init.d/aolserver4 restart</p>"
+
+ if { $post_installation_message ne "" } {
+ ns_write $post_installation_message
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.dpatch dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.dpatch
--- dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.dpatch 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,128 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## interpreters-bashisms.dpatch by Hector Romojaro <hromojaro@dia.uned.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/functions.sh trunk/etc/install/functions.sh
---- trunk~/etc/install/functions.sh 2004-04-25 11:32:27.000000000 +0200
-+++ trunk/etc/install/functions.sh 2010-05-19 13:03:50.000000000 +0200
-@@ -23,10 +23,10 @@
-
- interactive=$1
-
-- if [ "$interactive" == "yes" ]; then
-+ if [ "$interactive" = "yes" ]; then
- echo "Continue? (y/n)"
- read continue
-- if [ "$continue" == "n" ]; then
-+ if [ "$continue" = "n" ]; then
- echo "$0: exiting on users request"
- exit
- fi
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/install-and-alert.sh trunk/etc/install/install-and-alert.sh
---- trunk~/etc/install/install-and-alert.sh 2003-11-04 15:39:04.000000000 +0100
-+++ trunk/etc/install/install-and-alert.sh 2010-05-19 13:14:50.000000000 +0200
-@@ -12,11 +12,11 @@
- script_path=$(dirname $(which $0))
- cd $script_path
-
--source ./functions.sh
-+. ./functions.sh
-
- # Get a proper environment set up
- if [ -f ~/.bashrc ]; then
-- source ~/.bashrc
-+ . ~/.bashrc
- fi
-
- # Look for two-part command line arguments
-@@ -28,20 +28,20 @@
- server_overridden="no"
- for arg in "$@"
- do
-- if [ $config_val_next == "1" ]; then
-+ if [ $config_val_next = "1" ]; then
- export config_file=$arg
- config_val_next=0
- fi
-- if [ $server_next == "1" ]; then
-+ if [ $server_next = "1" ]; then
- # Overrides server setting in config file
- export server=$arg
- server_next=0
- server_overridden="yes"
- fi
-- if [ $arg == "--config-file" ]; then
-+ if [ $arg = "--config-file" ]; then
- config_val_next=1
- fi
-- if [ $arg == "--server" ]; then
-+ if [ $arg = "--server" ]; then
- server_next=1
- fi
- done
-@@ -62,7 +62,7 @@
- mkdir -p $output_dir
- fi
- installation_output_file="${output_dir}/installation-output"
--./install.sh $@ &> $installation_output_file
-+./install.sh $@ >$installation_output_file 2>&1
-
- # Get lines with alert keywords or lines with failed TclWebtest tests
- error_lines=$(egrep -i "(FAILED: .+\.test)|($alert_keyword)" $installation_output_file)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/warn-if-installation-errors.sh trunk/etc/install/warn-if-installation-errors.sh
---- trunk~/etc/install/warn-if-installation-errors.sh 2003-11-04 15:39:04.000000000 +0100
-+++ trunk/etc/install/warn-if-installation-errors.sh 2010-05-19 12:59:59.000000000 +0200
-@@ -9,7 +9,7 @@
-
- file_name=$1
-
--source ./functions.sh
-+. ./functions.sh
-
- alert_keyword=`get_config_param alert_keyword`
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/check-catalog.sh trunk/packages/acs-lang/bin/check-catalog.sh
---- trunk~/packages/acs-lang/bin/check-catalog.sh 2003-10-30 14:10:53.000000000 +0100
-+++ trunk/packages/acs-lang/bin/check-catalog.sh 2010-05-19 12:57:04.000000000 +0200
-@@ -34,7 +34,7 @@
- export script_path=$(dirname $(which $0))
-
- ### Functions start
--source ${script_path}/functions.sh
-+. ${script_path}/functions.sh
-
- get_date_time_key() {
- message_key=$1
-@@ -72,7 +72,7 @@
- do
- catalog_package_version=$(cat $catalog_file | ${script_path}/mygrep '<message_catalog .*package_version="([^"]+)"')
-
-- if [ ! "$info_file_package_version" == "$catalog_package_version" ]; then
-+ if [ ! "$info_file_package_version" = "$catalog_package_version" ]; then
- echo "$0: $package_key - Warning: package version $catalog_package_version in file $catalog_file does not equal version $info_file_package_version in info file."
- fi
- done
-@@ -152,7 +152,7 @@
- find_dirs="$packages_dir ${packages_dir}../www"
-
- # Process arguments
--if [ "$#" == "0" ]; then
-+if [ "$#" = "0" ]; then
- # No package provided - check all packages
- for catalog_dir in $(find $package_dir -iname catalog -type d)
- do
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/list-keys.sh trunk/packages/acs-lang/bin/list-keys.sh
---- trunk~/packages/acs-lang/bin/list-keys.sh 2003-10-31 13:58:29.000000000 +0100
-+++ trunk/packages/acs-lang/bin/list-keys.sh 2010-05-19 12:58:17.000000000 +0200
-@@ -5,7 +5,7 @@
- # @author Peter Marklund
-
- export script_path=$(dirname $(which $0))
--source ${script_path}/functions.sh
-+. ${script_path}/functions.sh
-
- for en_us_file in $(find_en_us_files)
- do
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.patch dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.patch
--- dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.patch 1970-01-01 01:00:00.000000000 +0100
+++ dotlrn-2.5.0+dfsg/debian/patches/interpreters-bashisms.patch 2012-07-09 15:22:51.000000000 +0200
@@ -0,0 +1,118 @@
+Author: Hector Romojaro <hromojaro@dia.uned.es>
+Description: No description.
+--- a/etc/install/functions.sh
++++ b/etc/install/functions.sh
+@@ -24,10 +24,10 @@
+
+ interactive=$1
+
+- if [ "$interactive" == "yes" ]; then
++ if [ "$interactive" = "yes" ]; then
+ echo "Continue? (y/n)"
+ read continue
+- if [ "$continue" == "n" ]; then
++ if [ "$continue" = "n" ]; then
+ echo "$0: exiting on users request"
+ exit
+ fi
+--- a/etc/install/install-and-alert.sh
++++ b/etc/install/install-and-alert.sh
+@@ -12,11 +12,11 @@
+ script_path=$(dirname $(which $0))
+ cd $script_path
+
+-source ./functions.sh
++. ./functions.sh
+
+ # Get a proper environment set up
+ if [ -f ~/.bashrc ]; then
+- source ~/.bashrc
++ . ~/.bashrc
+ fi
+
+ # Look for two-part command line arguments
+@@ -28,20 +28,20 @@
+ server_overridden="no"
+ for arg in "$@"
+ do
+- if [ $config_val_next == "1" ]; then
++ if [ $config_val_next = "1" ]; then
+ export config_file=$arg
+ config_val_next=0
+ fi
+- if [ $server_next == "1" ]; then
++ if [ $server_next = "1" ]; then
+ # Overrides server setting in config file
+ export server=$arg
+ server_next=0
+ server_overridden="yes"
+ fi
+- if [ $arg == "--config-file" ]; then
++ if [ $arg = "--config-file" ]; then
+ config_val_next=1
+ fi
+- if [ $arg == "--server" ]; then
++ if [ $arg = "--server" ]; then
+ server_next=1
+ fi
+ done
+@@ -62,7 +62,7 @@
+ mkdir -p $output_dir
+ fi
+ installation_output_file="${output_dir}/installation-output"
+-./install.sh $@ &> $installation_output_file
++./install.sh $@ >$installation_output_file 2>&1
+
+ # Get lines with alert keywords or lines with failed TclWebtest tests
+ error_lines=$(egrep -i "(FAILED: .+\.test)|($alert_keyword)" $installation_output_file)
+--- a/etc/install/warn-if-installation-errors.sh
++++ b/etc/install/warn-if-installation-errors.sh
+@@ -9,7 +9,7 @@
+
+ file_name=$1
+
+-source ./functions.sh
++. ./functions.sh
+
+ alert_keyword=`get_config_param alert_keyword`
+
+--- a/packages/acs-lang/bin/check-catalog.sh
++++ b/packages/acs-lang/bin/check-catalog.sh
+@@ -34,7 +34,7 @@
+ export script_path=$(dirname $(which $0))
+
+ ### Functions start
+-source ${script_path}/functions.sh
++. ${script_path}/functions.sh
+
+ get_date_time_key() {
+ message_key=$1
+@@ -72,7 +72,7 @@
+ do
+ catalog_package_version=$(cat $catalog_file | ${script_path}/mygrep '<message_catalog .*package_version="([^"]+)"')
+
+- if [ ! "$info_file_package_version" == "$catalog_package_version" ]; then
++ if [ ! "$info_file_package_version" = "$catalog_package_version" ]; then
+ echo "$0: $package_key - Warning: package version $catalog_package_version in file $catalog_file does not equal version $info_file_package_version in info file."
+ fi
+ done
+@@ -152,7 +152,7 @@
+ find_dirs="$packages_dir ${packages_dir}../www"
+
+ # Process arguments
+-if [ "$#" == "0" ]; then
++if [ "$#" = "0" ]; then
+ # No package provided - check all packages
+ for catalog_dir in $(find $package_dir -iname catalog -type d)
+ do
+--- a/packages/acs-lang/bin/list-keys.sh
++++ b/packages/acs-lang/bin/list-keys.sh
+@@ -5,7 +5,7 @@
+ # @author Peter Marklund
+
+ export script_path=$(dirname $(which $0))
+-source ${script_path}/functions.sh
++. ${script_path}/functions.sh
+
+ for en_us_file in $(find_en_us_files)
+ do
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.dpatch dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.dpatch
--- dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.dpatch 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,118 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## interpreters-path.dpatch by <geox@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes some paths for interpreters on scripts.
-
-@DPATCH@
-diff -urNad dotlrn-2.4.1~/bin/ad-context-server.pl dotlrn-2.4.1/bin/ad-context-server.pl
---- dotlrn-2.4.1~/bin/ad-context-server.pl 2001-03-13 23:59:26.000000000 +0100
-+++ dotlrn-2.4.1/bin/ad-context-server.pl 2008-08-04 13:07:55.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- ##########################################################
- # ArsDigita Context Server
-diff -urNad dotlrn-2.4.1~/bin/create-sql-drop-file.pl dotlrn-2.4.1/bin/create-sql-drop-file.pl
---- dotlrn-2.4.1~/bin/create-sql-drop-file.pl 2001-03-13 23:59:26.000000000 +0100
-+++ dotlrn-2.4.1/bin/create-sql-drop-file.pl 2008-08-04 13:07:36.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.4.1~/bin/data-dictionary-diff.pl dotlrn-2.4.1/bin/data-dictionary-diff.pl
---- dotlrn-2.4.1~/bin/data-dictionary-diff.pl 2001-03-13 23:59:26.000000000 +0100
-+++ dotlrn-2.4.1/bin/data-dictionary-diff.pl 2008-08-04 13:07:09.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.4.1~/bin/encode64.pl dotlrn-2.4.1/bin/encode64.pl
---- dotlrn-2.4.1~/bin/encode64.pl 2001-03-13 23:59:26.000000000 +0100
-+++ dotlrn-2.4.1/bin/encode64.pl 2008-08-04 13:06:53.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Encode a file from stdin as base64
- #
-diff -urNad dotlrn-2.4.1~/bin/plsql-diff.pl dotlrn-2.4.1/bin/plsql-diff.pl
---- dotlrn-2.4.1~/bin/plsql-diff.pl 2001-03-13 23:59:26.000000000 +0100
-+++ dotlrn-2.4.1/bin/plsql-diff.pl 2008-08-04 13:06:40.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.4.1~/bin/triggers-diff.pl dotlrn-2.4.1/bin/triggers-diff.pl
---- dotlrn-2.4.1~/bin/triggers-diff.pl 2001-03-13 23:59:26.000000000 +0100
-+++ dotlrn-2.4.1/bin/triggers-diff.pl 2008-08-04 13:06:16.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.4.1~/etc/deploy.sh dotlrn-2.4.1/etc/deploy.sh
---- dotlrn-2.4.1~/etc/deploy.sh 2004-03-03 14:18:35.000000000 +0100
-+++ dotlrn-2.4.1/etc/deploy.sh 2008-08-04 13:08:12.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.4.1~/etc/install/functions.sh dotlrn-2.4.1/etc/install/functions.sh
---- dotlrn-2.4.1~/etc/install/functions.sh 2004-04-25 11:32:27.000000000 +0200
-+++ dotlrn-2.4.1/etc/install/functions.sh 2008-08-04 13:04:59.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.4.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt dotlrn-2.4.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt
---- dotlrn-2.4.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt 2003-06-24 05:19:17.000000000 +0200
-+++ dotlrn-2.4.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt 2008-08-04 13:05:58.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/sh
-+#!/bin/sh
- # Restarts an AOLserver (daemontools version).
- # Takes as its only argument the name of the server to kill.
- # joela 06/23/2003
-@@ -19,4 +19,4 @@
- # meanwhile, this works:
-
- svc -d $1
--svc -u $1
-\ No newline at end of file
-+svc -u $1
-diff -urNad dotlrn-2.4.1~/packages/acs-lang/bin/functions.sh dotlrn-2.4.1/packages/acs-lang/bin/functions.sh
---- dotlrn-2.4.1~/packages/acs-lang/bin/functions.sh 2003-10-31 13:58:29.000000000 +0100
-+++ dotlrn-2.4.1/packages/acs-lang/bin/functions.sh 2008-08-04 13:04:19.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # Functions re-used by scripts in acs-lang/bin
- #
- # @author Peter Marklund
-diff -urNad dotlrn-2.4.1~/packages/theme-selva/www/doc/howto/images.pl dotlrn-2.4.1/packages/theme-selva/www/doc/howto/images.pl
---- dotlrn-2.4.1~/packages/theme-selva/www/doc/howto/images.pl 2005-07-26 16:28:31.000000000 +0200
-+++ dotlrn-2.4.1/packages/theme-selva/www/doc/howto/images.pl 2008-08-04 13:03:31.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.4.1~/packages/theme-selva/www/doc/howto/labels.pl dotlrn-2.4.1/packages/theme-selva/www/doc/howto/labels.pl
---- dotlrn-2.4.1~/packages/theme-selva/www/doc/howto/labels.pl 2005-07-26 16:28:30.000000000 +0200
-+++ dotlrn-2.4.1/packages/theme-selva/www/doc/howto/labels.pl 2008-08-04 13:05:35.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/perl
- # LaTeX2HTML 2002-2-1 (1.70)
- # Associate labels original text with physical files.
-
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.patch dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.patch
--- dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.patch 1970-01-01 01:00:00.000000000 +0100
+++ dotlrn-2.5.0+dfsg/debian/patches/interpreters-path.patch 2012-07-09 15:22:51.000000000 +0200
@@ -0,0 +1,101 @@
+Author: <geox@localhost>
+Description: Fixes some paths for interpreters on scripts.
+--- a/bin/ad-context-server.pl
++++ b/bin/ad-context-server.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+
+ ##########################################################
+ # ArsDigita Context Server
+--- a/bin/create-sql-drop-file.pl
++++ b/bin/create-sql-drop-file.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+
+ # @author: Jim Guggemoos created it
+ # @author: Christian Brechbuehler some maintenance
+--- a/bin/data-dictionary-diff.pl
++++ b/bin/data-dictionary-diff.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+
+ # by Jin Choi <jsc@arsdigita.com>, 2000-03-20
+
+--- a/bin/encode64.pl
++++ b/bin/encode64.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # Encode a file from stdin as base64
+ #
+--- a/bin/plsql-diff.pl
++++ b/bin/plsql-diff.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+
+ # by Jin Choi <jsc@arsdigita.com>, 2000-03-21
+
+--- a/bin/triggers-diff.pl
++++ b/bin/triggers-diff.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+
+ # by Jin Choi <jsc@arsdigita.com>, 2000-03-26
+
+--- a/etc/deploy.sh
++++ b/etc/deploy.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bin/tclsh
++#!/usr/bin/tclsh
+ # process command line arguments
+ foreach arg $argv {
+ switch -glob -- $arg {
+--- a/etc/install/functions.sh
++++ b/etc/install/functions.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # Access config parameters in the TCL file through this function
+
+ get_config_param () {
+--- a/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt
++++ b/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt
+@@ -1,4 +1,4 @@
+-#!/usr/sh
++#!/bin/sh
+ # Restarts an AOLserver (daemontools version).
+ # Takes as its only argument the name of the server to kill.
+ # joela 06/23/2003
+@@ -19,4 +19,4 @@
+ # meanwhile, this works:
+
+ svc -d $1
+-svc -u $1
+\ No newline at end of file
++svc -u $1
+--- a/packages/acs-lang/bin/functions.sh
++++ b/packages/acs-lang/bin/functions.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # Functions re-used by scripts in acs-lang/bin
+ #
+ # @author Peter Marklund
+--- a/packages/theme-selva/www/doc/howto/images.pl
++++ b/packages/theme-selva/www/doc/howto/images.pl
+@@ -1,3 +1,4 @@
++#!/usr/bin/perl
+ # LaTeX2HTML 2002-2-1 (1.70)
+ # Associate images original text with physical files.
+
+--- a/packages/theme-selva/www/doc/howto/labels.pl
++++ b/packages/theme-selva/www/doc/howto/labels.pl
+@@ -1,3 +1,4 @@
++#!/usr/bin/perl
+ # LaTeX2HTML 2002-2-1 (1.70)
+ # Associate labels original text with physical files.
+
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/securityfix.dpatch dotlrn-2.5.0+dfsg/debian/patches/securityfix.dpatch
--- dotlrn-2.5.0+dfsg/debian/patches/securityfix.dpatch 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/patches/securityfix.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## securityfix.dpatch by Hector Romojaro <hromojaro@dia.uned.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-api-browser/www/content-page-view.tcl trunk/packages/acs-api-browser/www/content-page-view.tcl
---- trunk~/packages/acs-api-browser/www/content-page-view.tcl 2003-05-17 11:38:28.000000000 +0200
-+++ trunk/packages/acs-api-browser/www/content-page-view.tcl 2010-11-25 13:35:05.000000000 +0100
-@@ -50,6 +50,11 @@
-
- set filename "[acs_root_dir]/$path"
-
-+if {[regsub -all {[.][.]/} $filename "" shortened_filename]} {
-+ ns_log notice "INTRUDER ALERT:\n\nsomesone tried to snarf '$filename'!\n file exists: [file exists $filename]\n user_id: [ad_conn user_id]\n peer: [ad_conn peeraddr]\n"
-+ set filename shortened_filename
-+}
-+
- if {![file exists $filename] || [file isdirectory $filename]} {
- set file_contents "file '$filename' not found"
- } else {
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/securityfix.patch dotlrn-2.5.0+dfsg/debian/patches/securityfix.patch
--- dotlrn-2.5.0+dfsg/debian/patches/securityfix.patch 1970-01-01 01:00:00.000000000 +0100
+++ dotlrn-2.5.0+dfsg/debian/patches/securityfix.patch 2012-07-09 15:22:51.000000000 +0200
@@ -0,0 +1,16 @@
+Author: Hector Romojaro <hromojaro@dia.uned.es>
+Description: No description.
+--- a/packages/acs-api-browser/www/content-page-view.tcl
++++ b/packages/acs-api-browser/www/content-page-view.tcl
+@@ -50,6 +50,11 @@
+
+ set filename "[acs_root_dir]/$path"
+
++if {[regsub -all {[.][.]/} $filename "" shortened_filename]} {
++ ns_log notice "INTRUDER ALERT:\n\nsomesone tried to snarf '$filename'!\n file exists: [file exists $filename]\n user_id: [ad_conn user_id]\n peer: [ad_conn peeraddr]\n"
++ set filename shortened_filename
++}
++
+ if {![file exists $filename] || [file isdirectory $filename]} {
+ set file_contents "file '$filename' not found"
+ } else {
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/series dotlrn-2.5.0+dfsg/debian/patches/series
--- dotlrn-2.5.0+dfsg/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ dotlrn-2.5.0+dfsg/debian/patches/series 2012-07-09 15:22:51.000000000 +0200
@@ -0,0 +1,6 @@
+config.patch
+interpreters-path.patch
+interpreters-bashisms.patch
+install.patch
+xinha-iconset.patch
+securityfix.patch
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.dpatch dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.dpatch
--- dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.dpatch 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## xinha-iconset.dpatch by Hector Romojaro <hromojaro@dia.uned.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad trunk~/www/blank-master.adp trunk/www/blank-master.adp
---- trunk~/www/blank-master.adp 2008-06-07 22:29:01.000000000 +0200
-+++ trunk/www/blank-master.adp 2009-11-21 00:15:36.000000000 +0100
-@@ -18,6 +18,7 @@
- </comment>
- <if @::acs_blank_master__htmlareas@ defined and @::xinha_dir@ defined and @::xinha_lang@ defined>
- <script type="text/javascript">
-+_editor_icons = "Classic";
- _editor_url = "@::xinha_dir@";
- _editor_lang = "@::xinha_lang@";
- </script>
diff -Nru dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.patch dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.patch
--- dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.patch 1970-01-01 01:00:00.000000000 +0100
+++ dotlrn-2.5.0+dfsg/debian/patches/xinha-iconset.patch 2012-07-09 15:22:51.000000000 +0200
@@ -0,0 +1,12 @@
+Author: Hector Romojaro <hromojaro@dia.uned.es>
+Description: No description.
+--- a/www/blank-master.adp
++++ b/www/blank-master.adp
+@@ -18,6 +18,7 @@
+ </comment>
+ <if @::acs_blank_master__htmlareas@ defined and @::xinha_dir@ defined and @::xinha_lang@ defined>
+ <script type="text/javascript">
++_editor_icons = "Classic";
+ _editor_url = "@::xinha_dir@";
+ _editor_lang = "@::xinha_lang@";
+ </script>
diff -Nru dotlrn-2.5.0+dfsg/debian/postrm dotlrn-2.5.0+dfsg/debian/postrm
--- dotlrn-2.5.0+dfsg/debian/postrm 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/postrm 2012-07-09 15:22:51.000000000 +0200
@@ -17,9 +17,15 @@
db_version 2.0
rm -rf /usr/share/dotlrn
- ucf --purge /etc/dotlrn/config.tcl
- ucf --purge /etc/dotlrn/dotlrn.sh
- rm -rf /etc/dotlrn
+ rm -rf /etc/dotlrn
+ if which ucf >/dev/null; then
+ ucf --purge /etc/dotlrn/config.tcl
+ ucf --purge /etc/dotlrn/dotlrn.sh
+ fi
+ if which ucfr >/dev/null; then
+ ucfr --purge dotlrn /etc/dotlrn/config.tcl
+ ucfr --purge dotlrn /etc/dotlrn/dotlrn.sh
+ fi
rm -rf /var/lib/dotlrn
rm -f /etc/aolserver4/conf.d/dotlrn.tcl /etc/aolserver4/conf.d/dotlrn.sh
rm -rf /var/log/aolserver4/dotlrn
diff -Nru dotlrn-2.5.0+dfsg/debian/README.source dotlrn-2.5.0+dfsg/debian/README.source
--- dotlrn-2.5.0+dfsg/debian/README.source 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/README.source 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get detailed instructions on how to apply the series of patches
-and modify them, please read /usr/share/doc/dpatch/README.source.gz
-
- -- Hector Romojaro <hromojaro@dia.uned.es> Fri, 16 Oct 2009 13:11:00 +0200
diff -Nru dotlrn-2.5.0+dfsg/debian/repackage-upstream-src dotlrn-2.5.0+dfsg/debian/repackage-upstream-src
--- dotlrn-2.5.0+dfsg/debian/repackage-upstream-src 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/repackage-upstream-src 2012-07-09 15:22:51.000000000 +0200
@@ -6,9 +6,10 @@
set -e
PACKAGE=$(dpkg-parsechangelog | sed -rn '/^Source:/ {s/^Source: //; p}')
-VERSION=$(echo $2 | sed 's/+dfsg//g')
+VERSION=$(echo $2)
FILE=$3
DIR="$PACKAGE-$VERSION"
+DFSG_FILE=$(echo "$FILE" | sed 's/\.orig\.tar\.gz$/+dfsg\.orig\.tar\.gz/')
# Unpack
tar xzf $FILE \
@@ -18,6 +19,7 @@
# Repack
tar cz -f $FILE $DIR
+mv $FILE $DFSG_FILE
# Clean
rm -rf $DIR
diff -Nru dotlrn-2.5.0+dfsg/debian/rules dotlrn-2.5.0+dfsg/debian/rules
--- dotlrn-2.5.0+dfsg/debian/rules 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/rules 2012-07-09 15:22:51.000000000 +0200
@@ -1,52 +1,21 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# GNU copyright 1997 to 1999 by Joey Hess.
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
-include /usr/share/dpatch/dpatch.make
+%:
+ dh $@
get-orig-source:
if [ -d "../../tarballs" ]; then \
- uscan --download-current-version --force-download --rename --destdir ../../tarballs/ ; \
+ uscan --download-current-version --force-download --rename --destdir ../../tarballs/ ; \
else \
- uscan --download-current-version --force-download --rename ; \
- fi;
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-
-clean: clean1 unpatch
-clean1:
- dh_testdir
- dh_testroot
-
- dh_clean
-
-install: patch-stamp
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
-# Build architecture-dependent files here.
-binary-arch: install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_install
- dh_lintian
+ uscan --download-current-version --force-download --rename ; \
+ fi;
+override_dh_installdebconf:
cp debian/dotlrn.sh debian/dotlrn/etc/dotlrn/
-
+
# Deleting extra licenses
rm debian/dotlrn/usr/share/dotlrn/license.txt
rm debian/dotlrn/usr/share/dotlrn/packages/acs-templating/www/resources/htmlarea/license.txt
@@ -59,7 +28,7 @@
rm debian/dotlrn/usr/share/dotlrn/packages/theme-selva/www/resources/Selva/default/images/.DS_Store
rm debian/dotlrn/usr/share/dotlrn/packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/img/Thumbs.db
- # Setting up correct permissions
+ # Fixing permissions
find debian/dotlrn/usr -type f -exec chmod 0644 {} \;
find debian/dotlrn/usr -type d -exec chmod 0755 {} \;
find debian/dotlrn/usr -type f -name *.pl -exec chmod 0755 {} \; # Perl scripts +x
@@ -77,15 +46,11 @@
debian/dotlrn/usr/share/dotlrn/packages/acs-templating/www/resources/htmlarea/plugins/SpellChecker/spell-check-logic.cgi \
debian/dotlrn/usr/share/dotlrn/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-logic.cgi
+ # Continue as normal...
dh_installdebconf
- dh_link
- dh_compress
+
+override_dh_fixperms:
dh_fixperms
- chmod o-rwx debian/dotlrn/etc/dotlrn/config.tcl # config.tcl stores passwords!!
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ # config.tcl stores passwords!
+ chmod o-rwx debian/dotlrn/etc/dotlrn/config.tcl
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1
diff -Nru dotlrn-2.5.0+dfsg/debian/source/format dotlrn-2.5.0+dfsg/debian/source/format
--- dotlrn-2.5.0+dfsg/debian/source/format 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/source/format 2012-07-09 15:22:51.000000000 +0200
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru dotlrn-2.5.0+dfsg/debian/watch dotlrn-2.5.0+dfsg/debian/watch
--- dotlrn-2.5.0+dfsg/debian/watch 2012-07-09 23:12:52.000000000 +0200
+++ dotlrn-2.5.0+dfsg/debian/watch 2012-07-09 15:22:51.000000000 +0200
@@ -1,5 +1,5 @@
version=3
-opts="versionmangle=s/\.\?revision_id\=(.*)/+dfsg/" \
+opts="uversionmangle=s/\.\?revision_id\=(.*)//,dversionmangle=s/\+dfsg//" \
http://openacs.org/projects/dotlrn/download download/dotlrn-(.+)\.tgz(.*) debian debian/repackage-upstream-src
--- End Message ---