diff --git a/debian/changelog b/debian/changelog index 4f049d30d..026772ed7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ navalplan (1.1.0-1) maverick; urgency=low - * Removed unnecessary dependency with texlive-latex-recommended package. + * Removed unnecessary dependency with texlive-latex-recommended and pgf + packages. + * Fixed issue in package upgrade removing webapp directory to force + redeploy. * Released version 1.1.0. -- Manuel Rego Casasnovas TODO diff --git a/debian/control b/debian/control index 241305e6f..354ab7323 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Adrian Perez Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, - gettext (>= 0.17), pgf, openjdk-6-jdk + gettext (>= 0.17), openjdk-6-jdk Standards-Version: 3.8.4 Homepage: http://www.navalplan.org/en/ diff --git a/debian/navalplan.postinst b/debian/navalplan.postinst index 9ca90ac3d..4f3cd9f1b 100644 --- a/debian/navalplan.postinst +++ b/debian/navalplan.postinst @@ -71,9 +71,21 @@ fi if [ -x /etc/init.d/tomcat6 ] ; then if [ -x "$(which invoke-rc.d 2> /dev/null)" ] ; then - invoke-rc.d tomcat6 restart + invoke-rc.d tomcat6 stop else - /etc/init.d/tomcat6 restart + /etc/init.d/tomcat6 stop + fi +fi + +if [ -d /var/lib/tomcat6/webapps/navalplan/ ] ; then + rm -rf /var/lib/tomcat6/webapps/navalplan/ +fi + +if [ -x /etc/init.d/tomcat6 ] ; then + if [ -x "$(which invoke-rc.d 2> /dev/null)" ] ; then + invoke-rc.d tomcat6 start + else + /etc/init.d/tomcat6 start fi fi diff --git a/debian/rules b/debian/rules index 839a1d5fb..fdc594d90 100755 --- a/debian/rules +++ b/debian/rules @@ -79,7 +79,7 @@ install: $(call CMD,cp $(CURDIR)/scripts/database/upgrade_1.0.0.sql \ $(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/navalplan/upgrade/pgsql/1.0.0) # Copy SQL upgrade script for version 1.1.0 - $(call CMD,cp $(CURDIR)/scripts/database/upgrade_1.0.0.sql \ + $(call CMD,cp $(CURDIR)/scripts/database/upgrade_1.1.0.sql \ $(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/navalplan/upgrade/pgsql/1.1.0) # Install Policy file $(call CMD,mkdir -p $(CURDIR)/debian/tmp/etc/tomcat6/policy.d)