[Git][debian-gis-team/zoo-project][master] Disable patches that don't apply, drop patches applied upstream.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / zoo-project


Commits:
d0453821 by Bas Couwenberg at 2019-07-22T17:37:19Z
Disable patches that don't apply, drop patches applied upstream.

- - - - -


7 changed files:

- debian/patches/cachedir.patch
- − debian/patches/main-configure.patch
- debian/patches/series
- debian/patches/servicepath.patch
- − debian/patches/symbols-install.patch
- − debian/patches/symbols-permissions.patch
- debian/patches/zoo-version.patch


Changes:

=====================================
debian/patches/cachedir.patch
=====================================
@@ -12,4 +12,4 @@ Forwarded: not-needed
 +cacheDir = /var/cache/zoo-project/
  
  [identification]
- title = The Zoo WPS Development Server
+ title = The ZOO-Project OGC WPS Development Server


=====================================
debian/patches/main-configure.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Have configure create main.cfg from main.cfg.in.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://zoo-project.org/trac/ticket/144
-Applied-Upstream: http://zoo-project.org/trac/changeset/813/
-
---- a/zoo-project/zoo-kernel/configure.ac
-+++ b/zoo-project/zoo-kernel/configure.ac
-@@ -933,6 +933,7 @@ AC_SUBST([HARDENING_CFLAGS])
- AC_SUBST([HARDENING_CPPFLAGS])
- AC_SUBST([HARDENING_LDFLAGS])
- 
-+AC_CONFIG_FILES([main.cfg])
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([ZOOMakefile.opts])
- AC_OUTPUT


=====================================
debian/patches/series
=====================================
@@ -1,8 +1,5 @@
-hardening-buildflags.patch
-zoo-version.patch
+#hardening-buildflags.patch
+#zoo-version.patch
 cachedir.patch
-symbols-install.patch
-main-configure.patch
-symbols-permissions.patch
 servicepath.patch
 libpath.patch


=====================================
debian/patches/servicepath.patch
=====================================
@@ -11,4 +11,4 @@ Forwarded: not-needed
 +servicePath = /etc/zoo-project
  
  [identification]
- title = The Zoo WPS Development Server
+ title = The ZOO-Project OGC WPS Development Server


=====================================
debian/patches/symbols-install.patch deleted
=====================================
@@ -1,25 +0,0 @@
-Description: Fix symbols.sym installation.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://zoo-project.org/trac/ticket/143
-Applied-Upstream: http://zoo-project.org/trac/changeset/813/
-
---- a/zoo-project/zoo-kernel/Makefile.in
-+++ b/zoo-project/zoo-kernel/Makefile.in
-@@ -60,7 +60,7 @@ service_yaml.o: service_yaml.c service.h
- 
- service_internal_ms.o: service_internal_ms.c
- 	gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
--	echo "SYMBOLSET\nEND" > sybols.sym
-+	echo "SYMBOLSET\nEND" > symbols.sym
- 
- service_internal_python.o: service_internal_python.c service.h
- 	g++ ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c service_internal_python.c
-@@ -119,7 +119,7 @@ install: zoo_loader.cgi
- 	(cd ${DESTDIR}${INST_LIB} ; \
- 	 if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
- 	 ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
--	if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
-+	if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
- 	install -d ${DESTDIR}${INST_INCLUDE}/zoo
- 	install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
- 


=====================================
debian/patches/symbols-permissions.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Set appropriate permissions for symbols.sym.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://zoo-project.org/trac/ticket/145
-Applied-Upstream: http://svn.zoo-project.org/trac/changeset/815
-
---- a/zoo-project/zoo-kernel/Makefile.in
-+++ b/zoo-project/zoo-kernel/Makefile.in
-@@ -119,7 +119,7 @@ install: zoo_loader.cgi
- 	(cd ${DESTDIR}${INST_LIB} ; \
- 	 if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
- 	 ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
--	if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
-+	if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install -m644 symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
- 	install -d ${DESTDIR}${INST_INCLUDE}/zoo
- 	install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
- 


=====================================
debian/patches/zoo-version.patch
=====================================
@@ -1,5 +1,5 @@
 Description: Extract SVN revision from changelog version.
- Package os not built from SVN, svnversion is not available.
+ Package is not built from SVN, svnversion is not available.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: not-needed
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/commit/d04538218e56aae27cb3f17eb6996ec7f193c6d2

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/commit/d04538218e56aae27cb3f17eb6996ec7f193c6d2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190722/56e94478/attachment-0001.html>