diff --git a/debian/control b/debian/control index 301815da7..cb3be82e8 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,6 @@ Package: navalplan Architecture: all Section: web Depends: cutycapt, postgresql-client, xvfb, dbconfig-common, ucf, - tomcat6, openjdk-6-jre-headless | openjdk-6-jre, ${misc:Depends} + tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ${misc:Depends} Description: Web based planner thought for naval-related companies. diff --git a/debian/navalplan.install b/debian/navalplan.install index 86773ebea..4ed4fdf36 100644 --- a/debian/navalplan.install +++ b/debian/navalplan.install @@ -1,3 +1,4 @@ debian/tmp/var/lib/tomcat6/webapps/navalplanner-webapp.war debian/tmp/etc/tomcat6/policy.d/51navalplan.policy debian/tmp/usr/share/dbconfig-common/data/navalplan/install/pgsql +debian/tmp/usr/share/tomcat6/lib/postgresql-jdbc3.jar diff --git a/debian/navalplan.postinst b/debian/navalplan.postinst index 9b06a002f..a554cffda 100644 --- a/debian/navalplan.postinst +++ b/debian/navalplan.postinst @@ -69,12 +69,12 @@ then fi -#if [ -x /etc/init.d/tomcat5.5 ] ; then -# if [ -x "$(which invoke-rc.d 2> /dev/null)" ] ; then -# invoke-rc.d tomcat5.5 restart -# else -# /etc/init.d/tomcat5.5 restart -# fi -#fi +if [ -x /etc/init.d/tomcat6 ] ; then + if [ -x "$(which invoke-rc.d 2> /dev/null)" ] ; then + invoke-rc.d tomcat6 restart + else + /etc/init.d/tomcat6 restart + fi +fi #DEBHELPER# diff --git a/debian/rules b/debian/rules index 37fbaec9a..1673cdd70 100755 --- a/debian/rules +++ b/debian/rules @@ -76,6 +76,9 @@ install: $(call CMD,mkdir -p $(CURDIR)/debian/tmp/etc/tomcat6/policy.d) $(call CMD,cp $(CURDIR)/debian/51navalplan.policy \ $(CURDIR)/debian/tmp/etc/tomcat6/policy.d/) + # Link Java PostgreSQL library + $(call CMD,mkdir -p $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) + $(call CMD,ln -s /usr/share/java/postgresql-jdbc3.jar $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) $(call CMD,dh_install) binary-indep: build install