[gdal] 03/05: Reorder (build) dependencies and configure options.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Apr 3 18:52:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gdal.
commit 15b60b1c26f0b8888b486a25f6cea5b6c07b1edf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Apr 3 20:01:47 2016 +0200
Reorder (build) dependencies and configure options.
---
debian/changelog | 1 +
debian/control | 113 +++++++++++++++++++++++++++----------------------------
debian/rules | 52 ++++++++++++-------------
3 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 934ab52..aa7794f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gdal (2.0.2+dfsg-5) UNRELEASED; urgency=medium
* Build with external libjson-c instead of internal copy.
(LP: #1565475)
* Have dh_numpy{,3} act on specific package only.
+ * Reorder (build) dependencies and configure options.
-- Bas Couwenberg <sebastic at debian.org> Sun, 03 Apr 2016 16:38:52 +0200
diff --git a/debian/control b/debian/control
index caae5ab..32b2ec8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,53 +6,54 @@ Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
dh-autoreconf,
+ dh-python,
+ d-shlibs,
+ default-jdk,
+ doxygen,
+ graphviz,
+ ant,
autotools-dev,
- zlib1g-dev,
- libnetcdf-dev (>= 1:4.0.0),
- netcdf-bin,
- libpng-dev,
- libjpeg-dev,
- libgif-dev,
+ chrpath,
+ libarmadillo-dev,
+ libcurl4-gnutls-dev | libcurl-ssl-dev,
+ libdap-dev,
+ libepsilon-dev (>= 0.9.1-1~),
+ libexpat1-dev,
+ libfreexl-dev (>= 1.0.0),
+ libgeos-dev,
libgeotiff-dev,
- libtiff-dev,
- libwebp-dev,
+ libgif-dev,
libhdf4-alt-dev,
libhdf5-dev (>= 1.8.8),
+ libjpeg-dev,
+ libjson-c-dev,
+ libkml-dev (>= 1.3.0~rc0-3),
+ liblzma-dev,
+ libmysqlclient-dev,
+ libnetcdf-dev (>= 1:4.0.0),
+ libogdi3.2-dev,
+ libopenjp2-7-dev,
libpcre3-dev,
+ libpng-dev,
+ libpoppler-private-dev,
libpq-dev,
+ libproj-dev,
+ libspatialite-dev (>= 4.3.0-3~),
+ libsqlite3-dev,
+ libtiff-dev,
+ liburiparser-dev,
+ libwebp-dev,
libxerces-c-dev,
- unixodbc-dev (>= 2.2.11),
- doxygen,
- d-shlibs,
- libgeos-dev,
- libmysqlclient-dev,
- dh-python,
+ libxml2-dev,
+ netcdf-bin,
+ patch,
python-all-dev (>= 2.6.6-3~),
python-numpy,
python3-all-dev,
python3-numpy,
- libcurl4-gnutls-dev | libcurl-ssl-dev,
- libsqlite3-dev,
- libogdi3.2-dev,
- chrpath,
swig,
- patch,
- libexpat1-dev,
- libproj-dev,
- libdap-dev,
- libxml2-dev,
- libspatialite-dev (>= 4.3.0-3~),
- libepsilon-dev (>= 0.9.1-1~),
- libpoppler-private-dev,
- liblzma-dev,
- libopenjp2-7-dev,
- libarmadillo-dev,
- libfreexl-dev (>= 1.0.0),
- libkml-dev (>= 1.3.0~rc0-3),
- liburiparser-dev,
- libjson-c-dev,
- default-jdk,
- ant
+ unixodbc-dev (>= 2.2.11),
+ zlib1g-dev
Build-Conflicts: python-setuptools
Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal.git
@@ -91,26 +92,26 @@ Architecture: any
Section: libdevel
Depends: libgdal20 (= ${binary:Version}),
libc6-dev,
- libnetcdf-dev,
- libpng-dev,
- libjpeg-dev,
- libgif-dev,
+ libcurl4-gnutls-dev | libcurl-ssl-dev,
+ libdap-dev,
+ libgeos-dev,
libgeotiff-dev,
- libtiff-dev,
- libwebp-dev,
+ libgif-dev,
libhdf4-alt-dev,
libhdf5-dev,
+ libjpeg-dev,
+ libjson-c-dev,
+ libltdl-dev,
+ libmysqlclient-dev,
+ libnetcdf-dev,
+ libpng-dev,
libpq-dev,
+ libspatialite-dev,
+ libsqlite3-dev,
+ libtiff-dev,
+ libwebp-dev,
libxerces-c-dev,
unixodbc-dev,
- libsqlite3-dev,
- libgeos-dev,
- libmysqlclient-dev,
- libltdl-dev,
- libcurl4-gnutls-dev | libcurl-ssl-dev,
- libspatialite-dev,
- libdap-dev,
- libjson-c-dev,
${misc:Depends}
Suggests: libgdal-doc
Description: Geospatial Data Abstraction Library - Development files
@@ -190,9 +191,8 @@ Homepage: http://www.gdal.org/gdal_utilities.html
Package: python-gdal
Architecture: any
Section: python
-Depends: ${shlibs:Depends},
- ${python:Depends},
- python-numpy,
+Depends: ${python:Depends},
+ ${shlibs:Depends},
${misc:Depends}
Suggests: gdal-bin
Provides: ${python:Provides}
@@ -220,9 +220,8 @@ Homepage: http://trac.osgeo.org/gdal/wiki/GdalOgrInPython
Package: python3-gdal
Architecture: any
Section: python
-Depends: ${shlibs:Depends},
- ${python3:Depends},
- python3-numpy,
+Depends: ${python3:Depends},
+ ${shlibs:Depends},
${misc:Depends}
Suggests: gdal-bin
Provides: ${python3:Provides}
@@ -250,8 +249,8 @@ Homepage: http://trac.osgeo.org/gdal/wiki/GdalOgrInPython
Package: libgdal-perl
Architecture: any
Section: perl
-Depends: ${shlibs:Depends},
- ${perl:Depends},
+Depends: ${perl:Depends},
+ ${shlibs:Depends},
${misc:Depends}
Description: Perl bindings to the Geospatial Data Abstraction Library
GDAL is a translator library for raster geospatial data formats.
diff --git a/debian/rules b/debian/rules
index e3f0b34..ce9c0b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,42 +89,42 @@ override_dh_auto_configure:
PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \
--mandir=\$$\{prefix\}/share/man \
--includedir=\$$\{prefix\}/include/gdal \
- --with-threads \
- --with-grass=no \
--with-hide-internal-symbols=yes \
--with-rename-internal-libtiff-symbols=yes \
--with-rename-internal-libgeotiff-symbols=yes \
- --with-libtiff=yes \
+ --with-threads \
+ --with-armadillo=yes \
+ --with-cfitsio=no \
+ --with-curl \
+ --with-ecw=no \
+ --with-epsilon=/usr \
+ --with-freexl=yes \
+ --with-geos \
--with-geotiff=yes \
- --with-webp \
- --with-netcdf \
+ --with-grass=no \
$(WITH_HDF5) \
- --with-xerces \
- --with-geos \
- --with-sqlite3 \
- --with-curl \
- --with-pg \
+ --with-libjson-c=/usr \
+ --with-libkml=yes \
+ --with-liblzma=yes \
+ --with-libtiff=yes \
+ --with-mrsid=no \
--with-mysql \
- --with-perl \
- --with-ruby=no \
- --with-java=/usr/lib/jvm/default-java \
- --with-python \
+ --with-netcdf \
--with-odbc \
--with-ogdi \
+ --with-openjpeg=yes \
+ --with-pg \
+ --with-poppler=yes \
+ --with-spatialite=/usr \
+ --with-sqlite3 \
+ --with-webp \
+ --with-xerces \
--with-dods-root=/usr \
--with-static-proj4=yes \
- --with-spatialite=/usr \
- --with-cfitsio=no \
- --with-ecw=no \
- --with-mrsid=no \
- --with-poppler=yes \
- --with-openjpeg=yes \
- --with-freexl=yes \
- --with-libkml=yes \
- --with-armadillo=yes \
- --with-liblzma=yes \
- --with-epsilon=/usr \
- --with-libjson-c=/usr \
+ --with-java=/usr/lib/jvm/default-java \
+ --with-perl \
+ --with-python \
+ --with-ruby=no \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"; \
mv GDALmake.opt GDALmake.opt-$$V; \
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git
More information about the Pkg-grass-devel
mailing list