[zoo-project] 06/12: Drop obsolete status-datapath.patch, refresh remaining patches.

[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 4c9001f53aeb622bafa9ced7f8a118fc9037c28c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 29 17:54:15 2017 +0100

    Drop obsolete status-datapath.patch, refresh remaining patches.
---
 debian/patches/cachedir.patch             |  8 ++++----
 debian/patches/hardening-buildflags.patch | 17 +++++++++--------
 debian/patches/series                     |  1 -
 debian/patches/status-datapath.patch      | 15 ---------------
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/debian/patches/cachedir.patch b/debian/patches/cachedir.patch
index c034c68..b79038f 100644
--- a/debian/patches/cachedir.patch
+++ b/debian/patches/cachedir.patch
@@ -2,12 +2,12 @@ Description: Set cacheDir to FHS compliant directory.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: not-needed
 
---- a/zoo-project/zoo-kernel/main.cfg
-+++ b/zoo-project/zoo-kernel/main.cfg
+--- a/zoo-project/zoo-kernel/main.cfg.in
++++ b/zoo-project/zoo-kernel/main.cfg.in
 @@ -7,7 +7,7 @@ lang = fr-FR,en-CA,en-US
  tmpPath=/tmp/
- tmpUrl = ../mpPathRelativeToServerAdress/
- dataPath = /var/lib/zoo-project/
+ tmpUrl = ../tmpPathRelativeToServerAdress/
+ dataPath = @sharedstatedir@/zoo-project
 -cacheDir = /tmp/
 +cacheDir = /var/cache/zoo-project/
  
diff --git a/debian/patches/hardening-buildflags.patch b/debian/patches/hardening-buildflags.patch
index 4f4b672..1e7f05b 100644
--- a/debian/patches/hardening-buildflags.patch
+++ b/debian/patches/hardening-buildflags.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
  RANLIB=ranlib
 --- a/zoo-project/zoo-kernel/configure.ac
 +++ b/zoo-project/zoo-kernel/configure.ac
-@@ -912,6 +912,14 @@ AC_SUBST([SAGA_LDFLAGS])
+@@ -925,6 +925,14 @@ AC_SUBST([SAGA_LDFLAGS])
  AC_SUBST([SAGA_FILE])
  AC_SUBST([SAGA_ENABLED])
  
@@ -32,7 +32,7 @@ Forwarded: not-needed
  AC_OUTPUT
 --- a/zoo-project/zoo-kernel/ZOOMakefile.opts.in
 +++ b/zoo-project/zoo-kernel/ZOOMakefile.opts.in
-@@ -100,7 +100,11 @@ MONO_LDFLAGS=@MONO_LDFLAGS@
+@@ -100,8 +100,12 @@ MONO_LDFLAGS=@MONO_LDFLAGS@
  MONO_ENABLED=@MONO_ENABLED@
  MONO_FILE=@MONO_FILE@
  
@@ -41,16 +41,17 @@ Forwarded: not-needed
 +HARDENING_CFLAGS=@HARDENING_CFLAGS@
 +HARDENING_CPPFLAGS=@HARDENING_CPPFLAGS@
 +HARDENING_LDFLAGS=@HARDENING_LDFLAGS@
- 
--DATAROOTDIR=@datarootdir@/zoo-project
-\ No newline at end of file
++
 +CFLAGS=${HARDENING_CFLAGS} ${HARDENING_CPPFLAGS} @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
 +LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS}  ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS} ${HARDENING_LDFLAGS}
-+
-+DATAROOTDIR=@datarootdir@/zoo-project
+ 
+ DATAROOTDIR=@datarootdir@/zoo-project
+-SHAREDSTATEDIR=@sharedstatedir@/zoo-project
+\ No newline at end of file
++SHAREDSTATEDIR=@sharedstatedir@/zoo-project
 --- a/zoo-project/zoo-kernel/Makefile.in
 +++ b/zoo-project/zoo-kernel/Makefile.in
-@@ -101,7 +101,7 @@ zoo_service_loader.o: zoo_service_loader
+@@ -102,7 +102,7 @@ zoo_service_loader.o: zoo_service_loader
  	g++ -g -O2 ${XML2CFLAGS} ${CFLAGS} ${MONO_CFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${PYTHONCFLAGS} ${JAVACFLAGS} ${JSCFLAGS} ${PERLCFLAGS} ${PHPCFLAGS} ${SAGA_ENABLED} ${OTB_ENABLED} ${PYTHON_ENABLED} ${JS_ENABLED} ${PHP_ENABLED} ${PERL_ENABLED} ${JAVA_ENABLED} ${MONO_ENABLED}  -c zoo_service_loader.c  -fno-common -DPIC -o zoo_service_loader.o
  
  libzoo_service.${EXT}: version.h service_internal.o service.o sqlapi.o
diff --git a/debian/patches/series b/debian/patches/series
index aa49b5a..ef275e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 hardening-buildflags.patch
 zoo-version.patch
-status-datapath.patch
 cachedir.patch
diff --git a/debian/patches/status-datapath.patch b/debian/patches/status-datapath.patch
deleted file mode 100644
index c5a8dcd..0000000
--- a/debian/patches/status-datapath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Set dataPath for updateStatus.xsl.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/zoo-project/zoo-kernel/main.cfg
-+++ b/zoo-project/zoo-kernel/main.cfg
-@@ -6,7 +6,7 @@ language = en-US
- lang = fr-FR,en-CA,en-US
- tmpPath=/tmp/
- tmpUrl = ../mpPathRelativeToServerAdress/
--dataPath = /tmp/
-+dataPath = /var/lib/zoo-project/
- cacheDir = /tmp/
- 
- [identification]

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