From 49db11f8558aeed2591ca36b9e3854cf17592f0c Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 1 Feb 2011 09:35:37 +0100 Subject: [PATCH] Some fix on Debian package folder. * Removed rules file for Squeeze as the change is also valid for Ubuntu. * Used just one control file using the minimum standards version. FEA: ItEr69S04BugFixing --- debian/control | 2 +- debian/control.lucid | 23 -------- debian/control.squeeze | 23 -------- debian/rules | 2 +- debian/rules.squeeze | 126 ----------------------------------------- 5 files changed, 2 insertions(+), 174 deletions(-) delete mode 100644 debian/control.lucid delete mode 100644 debian/control.squeeze delete mode 100755 debian/rules.squeeze diff --git a/debian/control b/debian/control index 9d0b9c852..0805769c5 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Adrian Perez Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, gettext (>= 0.17), texlive-latex-recommended, pgf, openjdk-6-jdk -Standards-Version: 3.9.1 +Standards-Version: 3.8.4 Homepage: http://www.navalplan.org/en/ Package: navalplan diff --git a/debian/control.lucid b/debian/control.lucid deleted file mode 100644 index 0805769c5..000000000 --- a/debian/control.lucid +++ /dev/null @@ -1,23 +0,0 @@ -Source: navalplan -Section: web -Priority: optional -Maintainer: Adrian Perez -Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, - gettext (>= 0.17), texlive-latex-recommended, pgf, openjdk-6-jdk -Standards-Version: 3.8.4 -Homepage: http://www.navalplan.org/en/ - -Package: navalplan -Architecture: any -Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, - tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ttf-freefont, - ${misc:Depends} -Description: Web application for project management. - NavalPlan is a planning tool for users based on some concepts: company and - multi-project overview, criteria assignments, tasks tagging, resources - management, resource allocation (specific and generic), company load control, - external integration, etc. - . - Although its name is clearly related to shipbuilding, NavalPlan is a fully - useful planning tool for any type of company whose workflow requires project - and order administration and scheduling. diff --git a/debian/control.squeeze b/debian/control.squeeze deleted file mode 100644 index 0805769c5..000000000 --- a/debian/control.squeeze +++ /dev/null @@ -1,23 +0,0 @@ -Source: navalplan -Section: web -Priority: optional -Maintainer: Adrian Perez -Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, - gettext (>= 0.17), texlive-latex-recommended, pgf, openjdk-6-jdk -Standards-Version: 3.8.4 -Homepage: http://www.navalplan.org/en/ - -Package: navalplan -Architecture: any -Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, - tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ttf-freefont, - ${misc:Depends} -Description: Web application for project management. - NavalPlan is a planning tool for users based on some concepts: company and - multi-project overview, criteria assignments, tasks tagging, resources - management, resource allocation (specific and generic), company load control, - external integration, etc. - . - Although its name is clearly related to shipbuilding, NavalPlan is a fully - useful planning tool for any type of company whose workflow requires project - and order administration and scheduling. diff --git a/debian/rules b/debian/rules index f064d1a85..c5f24875d 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ JAVA_HOME := /usr/lib/jvm/java-6-openjdk MAVEN_REPO := $(CURDIR)/debian/maven-repo MAVEN_OPTS := -Pprod,postgresql,-liquibase-update \ - -DdataSource.jndiName=jdbc/navalplan-ds \ + -DdataSource.jndiName=java:comp/env/jdbc/navalplan-ds \ -Dmaven.test.skip=true -B \ -s $(CURDIR)/debian/maven-settings.xml diff --git a/debian/rules.squeeze b/debian/rules.squeeze deleted file mode 100755 index c5f24875d..000000000 --- a/debian/rules.squeeze +++ /dev/null @@ -1,126 +0,0 @@ -#! /usr/bin/make -f - -#export DH_VRBOSE=1 -export DH_OPTIONS -export CURDIR - -MAKEFLAGS += s -JAVA_HOME := /usr/lib/jvm/java-6-openjdk - -MAVEN_REPO := $(CURDIR)/debian/maven-repo -MAVEN_OPTS := -Pprod,postgresql,-liquibase-update \ - -DdataSource.jndiName=java:comp/env/jdbc/navalplan-ds \ - -Dmaven.test.skip=true -B \ - -s $(CURDIR)/debian/maven-settings.xml - - -define NFO -@echo "$1" -endef - -ifneq ($V,0) -define CMD -@echo "$1" -@$1 -endef -else -define CMD -@$1 -endef -endif - - -configure: configure-stamp -configure-stamp: - $(call NFO,Configuring...) - $(call CMD,dh_testdir) - # Configure package here - $(call CMD,touch $@) - -build: build-arch - -build-arch: build-arch-stamp - -build-arch-stamp: configure-stamp - $(call NFO,Building sources...) - # Build arch-dependant stuff - $(call CMD,mkdir -p $(MAVEN_REPO)) - $(call CMD,mvn $(MAVEN_OPTS) install) - $(call CMD,touch $@) - -clean: - $(call NFO,Cleaning up...) - $(call CMD,dh_testdir) - $(call CMD,dh_testroot) - # Cleanup commands - $(call CMD,$(RM) build-arch-stamp build-indep-stamp configure-stamp) - $(call CMD,mkdir -p $(MAVEN_REPO)) - # This is likely to fail, e.g. needs to be reviewed - -$(call CMD,mvn $(MAVEN_OPTS) -npu clean) - $(call CMD,$(RM) -r $(CURDIR)/maven-repo) - $(call CMD,dh_clean) - -install: - $(call NFO,Installing objects...) - $(call CMD,dh_testdir) - $(call CMD,dh_testroot) - $(call CMD,dh_clean -k) - $(call CMD,dh_installdirs) - # Copy SQL installation file - $(call CMD,mkdir -p $(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/navalplan/install/) - $(call CMD,cp $(CURDIR)/scripts/database/install.sql \ - $(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/navalplan/install/pgsql) - # Commands to install arch-dependant stuff - $(call CMD,mkdir -p $(CURDIR)/debian/tmp/var/lib/tomcat6/webapps/) - $(call CMD,cp $(CURDIR)/navalplanner-webapp/target/navalplanner-webapp.war \ - $(CURDIR)/debian/tmp/var/lib/tomcat6/webapps/navalplan.war) - # Copy SQL upgrade script for version 1.0.0 - $(call CMD,mkdir -p $(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/navalplan/upgrade/pgsql/) - $(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) - # Install Policy file - $(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 -sf /usr/share/java/postgresql-jdbc3.jar $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) - $(call CMD,dh_install) - -binary-indep: build install - -binary-arch: build install - $(call NFO,Making binary package...) - $(call CMD,dh_testdir) - $(call CMD,dh_testroot) - $(call CMD,dh_installchangelogs) - $(call CMD,dh_installdocs) - $(call CMD,dh_installexamples) -# $(call CMD,dh_installmenu) - $(call CMD,dh_installdebconf) -# $(call CMD,dh_installlogrotate) -# $(call CMD,dh_installemacsen) -# $(call CMD,dh_installpam) -# $(call CMD,dh_installmime) -# $(call CMD,dh_python) -# $(call CMD,dh_installinit) -# $(call CMD,dh_installcron) -# $(call CMD,dh_installinfo) - $(call CMD,dh_installman) - $(call CMD,dh_link) - $(call CMD,dh_strip) - $(call CMD,dh_compress) - $(call CMD,dh_fixperms) -# $(call CMD,dh_perl) - $(call CMD,dh_makeshlibs) - $(call CMD,dh_installdeb) - $(call CMD,dh_shlibdeps) - $(call CMD,dh_gencontrol) - $(call CMD,dh_md5sums) - $(call CMD,dh_builddeb) - -binary: binary-indep binary-arch - - -.PHONY: build clean binary-indep binary-arch binary install install-indep -.PHONY: install-arch configure