[Git][debian-gis-team/zoo-project][master] Packaging now works in Ubuntu Focal
Angelos Tzotsos
gitlab at salsa.debian.org
Tue Feb 2 15:35:50 GMT 2021
Angelos Tzotsos pushed to branch master at Debian GIS Project / zoo-project
Commits:
b491e0f9 by Angelos Tzotsos at 2021-02-02T17:35:39+02:00
Packaging now works in Ubuntu Focal
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/otb-type-fix.patch
- debian/patches/patch_cflags.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,15 +1,10 @@
-zoo-project (1.8.0+ds-1) UNRELEASED; urgency=medium
+zoo-project (1.8.0+ds) UNRELEASED; urgency=medium
+ [ Angelos Tzotsos ]
* Added patch to deactivate check for proj api.
* Added patch to fix non supported otb type and OGR demo.
* Removed CGAL demo.
-
- -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Fri, 29 Jan 2021 14:00:00 +0200
-
-zoo-project (1.8.0+ds) UNRELEASED; urgency=medium
-
- [ Angelos Tzotsos ]
- * New upstream version.
+ * Moved to Python 3.
* Enable PIE for Bionic.
* Add otb-qgis,qtbase5-dev,libqt5opengl5-dev,libfcgi-dev to dependencies.
* Add patch for cgic makefile
=====================================
debian/control
=====================================
@@ -27,8 +27,8 @@ Build-Depends: debhelper (>= 10~),
otb-bin,
otb-bin-qt,
otb-qgis,
- python-all,
- python-dev
+ python3-all,
+ python3-dev
Build-Conflicts: libcurl3-openssl-dev
Standards-Version: 4.5.1
Vcs-Browser: https://salsa.debian.org/debian-gis-team/zoo-project
@@ -75,8 +75,8 @@ Description: CGI ZOO services
Package: zoo-service-ogr
Architecture: any
-Depends: python,
- python-gdal,
+Depends: python3,
+ python3-gdal,
${shlibs:Depends},
${misc:Depends}
Description: OGR CGI ZOO services
@@ -101,7 +101,7 @@ Description: OTB CGI ZOO services
Package: zoo-service-status
Architecture: any
-Depends: python,
+Depends: python3,
${shlibs:Depends},
${misc:Depends}
Description: Status CGI ZOO services
=====================================
debian/copyright
=====================================
@@ -5,7 +5,7 @@ Source: http://zoo-project.org/Code/Download
Files-Excluded: */autom4te.cache/*
Files: *
-Copyright: 2008-2020, GeoLabs SARL
+Copyright: 2008-2021, GeoLabs SARL
2015, rasdaman GmbH.
2010-2011, Fondazione Edmund Mach.
2007-2010, Even Rouault <even dot rouault at mines-paris dot org>
=====================================
debian/patches/otb-type-fix.patch
=====================================
@@ -1,14 +1,4 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- zoo-project (1.8.0+ds-1~focal8) focal; urgency=medium
- .
- * Removing CGAL demo.
- * OGR demo patch.
+Description: Patch to ignore old otb types
Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
---
@@ -79,133 +69,6 @@ Last-Update: 2021-02-01
std::cout << " <ComplexData>" << std::endl;
printImages();
std::cout << " </ComplexData>" << std::endl;
---- /dev/null
-+++ zoo-project-1.8.0+ds/zoo-patch-test2.patch
-@@ -0,0 +1,124 @@
-+Index: thirds/otb2zcfg/otb2zcfg.cxx
-+===================================================================
-+--- thirds/otb2zcfg/otb2zcfg.cxx (révision 981)
-++++ thirds/otb2zcfg/otb2zcfg.cxx (copie de travail)
-+@@ -221,7 +221,7 @@
-+
-+ if(type == ParameterType_StringList || type == ParameterType_String || type == ParameterType_Float
-+ || type == ParameterType_Int || type == ParameterType_Choice || type == ParameterType_ListView
-+- || type == ParameterType_RAM || type == ParameterType_Empty || type == ParameterType_Directory){
-++ || type == ParameterType_RAM /*|| type == ParameterType_Empty*/ || type == ParameterType_Directory){
-+ std::cout << " <LiteralData>" << std::endl;
-+ std::string lt;
-+ if(type == ParameterType_Int || type == ParameterType_RAM)
-+@@ -232,8 +232,8 @@
-+ || type == ParameterType_Choice || type == ParameterType_Directory
-+ || type == ParameterType_ListView)
-+ lt="string";
-+- if(type == ParameterType_Empty)
-+- lt="boolean";
-++ /*if(type == ParameterType_Empty)
-++ lt="boolean";*/
-+ std::cout << " dataType = " << lt << std::endl;
-+ if(type == ParameterType_Choice || type == ParameterType_ListView){
-+ const std::vector<std::string> nList = m_Application->GetChoiceNames(paramKey);
-+@@ -280,11 +280,11 @@
-+ printOutputImage(m_Application->GetParameterOutputImagePixelType(paramKey));
-+ }
-+ else{
-+- if(type == ParameterType_ComplexOutputImage){
-++ /*if(type == ParameterType_ComplexOutputImage){
-+ printOutputComplexImage(m_Application->GetParameterComplexOutputImagePixelType(paramKey));
-+- }else{
-++ }else*/{
-+ std::cout << " <ComplexData>" << std::endl;
-+- if(type == ParameterType_InputImage || type == ParameterType_InputImageList || type == ParameterType_ComplexInputImage){
-++ if(type == ParameterType_InputImage || type == ParameterType_InputImageList){
-+ printImages();
-+ }
-+ else
-+@@ -337,7 +337,7 @@
-+
-+ if(paramKey!="inxml" && paramKey!="outxml" &&
-+ ((type == ParameterType_OutputVectorData || type == ParameterType_OutputImage
-+- || type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage
-++ || type == ParameterType_OutputImage //|| type == ParameterType_ComplexOutputImage
-+ || type == ParameterType_OutputFilename) || role==1) && type != ParameterType_Group){
-+ hasOutput=1;
-+ std::vector<std::string> values;
-+@@ -355,7 +355,7 @@
-+ std::cout << " Abstract = " << paramKey << std::endl;
-+ }
-+
-+- if(type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage){
-++ if(type == ParameterType_OutputImage){// || type == ParameterType_ComplexOutputImage){
-+ std::cout << " <ComplexData>" << std::endl;
-+ printImages();
-+ std::cout << " </ComplexData>" << std::endl;
-+Index: zoo-project/zoo-kernel/configure.ac
-+===================================================================
-+--- zoo-project/zoo-kernel/configure.ac (révision 981)
-++++ zoo-project/zoo-kernel/configure.ac (copie de travail)
-+@@ -414,8 +414,8 @@
-+ # Check headers file
-+ CPPFLAGS_SAVE="$CPPFLAGS"
-+ CPPFLAGS="$PROJ_CPPFLAGS"
-+-AC_CHECK_HEADERS([proj_api.h],
-+- [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
-++#AC_CHECK_HEADERS([proj_api.h],
-++# [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
-+
-+ AC_SUBST([PROJ_CPPFLAGS])
-+ AC_SUBST([PROJ_LDFLAGS])
-+Index: zoo-project/zoo-kernel/service_internal_otb.c
-+===================================================================
-+--- zoo-project/zoo-kernel/service_internal_otb.c (révision 981)
-++++ zoo-project/zoo-kernel/service_internal_otb.c (copie de travail)
-+@@ -361,7 +361,7 @@
-+ }
-+ else
-+ if(type == ParameterType_InputImage
-+- || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
-++ || type == ParameterType_InputVectorData
-+ || type == ParameterType_InputFilename){
-+ m_Application->SetParameterString(paramKey, test->value);
-+ }
-+Index: zoo-project/zoo-kernel/ulinet.h
-+===================================================================
-+--- zoo-project/zoo-kernel/ulinet.h (révision 981)
-++++ zoo-project/zoo-kernel/ulinet.h (copie de travail)
-+@@ -33,7 +33,7 @@
-+ #endif
-+ #include "jsapi.h"
-+ #endif
-+-#include "fcgi_stdio.h"
-++//#include "fcgi_stdio.h"
-+ #include <stdlib.h>
-+ #include <fcntl.h>
-+ #include <curl/curl.h>
-+Index: zoo-project/zoo-services/ogr/base-vect-ops/service.c
-+===================================================================
-+--- zoo-project/zoo-services/ogr/base-vect-ops/service.c (révision 981)
-++++ zoo-project/zoo-services/ogr/base-vect-ops/service.c (copie de travail)
-+@@ -37,19 +37,14 @@
-+ #include "service.h"
-+ #include "service_internal.h"
-+
-+-extern "C" {
-+ #include <libxml/tree.h>
-+ #include <libxml/parser.h>
-+ #include <libxml/xpath.h>
-+ #include <libxml/xpathInternals.h>
-+
-+-/*#include <openssl/sha.h>
-+-#include <openssl/hmac.h>
-+-#include <openssl/evp.h>
-+-#include <openssl/bio.h>
-+-#include <openssl/buffer.h>
-+-*/
-++extern "C" {
-+
-++
-+ void printExceptionReportResponse(maps*,map*);
-+ char *base64(const char *input, int length);
-+
--- zoo-project-1.8.0+ds.orig/zoo-project/zoo-kernel/configure.ac
+++ zoo-project-1.8.0+ds/zoo-project/zoo-kernel/configure.ac
@@ -414,8 +414,8 @@ PROJ_CPPFLAGS="-I$PROJPATH/include"
@@ -219,6 +82,32 @@ Last-Update: 2021-02-01
AC_SUBST([PROJ_CPPFLAGS])
AC_SUBST([PROJ_LDFLAGS])
+@@ -606,7 +606,8 @@ else
+
+ echo $PYTHONCONFIG
+ # Extract the linker and include flags
+- PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
++ PYTHON_LDFLAGS=$($PYTHONCONFIG --ldflags | sed "s:python${PYTHON_VERS}/config-${PYTHON_VERS}-::g")
++ echo $PYTHON_LDFLAGS
+ PYTHON_CPPFLAGS=`$PYTHONCONFIG --includes`
+
+ # Check headers file
+@@ -617,10 +618,11 @@ else
+
+ # Ensure we can link against libphp
+ LIBS_SAVE="$LIBS"
+- LIBS="$PYTHON_LDFLAGS"
+- PY_LIB=`$PYTHONCONFIG --libs | sed \
+- -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
+- AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
++ LIBS="m $PYTHON_LDFLAGS -lpython${PYTHON_VERS}"
++ PYTHON_LDFLAGS="-l$LIBS"
++ PY_LIB=`$PYTHONCONFIG --libs`
++ LDFLAGS=$PYTHON_LDFLAGS
++ AC_CHECK_LIB([], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
+ LIBS="$LIBS_SAVE"
+ fi
+
--- zoo-project-1.8.0+ds.orig/zoo-project/zoo-kernel/service_internal_otb.c
+++ zoo-project-1.8.0+ds/zoo-project/zoo-kernel/service_internal_otb.c
@@ -361,7 +361,7 @@ int zoo_otb_support(maps** main_conf,map
=====================================
debian/patches/patch_cflags.patch
=====================================
@@ -1,14 +1,4 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- zoo-project (1.8.0+ds-1~focal3) focal; urgency=medium
- .
- * Added patch to deactivate check for proj api.
- * Added workaround for proj_api.h deprecation.
+Description: Patch to ignore proj_api.h
Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
---
=====================================
debian/rules
=====================================
@@ -58,6 +58,7 @@ override_dh_auto_configure:
-- --sharedstatedir=/var/lib \
--with-etc-dir=yes --sysconfdir=/etc/zoo-project \
--with-python \
+ --with-pyvers=3.8 \
--with-js \
--with-java=/usr/lib/jvm/default-java \
--with-java-rpath=yes \
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/commit/b491e0f909682004bc6a5fe5138d45aaa0373031
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/commit/b491e0f909682004bc6a5fe5138d45aaa0373031
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/20210202/aa34a623/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list