[Git][debian-gis-team/zoo-project][master] Fix build for 1.7.0 release
Angelos Tzotsos
gitlab at salsa.debian.org
Tue Jul 23 22:56:04 BST 2019
Angelos Tzotsos pushed to branch master at Debian GIS Project / zoo-project
Commits:
071a7909 by Angelos Tzotsos at 2019-07-23T21:55:41Z
Fix build for 1.7.0 release
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/libzoo-service1.5.symbols
- + debian/patches/cgal_info.patch
- + debian/patches/cgic-multiarch.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,14 @@
zoo-project (1.7.0+ds-1) UNRELEASED; urgency=medium
- * Initial release (closes: #nnnnnn)
-
- -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Fri, 19 Jul 2019 23:34:14 +0300
+ * New upstream version.
+ * Enable PIE for Bionic.
+ * Add otb-qgis,qtbase5-dev,libqt5opengl5-dev,libfcgi-dev to dependencies.
+ * Add patch for cgic makefile
+ * Add patch for CGAL demo
+ * Fix ITK_AUTOLOAD_PATH in rules file
+ * Update libzoo-service1.5 symbols
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Tue, 23 Jul 2019 14:00:00 +0300
zoo-project (1.5.0+svn780-0~xenial0) xenial; urgency=low
=====================================
debian/control
=====================================
@@ -23,9 +23,12 @@ Build-Depends: debhelper (>= 9),
libtinyxml-dev,
libxml2-dev,
libxslt1-dev,
+ qtbase5-dev,
+ libqt5opengl5-dev,
lsb-release,
otb-bin,
otb-bin-qt,
+ otb-qgis,
python-all,
python-dev
Build-Conflicts: libcurl3-openssl-dev
=====================================
debian/libzoo-service1.5.symbols
=====================================
@@ -1,12 +1,35 @@
libzoo_service.so.1.5 #PACKAGE# #MINVER#
* Build-Depends-Package: libzoo-service-dev
+ _Z11maps_lengthP4maps at Base 1.7.0
+ _Z13cleanFetchSqlP4mapsiP8OGRLayer at Base 1.7.0
+ _Z15_dumpMapsToFileP4mapsP8_IO_FILEi at Base 1.7.0
+ _Z16cleanUpResultSetPK4mapsi at Base 1.7.0
+ _Z16createInitStringP4maps at Base 1.7.0
+ _Z17_createInitStringP4mapsPKc at Base 1.7.0
+ _Z7end_sqlv at Base 1.7.0
+ _Z7execSqlP4mapsiPKc at Base 1.7.0
+ _Z8fetchSqlP4mapsiPKc at Base 1.7.0
+ _Z8init_sqlP4maps at Base 1.7.0
+ _Z9_init_sqlP4mapsPKc at Base 1.7.0
+ _Z9close_sqlP4mapsi at Base 1.7.0
+ _ZNKSt6chrono10time_pointINS_3_V212system_clockENS_8durationIlSt5ratioILl1ELl1000000000EEEEE16time_since_epochEv at Base 1.7.0
+ _ZNKSt6chrono8durationIlSt5ratioILl1ELl1000000000EEE5countEv at Base 1.7.0
+ _ZNKSt6chrono8durationIlSt5ratioILl1ELl1EEE5countEv at Base 1.7.0
+ _ZNSt6chrono13duration_castINS_8durationIlSt5ratioILl1ELl1000000000EEEElS3_EENSt9enable_ifIXsrNS_13__is_durationIT_EE5valueES7_E4typeERKNS1_IT0_T1_EE at Base 1.7.0
+ _ZNSt6chrono13duration_castINS_8durationIlSt5ratioILl1ELl1EEEElS2_ILl1ELl1000000000EEEENSt9enable_ifIXsrNS_13__is_durationIT_EE5valueES8_E4typeERKNS1_IT0_T1_EE at Base 1.7.0
+ _ZNSt6chrono20__duration_cast_implINS_8durationIlSt5ratioILl1ELl1000000000EEEES2_ILl1ELl1EElLb1ELb1EE6__castIlS3_EES4_RKNS1_IT_T0_EE at Base 1.7.0
+ _ZNSt6chrono20__duration_cast_implINS_8durationIlSt5ratioILl1ELl1EEEES2_ILl1ELl1000000000EElLb1ELb0EE6__castIlS5_EES4_RKNS1_IT_T0_EE at Base 1.7.0
+ _ZNSt6chrono3_V212system_clock9to_time_tERKNS_10time_pointIS1_NS_8durationIlSt5ratioILl1ELl1000000000EEEEEE at Base 1.7.0
+ _ZNSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEC1IlvEERKT_ at Base 1.7.0
+ _ZNSt6chrono8durationIlSt5ratioILl1ELl1EEEC1IlvEERKT_ at Base 1.7.0
_dumpMap at Base 1.5.0
- _dumpMapsToFile at Base 1.6.0~rc1
+#MISSING: 1.7.0# _dumpMapsToFile at Base 1.6.0~rc1
_getStatus at Base 1.5.0
_getStatusFile at Base 1.5.0
_updateStatus at Base 1.5.0
acquireLock at Base 1.5.0
addIntToMap at Base 1.5.0
+ addIntToMapArray at Base 1.7.0
addMapToIoType at Base 1.5.0
addMapToMap at Base 1.5.0
addMapsArrayToMaps at Base 1.5.0
@@ -20,8 +43,10 @@ libzoo_service.so.1.5 #PACKAGE# #MINVER#
count at Base 1.5.0
createElements at Base 1.6.0~rc1
createEmptyElements at Base 1.6.0~rc1
+ createIoType at Base 1.7.0
createMap at Base 1.5.0
createMaps at Base 1.6.0~rc1
+ createService at Base 1.7.0
dumpElements at Base 1.5.0
dumpElementsAsYAML at Base 1.5.0
dumpMap at Base 1.5.0
@@ -34,6 +59,7 @@ libzoo_service.so.1.5 #PACKAGE# #MINVER#
dupElements at Base 1.5.0
dupMaps at Base 1.5.0
dupService at Base 1.5.0
+ file_exists at Base 1.7.0
freeElements at Base 1.5.0
freeIOType at Base 1.5.0
freeMap at Base 1.5.0
@@ -57,21 +83,29 @@ libzoo_service.so.1.5 #PACKAGE# #MINVER#
getStatusId at Base 1.5.0
hasElement at Base 1.5.0
hasKey at Base 1.5.0
+ hasvalue at Base 1.7.0
inheritElements at Base 1.5.0
inheritIOType at Base 1.5.0
inheritMap at Base 1.5.0
inheritance at Base 1.5.0
loadMapBinaries at Base 1.5.0
loadMapBinary at Base 1.5.0
+ lockFile at Base 1.7.0
lockShm at Base 1.5.0
+ logMessage at Base 1.7.0
mapsToCharXXX at Base 1.5.0
+ nonempty at Base 1.7.0
readVSIFile at Base 1.5.0
removeShmLock at Base 1.5.0
setElementsName at Base 1.6.0~rc1
+ setErrorMessage at Base 1.7.0
setMapArray at Base 1.5.0
setMapInMaps at Base 1.5.0
setOutputValue at Base 1.5.0
setServiceName at Base 1.6.0~rc1
unhandleStatus at Base 1.5.0
+ unlockFile at Base 1.7.0
unlockShm at Base 1.5.0
updateStatus at Base 1.5.0
+ zoo_DS at Base 1.7.0
+ zoo_ResultSet at Base 1.7.0
=====================================
debian/patches/cgal_info.patch
=====================================
@@ -0,0 +1,40 @@
+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.7.0+ds-1~bionic4) bionic; urgency=medium
+ .
+ * New upstream version.
+ * Enable PIE for Bionic.
+ * Add otb-qgis,qtbase5-dev,libqt5opengl5-dev,libfcgi-dev to dependencies.
+ * Add patch for cgic makefile
+ * Add patch for CGAL demo
+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: 2019-07-23
+
+--- zoo-project-1.7.0+ds.orig/zoo-project/zoo-services/cgal/voronoi.c
++++ zoo-project-1.7.0+ds/zoo-project/zoo-services/cgal/voronoi.c
+@@ -200,7 +200,7 @@ extern "C" {
+ Face_iterator fit =T.faces_begin();
+ FILE* f=fopen("/tmp/toto.log","w+");
+ for ( ; fit !=T.faces_end(); ++fit) {
+- fprintf(stderr," *** %s %d %d %d\n",__FILE__,__LINE__,nf,fit.info());
++ // fprintf(stderr," *** %s %d %d %d\n",__FILE__,__LINE__,nf,fit.info());
+ fflush(stderr);
+
+ nf++;
=====================================
debian/patches/cgic-multiarch.patch
=====================================
@@ -0,0 +1,39 @@
+Description: Patch cgic makefile for multiarch
+ 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.7.0+ds-1~bionic1) bionic; urgency=medium
+ .
+ * New upstream version.
+ * Enable PIE for Bionic.
+ * Add otb-qgis,qtbase5-dev,libqt5opengl5-dev,libfcgi-dev to dependencies.
+ * Add patch for cgic makefile
+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: 2019-07-23
+
+--- zoo-project-1.7.0+ds.orig/thirds/cgic206/Makefile
++++ zoo-project-1.7.0+ds/thirds/cgic206/Makefile
+@@ -4,7 +4,7 @@ ifeq ($(OS),Darwin)
+ MACOS_CFLAGS=-arch x86_64
+ LIBS= -L./ -lcgic /usr/local/lib/libfcgi.dylib
+ else
+- LIBS= -L./ -lcgic /usr/lib/libfcgi.a
++ LIBS= -L./ -lcgic /usr/lib/${DEB_HOST_MULTIARCH}/libfcgi.a
+ endif
+ CFLAGS=-I/usr/local/include -g -Wall ${MACOS_CFLAGS}
+ CC=gcc
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@
cachedir.patch
servicepath.patch
libpath.patch
+cgic-multiarch.patch
+cgal_info.patch
=====================================
debian/rules
=====================================
@@ -9,7 +9,7 @@ VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo
DISTRIBUTION_RELEASE := $(shell lsb_release -cs)
ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
- ifneq (,$(filter $(DISTRIBUTION_RELEASE),xenial bionic))
+ ifneq (,$(filter $(DISTRIBUTION_RELEASE),xenial))
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
endif
endif
@@ -88,7 +88,7 @@ override_dh_auto_build:
( \
mkdir thirds/otb2zcfg/build/zcfgs; \
cd thirds/otb2zcfg/build/zcfgs; \
- ITK_AUTOLOAD_PATH=/usr/lib/otb/applications/ ../otb2zcfg || echo "Ignoring otb2zcfg failure"; \
+ ITK_AUTOLOAD_PATH=/usr/lib/${DEB_HOST_MULTIARCH}/otb/applications/ ../otb2zcfg || echo "Ignoring otb2zcfg failure"; \
for i in BandMath Despeckle KMeansClassification; do \
sed -i "s:mimeType = image/png:mimeType = image/png\nuseMapserver = true\nmsClassify = true:g" $$i.zcfg; \
done; \
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/commit/071a7909ff32772ab7094097a0716863aa749c0b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/commit/071a7909ff32772ab7094097a0716863aa749c0b
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/20190723/b44103de/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list