[zoo-project] 01/01: Install main.cfg in /etc/zoo-project & updateStatus.xsl in /var/lib/zoo-project/.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository zoo-project.

commit dd791e29a4c5e5a5fae973e55bd2421dd8267c42
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 22 18:19:29 2017 +0100

    Install main.cfg in /etc/zoo-project & updateStatus.xsl in /var/lib/zoo-project/.
---
 debian/patches/status-datapath.patch |  2 +-
 debian/rules                         | 10 ++++++----
 debian/zoo-kernel.install            |  1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/patches/status-datapath.patch b/debian/patches/status-datapath.patch
index 98937c2..c5a8dcd 100644
--- a/debian/patches/status-datapath.patch
+++ b/debian/patches/status-datapath.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
  tmpPath=/tmp/
  tmpUrl = ../mpPathRelativeToServerAdress/
 -dataPath = /tmp/
-+dataPath = /usr/share/zoo-service-status/
++dataPath = /var/lib/zoo-project/
  cacheDir = /tmp/
  
  [identification]
diff --git a/debian/rules b/debian/rules
index c8310ab..7bf347b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,8 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure --sourcedirectory=zoo-project/zoo-kernel \
 	                  --builddirectory=zoo-project/zoo-kernel \
-	                  -- --with-python \
+	                  -- --with-etc-dir=yes --sysconfdir=/etc/zoo-project \
+	                     --with-python \
 	                     --with-js \
 	                     --with-java=/usr/lib/jvm/default-java \
 	                     --with-cgal=/usr \
@@ -88,7 +89,8 @@ override_dh_auto_install:
 	                --destdir=$(CURDIR)/debian/tmp \
 	                -- INST_LIB=/usr/lib INST_INCLUDE=/usr/include
 
-	install -m644 $(CURDIR)/zoo-project/zoo-kernel/main.cfg $(CURDIR)/debian/tmp/usr/lib/cgi-bin/
+	install -d $(CURDIR)/debian/zoo-kernel/etc/zoo-project
+	install -m644 $(CURDIR)/zoo-project/zoo-kernel/main.cfg $(CURDIR)/debian/zoo-kernel/etc/zoo-project/
 
 	# OGR
 	install -d $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin
@@ -101,13 +103,13 @@ override_dh_auto_install:
 
 	# Status
 	install -d $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin
-	install -d $(CURDIR)/debian/zoo-service-status/usr/share/zoo-service-status
+	install -d $(CURDIR)/debian/zoo-service-status/var/lib/zoo-project
 
 	install -m755 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/
 	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.py   $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/
 	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/
 
-	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/updateStatus.xsl $(CURDIR)/debian/zoo-service-status/usr/share/zoo-service-status/
+	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/updateStatus.xsl $(CURDIR)/debian/zoo-service-status/var/lib/zoo-project/
 
 	# CGAL
 	install -d $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin
diff --git a/debian/zoo-kernel.install b/debian/zoo-kernel.install
index 0765e6d..6c0bc2b 100644
--- a/debian/zoo-kernel.install
+++ b/debian/zoo-kernel.install
@@ -1,2 +1 @@
 usr/lib/cgi-bin/zoo_loader.cgi
-usr/lib/cgi-bin/main.cfg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git