From b6b7327f72dbf397d8437ec710aa5b6642c3560b Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 21 Dec 2010 18:10:26 +0100 Subject: [PATCH] Fixed small issues related with PostgreSQL Java library link. FEA: ItEr66S03CommunityMaterialItEr65S04 --- debian/navalplan.prerm | 4 ++++ debian/rules | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/navalplan.prerm b/debian/navalplan.prerm index 52318503b..a40312566 100644 --- a/debian/navalplan.prerm +++ b/debian/navalplan.prerm @@ -8,4 +8,8 @@ if [ -r /usr/share/dbconfig-common/dpkg/postinst.pgsql ] ; then dbc_go navalplan $@ fi +if [ -L /usr/share/tomcat6/lib/postgresql-jdbc3.jar ] ; then + rm /usr/share/tomcat6/lib/postgresql-jdbc3.jar +fi + #DEBHELPER# diff --git a/debian/rules b/debian/rules index ad2927823..df21834e1 100755 --- a/debian/rules +++ b/debian/rules @@ -80,7 +80,7 @@ install: $(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,ln -sf /usr/share/java/postgresql-jdbc3.jar $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) $(call CMD,dh_install) binary-indep: build install