[zoo-project] 06/23: Drop patches, included upstream.

[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 2e82bab1b386deed0c0c2e140527a23232c8d211
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 25 21:16:47 2016 +0200

    Drop patches, included upstream.
---
 debian/patches/0001-ogr-services-makefile.patch | 31 -----------------------
 debian/patches/0002-Makefile-Destdir-fix.patch  | 33 -------------------------
 debian/patches/series                           |  2 --
 3 files changed, 66 deletions(-)

diff --git a/debian/patches/0001-ogr-services-makefile.patch b/debian/patches/0001-ogr-services-makefile.patch
deleted file mode 100644
index d0db370..0000000
--- a/debian/patches/0001-ogr-services-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: <Patch ogr service makefile to find zoo_service.so>
- .
- zoo-project (1.6.0~rev773-0~xenial0) xenial; urgency=low
- .
-   * Using latest SVN to rebuilt against GDAL 2.1.
-Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- zoo-project-1.6.0~rev773.orig/zoo-project/zoo-services/ogr/base-vect-ops/Makefile
-+++ zoo-project-1.6.0~rev773/zoo-project/zoo-services/ogr/base-vect-ops/Makefile
-@@ -9,7 +9,7 @@ else
- endif
- 
- cgi-env/ogr_service.zo: service.c
--	g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} -lfcgi  -lpthread -lzoo_service
-+	g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} -lfcgi  -lpthread -L../../../zoo-kernel/zoo_service
- 
- install:
- 	install -d ${CGI_DIR}/ogr/base-vect-ops
diff --git a/debian/patches/0002-Makefile-Destdir-fix.patch b/debian/patches/0002-Makefile-Destdir-fix.patch
deleted file mode 100644
index d74b801..0000000
--- a/debian/patches/0002-Makefile-Destdir-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: <Force Makefile use destdir when installing>
- .
- zoo-project (1.6.0~rev773-0~xenial1) xenial; urgency=low
- .
-   * Using latest SVN to rebuilt against GDAL 2.1.
-Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- zoo-project-1.6.0~rev773.orig/zoo-project/zoo-kernel/Makefile.in
-+++ zoo-project-1.6.0~rev773/zoo-project/zoo-kernel/Makefile.in
-@@ -104,8 +104,8 @@ zcfg2yaml: zcfg2yaml.c service.h lex.sr.
- 	g++  ${XML2CFLAGS} ${CFLAGS} zcfg2yaml.o server_internal.o service_internal.o ${MS_FILE} response_print.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o  ${YAML_FILE} -o zcfg2yaml -L. ${LDFLAGS}
- 
- install:
--	install -d ${CGI_DIR}
--	install zoo_loader.cgi ${CGI_DIR}/
-+	install -d ${DESTDIR}${CGI_DIR}
-+	install zoo_loader.cgi ${DESTDIR}${CGI_DIR}/
- 	install libzoo_service.${EXT} ${DESTDIR}${INST_LIB}/${LIBZOO_SERVICE}
- 	(cd ${DESTDIR}${INST_LIB} ; \
- 	 if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 252a2d6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-ogr-services-makefile.patch
-0002-Makefile-Destdir-fix.patch

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