debian packaging: optional support for oracle instantclient 12.1

debian/control.in

@@ -56,7 +56,7 @@ Build-Depends:
  txt2tags,
  xvfb, xauth,
  xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
-#oracle# oracle-instantclient11.2-devel,
+#oracle# oracle-instantclient12.1-devel,
  spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
  libqt4-sql-sqlite, python-psycopg2
 Build-Conflicts: libqgis-dev, qgis-dev

debian/rules

@@ -20,8 +20,10 @@ QGIS_BUILDDIR ?= debian/build
 
 QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \([0-9]\+:\)\?\([^+-]\+\).*$$/\2/p')
 
-ifeq (,$(DISTRIBUTION))
+ifeq (,$(DIST))
 	DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
+else
+	DISTRIBUTION := $(DIST)
 endif
 
 ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
@@ -106,7 +108,18 @@ ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily si
 endif
 
 ifneq (,$(WITH_ORACLE))
-	CMAKE_OPTS += -DWITH_ORACLE=TRUE
+ifeq ($(DEB_BUILD_ARCH),amd64)
+	CMAKE_OPTS += \
+		-DWITH_ORACLE=TRUE \
+		-DORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client64/ \
+		-DORACLE_LIBDIR=/usr/lib/oracle/12.1/client64/lib/
+endif
+ifeq ($(DEB_BUILD_ARCH),i386)
+	CMAKE_OPTS += \
+		-DWITH_ORACLE=TRUE \
+		-DORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client/ \
+		-DORACLE_LIBDIR=/usr/lib/oracle/12.1/client/lib/
+endif
 endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie"))

src/providers/oracle/ocispatial/cmake/FindOCI.cmake

@@ -13,7 +13,6 @@
 FIND_PATH(OCI_INCLUDE_DIR oci.h
   PATHS
   ${ORACLE_INCLUDEDIR}
-  /usr/include/oracle/11.2/client64
   $ENV{OSGEO4W_ROOT}/include
   $ENV{ORACLE_HOME}/rdbms/public
 )
@@ -21,7 +20,6 @@ FIND_PATH(OCI_INCLUDE_DIR oci.h
 FIND_LIBRARY(OCI_LIBRARY clntsh oci
   PATHS
   ${ORACLE_LIBDIR}
-  /usr/lib/oracle/11.2/client64/lib/
   $ENV{OSGEO4W_ROOT}/lib
   $ENV{ORACLE_HOME}/lib
 )