[pygrib] 03/14: * New upstream release. * Change homepage from code.google.com to github.
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Oct 28 11:26:35 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 1fd299b0c35026af6afce677590b6f03c0661ee2
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Jan 26 14:53:04 2016 +0000
* New upstream release.
* Change homepage from code.google.com to github.
---
debian/changelog | 7 ++++
debian/control | 2 +-
debian/patches/use_g2clib.patch | 71 +++++++++++++++++++++--------------------
3 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0d26f14..ab0d7db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pygrib (2.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Change homepage from code.google.com to github.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 26 Jan 2016 14:50:51 +0000
+
pygrib (2.0.0-3) unstable; urgency=medium
* Remember to move the man pages, too. Closes: #789661.
diff --git a/debian/control b/debian/control
index 8bec474..3bdb075 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), chrpath,
Standards-Version: 3.9.6
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.2
-Homepage: https://code.google.com/p/pygrib/
+Homepage: https://github.com/jswhit/pygrib
Vcs-Git: git://git.debian.org/git/debian-science/packages/pygrib.git
Package: python-grib
diff --git a/debian/patches/use_g2clib.patch b/debian/patches/use_g2clib.patch
index 3b7c3ef..6a0546b 100644
--- a/debian/patches/use_g2clib.patch
+++ b/debian/patches/use_g2clib.patch
@@ -3,60 +3,61 @@ Description: On Debian, use libgrib2c library rather than embedded version.
Forwarded: not-needed
Last-Updated: 2013-11-28
-Index: pygrib-1.9.8/setup.py
+Index: pygrib-2.0.1/setup.py
===================================================================
---- pygrib-1.9.8.orig/setup.py 2013-11-28 16:43:15.000000000 +0000
-+++ pygrib-1.9.8/setup.py 2013-11-28 16:45:08.000000000 +0000
-@@ -20,6 +20,9 @@
- openjpeg_dir = os.environ.get('OPENJPEG_DIR')
- openjpeg_libdir = os.environ.get('OPENJPEG_LIBDIR')
- openjpeg_incdir = os.environ.get('OPENJPEG_INCDIR')
-+g2clib_dir = os.environ.get('G2CLIB_DIR')
-+g2clib_libdir = os.environ.get('G2CLIB_LIBDIR')
-+g2clib_incdir = os.environ.get('G2CLIB_INCDIR')
- # where to install man pages?
- man_dir = os.environ.get('MAN_DIR')
-
-@@ -61,10 +64,17 @@
- except: pass
- try: man_dir = config.get("directories", "man_dir")
- except: pass
-+ try: g2clib_dir = config.get("directories", "g2clib_dir")
-+ except: pass
-+ try: g2clib_libdir = config.get("directories", "g2clib_libdir")
-+ except: pass
-+ try: g2clib_incdir = config.get("directories", "g2clib_incdir")
-+ except: pass
+--- pygrib-2.0.1.orig/setup.py
++++ pygrib-2.0.1/setup.py
+@@ -79,9 +79,17 @@ man_dir = config.getq(
+ grib_api_libname = config.getq(
+ "files", "grib_api_libname", 'grib_api')
++try: g2clib_dir = config.get("directories", "g2clib_dir")
++except: pass
++try: g2clib_libdir = config.get("directories", "g2clib_libdir")
++except: pass
++try: g2clib_incdir = config.get("directories", "g2clib_incdir")
++except: pass
++
libdirs=[]
incdirs=[numpy.get_include()]
--libraries=['grib_api']
-+libraries=['grib_api','grib2c']
+-libraries=[grib_api_libname]
++libraries=[grib_api_libname, 'grib2c']
+macros=[]
if grib_api_libdir is None and grib_api_dir is not None:
libdirs.append(os.path.join(grib_api_dir,'lib'))
-@@ -105,31 +115,21 @@
+@@ -122,31 +130,34 @@ if zlib_libdir is None and zlib_dir is n
if zlib_incdir is None and zlib_dir is not None:
incdirs.append(os.path.join(zlib_dir,'include'))
-g2clib_deps = glob.glob('g2clib_src/*.c')
--g2clib_deps.append('g2clib.c')
+-g2clib_deps.append(g2clib_pyx)
-incdirs.append("g2clib_src")
-macros=[]
-
--# if jasper or openjpeg lib not available...
+ # if jasper or openjpeg lib not available...
-if 'jasper' not in libraries and 'openjpeg' not in libraries:
-- g2clib_deps.remove('g2clib_src/jpcpack.c')
-- g2clib_deps.remove('g2clib_src/jpcunpack.c')
+- 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 '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('g2clib_src/pngpack.c')
-- g2clib_deps.remove('g2clib_src/pngunpack.c')
+- 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 '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:
+ libraries.append("g2clib")
+if g2clib_libdir is None and g2clib_dir is not None:
@@ -73,7 +74,7 @@ Index: pygrib-1.9.8/setup.py
-g2clibext = Extension("g2clib",g2clib_deps,include_dirs=incdirs,\
- library_dirs=libdirs,libraries=libraries,runtime_library_dirs=libdirs,define_macros=macros)
+g2clibext =\
-+Extension("g2clib",["g2clib.c"],include_dirs=incdirs,library_dirs=libdirs,libraries=libraries)
++ Extension("g2clib",["g2clib.c"],include_dirs=incdirs,library_dirs=libdirs,libraries=libraries)
redtoregext =\
- Extension("redtoreg",["redtoreg.c"],include_dirs=[numpy.get_include()])
+ Extension("redtoreg",[redtoreg_pyx],include_dirs=[numpy.get_include()])
pygribext =\
--
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