[pygrib] 12/14: 826826: remove unnecessary dependencies. Closes: #826826
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Oct 28 11:26:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/2.0.1-3
in repository pygrib.
commit f745b295312394b86ea946540b32caeae4d44efc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jun 9 16:00:18 2016 +0100
826826: remove unnecessary dependencies. Closes: #826826
---
debian/changelog | 1 +
debian/control | 2 +-
debian/patches/remove-unnecessary-deps.patch | 93 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 96 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 6fbfd83..d13e6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pygrib (2.0.1-3) UNRELEASED; urgency=medium
* Standards-Version: 3.9.8
+ * 826826: remove unnecessary dependencies. Closes: #826826
-- Alastair McKinstry <mckinstry at debian.org> Thu, 09 Jun 2016 15:38:16 +0100
diff --git a/debian/control b/debian/control
index c600e0e..d381f7f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), chrpath,
python-pyproj, python3-pyproj,
python-numpy, python-all-dev,
libgrib-api-dev, libgrib2c-dev,
- libpng-dev, libopenjpeg-dev
+ libpng-dev
Standards-Version: 3.9.8
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.2
diff --git a/debian/patches/remove-unnecessary-deps.patch b/debian/patches/remove-unnecessary-deps.patch
new file mode 100644
index 0000000..7b1e642
--- /dev/null
+++ b/debian/patches/remove-unnecessary-deps.patch
@@ -0,0 +1,93 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Remove dependencies that aren't needed as we link
+ against g2clib.
+Last-Updated: 2016-06-09
+Forwarded: not-needed
+
+Index: pygrib-2.0.1/setup.py
+===================================================================
+--- pygrib-2.0.1.orig/setup.py
++++ pygrib-2.0.1/setup.py
+@@ -50,30 +50,6 @@ grib_api_libdir = config.getq(
+ "directories", "grib_api_libdir", environ.get('GRIBAPI_LIBDIR'))
+ grib_api_incdir = config.getq(
+ "directories", "grib_api_incdir", environ.get('GRIBAPI_INCDIR'))
+-jasper_dir = config.getq(
+- "directories", "jasper_dir", environ.get('JASPER_DIR'))
+-jasper_libdir = config.getq(
+- "directories", "jasper_libdir", environ.get('JASPER_LIBDIR'))
+-jasper_incdir = config.getq(
+- "directories", "jasper_incdir", environ.get('JASPER_INCDIR'))
+-png_dir = config.getq(
+- "directories", "png_dir", environ.get('PNG_DIR'))
+-png_libdir = config.getq(
+- "directories", "png_libdir", environ.get('PNG_LIBDIR'))
+-png_incdir = config.getq(
+- "directories", "png_incdir", environ.get('PNG_INCDIR'))
+-openjpeg_dir = config.getq(
+- "directories", "openjpeg_dir", environ.get('OPENJPEG_DIR'))
+-openjpeg_libdir = config.getq(
+- "directories", "openjpeg_libdir", environ.get('OPENJPEG_LIBDIR'))
+-openjpeg_incdir = config.getq(
+- "directories", "openjpeg_incdir", environ.get('OPENJPEG_INCDIR'))
+-zlib_dir = config.getq(
+- "directories", "zlib_dir", environ.get('ZLIB_DIR'))
+-zlib_libdir = config.getq(
+- "directories", "zlib_libdir", environ.get('ZLIB_LIBDIR'))
+-zlib_incdir = config.getq(
+- "directories", "zlib_incdir", environ.get('ZLIB_INCDIR'))
+ g2clib_dir = config.getq(
+ "directories", "g2clib_dir", environ.get('G2CLIB_DIR'))
+ g2clib_libdir = config.getq(
+@@ -98,51 +74,8 @@ if grib_api_libdir is None and grib_api_
+ libdirs.append(os.path.join(grib_api_dir,'lib64'))
+ if grib_api_incdir is None and grib_api_dir is not None:
+ incdirs.append(os.path.join(grib_api_dir,'include'))
+-# Disable jasper in Debian.
+-#if jasper_dir is not None or jasper_libdir is not None:
+-# libraries.append("jasper")
+-# if jasper_libdir is None and jasper_dir is not None:
+-# libdirs.append(os.path.join(jasper_dir,'lib'))
+-# libdirs.append(os.path.join(jasper_dir,'lib64'))
+-# if jasper_incdir is None and jasper_dir is not None:
+-# incdirs.append(os.path.join(jasper_dir,'include'))
+-# incdirs.append(os.path.join(jasper_dir,'include/jasper'))
+
+-if openjpeg_dir is not None or openjpeg_libdir is not None:
+- libraries.append("openjpeg")
+-if openjpeg_libdir is None and openjpeg_dir is not None:
+- libdirs.append(os.path.join(openjpeg_dir,'lib'))
+- libdirs.append(os.path.join(openjpeg_dir,'lib64'))
+-if openjpeg_incdir is None and openjpeg_dir is not None:
+- incdirs.append(os.path.join(openjpeg_dir,'include'))
+-
+-if png_dir is not None or png_libdir is not None:
+- libraries.append("png")
+-if png_libdir is None and png_dir is not None:
+- libdirs.append(os.path.join(png_dir,'lib'))
+- libdirs.append(os.path.join(png_dir,'lib64'))
+-if png_incdir is None and png_dir is not None:
+- incdirs.append(os.path.join(png_dir,'include'))
+-
+-if zlib_dir is not None or zlib_libdir is not None:
+- libraries.append("z")
+-if zlib_libdir is None and zlib_dir is not None:
+- libdirs.append(os.path.join(zlib_dir,'lib'))
+- libdirs.append(os.path.join(zlib_dir,'lib64'))
+-if zlib_incdir is None and zlib_dir is not None:
+- incdirs.append(os.path.join(zlib_dir,'include'))
+-
+-# if jasper or openjpeg lib not available...
+-#if 'jasper' not in libraries and 'openjpeg' not in libraries:
+-# g2clib_deps.remove(os.path.join('g2clib_src', 'jpcpack.c'))
+-# g2clib_deps.remove(os.path.join('g2clib_src', 'jpcunpack.c'))
+-#else:
+ macros.append(('USE_JPEG2000',1))
+-# if png lib not available...
+-#if 'png' not in libraries:
+-# g2clib_deps.remove(os.path.join('g2clib_src', 'pngpack.c'))
+-# g2clib_deps.remove(os.path.join('g2clib_src', 'pngunpack.c'))
+-#else:
+ macros.append(('USE_PNG',1))
+
+ if g2clib_dir is not None or g2clib_libdir is not None:
diff --git a/debian/patches/series b/debian/patches/series
index 973e0fe..4d3a8c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
use_g2clib.patch
packed-4bytes.patch
setuptools.patch
+remove-unnecessary-deps.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pygrib.git
More information about the debian-science-commits
mailing list