Index: debian_installer/lams2/2.3.0to2.3.1.sql =================================================================== diff -u --- debian_installer/lams2/2.3.0to2.3.1.sql (revision 0) +++ debian_installer/lams2/2.3.0to2.3.1.sql (revision 1452e34e34a4efaecfd1786cf721b0282b095880) @@ -0,0 +1,4 @@ +-- Version strings +update lams_configuration set config_value='2.3.1' where config_key='Version'; +update lams_configuration set config_value='2.3.1.200906190000' where config_key='AuthoringClientVersion' or config_key='MonitorClientVersion' or config_key="LearnerClientVersion" or config_key='ServerVersionNumber'; +update lams_configuration set config_value='2009-06-19' where config_key='DictionaryDateCreated'; \ No newline at end of file Index: debian_installer/lams2/configure2.3.0.sql =================================================================== diff -u --- debian_installer/lams2/configure2.3.0.sql (revision 0) +++ debian_installer/lams2/configure2.3.0.sql (revision 1452e34e34a4efaecfd1786cf721b0282b095880) @@ -0,0 +1,2 @@ +-- disable videorecorder tool +update lams_learning_library set valid_flag=0 where title='VideoRecorder'; Index: debian_installer/lams2/debian/changelog =================================================================== diff -u -rbae6cea7eb46a03b052335fead84b0a9723ec7ff -r1452e34e34a4efaecfd1786cf721b0282b095880 --- debian_installer/lams2/debian/changelog (.../changelog) (revision bae6cea7eb46a03b052335fead84b0a9723ec7ff) +++ debian_installer/lams2/debian/changelog (.../changelog) (revision 1452e34e34a4efaecfd1786cf721b0282b095880) @@ -1,3 +1,9 @@ +lams2 (2.3.1-1) unstable; urgency=low + + * update to 2.3.1 + + -- LAMS Development Team Fri, 10 Jul 2009 14:00:00 +1000 + lams2 (2.3.0-1) unstable; urgency=low * update to 2.3 Index: debian_installer/lams2/debian/lams2.install =================================================================== diff -u -rce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8 -r1452e34e34a4efaecfd1786cf721b0282b095880 --- debian_installer/lams2/debian/lams2.install (.../lams2.install) (revision ce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8) +++ debian_installer/lams2/debian/lams2.install (.../lams2.install) (revision 1452e34e34a4efaecfd1786cf721b0282b095880) @@ -28,8 +28,10 @@ lams_tool_spreadsheet /usr/share/lams2/ lams_tool_wiki /usr/share/lams2/ 2.2.0to2.3.0.sql /usr/share/lams2/ +configure2.3.0.sql /usr/share/lams2/ lams_tool_assessment /usr/share/lams2/ lams_tool_images /usr/share/lams2/ lams_tool_mindmap /usr/share/lams2/ lams_tool_pixlr /usr/share/lams2/ lams_tool_videorecorder /usr/share/lams2/ +2.3.0to2.3.1.sql /usr/share/lams2/ Index: debian_installer/lams2/debian/postinst =================================================================== diff -u -r2bc97d64646dd9f06188885a2aea986bc74d123f -r1452e34e34a4efaecfd1786cf721b0282b095880 --- debian_installer/lams2/debian/postinst (.../postinst) (revision 2bc97d64646dd9f06188885a2aea986bc74d123f) +++ debian_installer/lams2/debian/postinst (.../postinst) (revision 1452e34e34a4efaecfd1786cf721b0282b095880) @@ -17,6 +17,24 @@ # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +update230to231 () { + # Update 2.3.0 database to 2.3.1 + if [ "$db_root_pass" != "" ] ; then + mysql $db_name < /usr/share/lams2/2.3.0to2.3.1.sql -u root -p$db_root_pass || true + else + mysql $db_name < /usr/share/lams2/2.3.0to2.3.1.sql -u root || true + fi +} + +configure230 () { + # Configure 2.3 tools; need to run after above tools have been deployed + if [ "$db_root_pass" != "" ] ; then + mysql $db_name < /usr/share/lams2/configure2.3.0.sql -u root -p$db_root_pass || true + else + mysql $db_name < /usr/share/lams2/configure2.3.0.sql -u root || true + fi +} + update220to230 () { # Update 2.2.0 database to 2.3 if [ "$db_root_pass" != "" ] ; then @@ -194,16 +212,25 @@ sed -i -e "s/port=\"8080\"/port=\"$server_port\"/" server.xml case "$2" in + 2.3.0*) + update; + update230to231; + ;; + 2.2.0*) update; update220to230; + configure230; + update230to231; ;; 2.1.1*) update; update211to220; configure220; update220to230; + configure230; + update230to231; ;; 2.1.0*) @@ -212,6 +239,8 @@ update211to220; configure220; update220to230; + configure230; + update230to231; ;; 2.1rc1*) @@ -221,6 +250,8 @@ update211to220; configure220; update220to230; + configure230; + update230to231; ;; *) @@ -323,6 +354,7 @@ cp -rp /usr/share/lams2/repository/ /var/lib/lams/ configure220; + configure230; # Add user and group adduser --system --group --no-create-home lams 2> /dev/null @@ -394,11 +426,13 @@ rm -rf /usr/share/lams2/lams_tool_wiki rm -rf /usr/share/lams2/repository rm -f /usr/share/lams2/2.2.0to2.3.0.sql + rm -f /usr/share/lams2/configure2.3.0.sql rm -rf /usr/share/lams2/lams_tool_assessment rm -rf /usr/share/lams2/lams_tool_images rm -rf /usr/share/lams2/lams_tool_mindmap rm -rf /usr/share/lams2/lams_tool_pixlr rm -rf /usr/share/lams2/lams_tool_videorecorder + rm -f /usr/share/lams2/2.3.0to2.3.1.sql # Delete default ROOT.war/index.html (replaced with redirecting index.jsp) rm -f /usr/share/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/index.html