[zoo-project] 02/02: Install .zo files in /usr/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 0f34a0e18376d3663bb10209b70d4d9263bb1f6d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 30 18:36:46 2017 +0100

    Install .zo files in /usr/lib/zoo-project.
---
 debian/patches/libpath.patch | 14 ++++++++++++++
 debian/patches/series        |  1 +
 debian/rules                 | 16 ++++++++--------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/patches/libpath.patch b/debian/patches/libpath.patch
new file mode 100644
index 0000000..80b83f6
--- /dev/null
+++ b/debian/patches/libpath.patch
@@ -0,0 +1,14 @@
+Description: Set libPath to FHS compliant directory.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/zoo-project/zoo-kernel/main.cfg.in
++++ b/zoo-project/zoo-kernel/main.cfg.in
+@@ -8,6 +8,7 @@ tmpPath=/tmp/
+ tmpUrl = ../tmpPathRelativeToServerAdress/
+ dataPath = @sharedstatedir@/zoo-project
+ cacheDir = /var/cache/zoo-project/
++libPath = /var/lib/zoo-project
+ servicePath = /etc/zoo-project
+ 
+ [identification]
diff --git a/debian/patches/series b/debian/patches/series
index 0af2efe..a915aa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ symbols-install.patch
 main-configure.patch
 symbols-permissions.patch
 servicepath.patch
+libpath.patch
diff --git a/debian/rules b/debian/rules
index 5cf615b..92d6d9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,30 +96,30 @@ override_dh_auto_install:
 
 	# OGR
 	install -d $(CURDIR)/debian/zoo-service-ogr/etc/zoo-project
-	install -d $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin
+	install -d $(CURDIR)/debian/zoo-service-ogr/usr/lib/zoo-project
 
-	install -m755 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/
+	install -m755 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-ogr/usr/lib/zoo-project/
 	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/etc/zoo-project/
 
-	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.py   $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/
+	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.py   $(CURDIR)/debian/zoo-service-ogr/usr/lib/zoo-project/
 	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/etc/zoo-project/
 
 	# Status
 	install -d $(CURDIR)/debian/zoo-service-status/etc/zoo-project
-	install -d $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin
+	install -d $(CURDIR)/debian/zoo-service-status/usr/lib/zoo-project
 	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 -m755 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-status/usr/lib/zoo-project/
+	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.py   $(CURDIR)/debian/zoo-service-status/usr/lib/zoo-project/
 	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-status/etc/zoo-project/
 
 	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/etc/zoo-project
-	install -d $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin
+	install -d $(CURDIR)/debian/zoo-service-cgal/usr/lib/zoo-project
 
-	install -m755 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin/
+	install -m755 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-cgal/usr/lib/zoo-project/
 	install -m644 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-cgal/etc/zoo-project/
 
 	# OTB

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