[cdo] 66/84: 1.6.5 changes
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Jun 13 16:48:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cdo.
commit 4c67c3bf3ccb49bd658089a97d08a8263627f169
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Nov 8 15:18:46 2014 +0000
1.6.5 changes
---
debian/changelog | 26 +++++++++++++++++++++++++-
debian/patches/build-fixes.patch | 26 ++++----------------------
debian/patches/gotocc-fix.patch | 19 +++++++++++++++++++
debian/patches/series | 3 +--
debian/patches/uchar_fix.patch | 18 ------------------
debian/rules | 11 +++--------
6 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 66f7718..12fdac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,31 @@
+cdo (1.6.5+dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Standards-Version: 3.9.6. No changes required.
+ * Updated patches. u_char_fix.patch no longer needed.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 28 Oct 2014 07:42:54 +0000
+
+cdo (1.6.4+dfsg.1-5) unstable; urgency=medium
+
+ * Drop building with static libs (not needed anymore?)
+ Closes: #761187.
+ * Ack. bug fixed in 1.6.4 release. Closes: #744274.
+ * Fix for expr_run() definition conflict spotted by gotocc project.
+ Closes: #747001.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 12 Sep 2014 10:24:13 +0100
+
+cdo (1.6.4+dfsg.1-4) unstable; urgency=medium
+
+ * Force rebuild against hdf5 libs in unstable
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 14 Aug 2014 09:48:07 +0100
+
cdo (1.6.4+dfsg.1-3) unstable; urgency=low
[ Gilles Fillipini ]
- * Support hdf5 1.8.13 new packaging layout.
+ * Support hdf5 1.8.13 new packaging layout. Closes: #756660.
-- Alastair McKinstry <mckinstry at debian.org> Fri, 01 Aug 2014 06:49:11 +0100
diff --git a/debian/patches/build-fixes.patch b/debian/patches/build-fixes.patch
index 8773ff3..bc26b43 100644
--- a/debian/patches/build-fixes.patch
+++ b/debian/patches/build-fixes.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Add explicit declaration.
-Last-Updated: 2014-07-07
+Last-Updated: 2014-10-28
Forwarded: no
-Index: cdo-1.6.4+dfsg.1/src/griddes.c
+Index: cdo-1.6.5+dfsg.1/src/griddes.c
===================================================================
---- cdo-1.6.4+dfsg.1.orig/src/griddes.c
-+++ cdo-1.6.4+dfsg.1/src/griddes.c
+--- cdo-1.6.5+dfsg.1.orig/src/griddes.c
++++ cdo-1.6.5+dfsg.1/src/griddes.c
@@ -55,6 +55,7 @@ void extClose(int fileID);
#define MAX_LINE_LEN 65536
@@ -15,21 +15,3 @@ Index: cdo-1.6.4+dfsg.1/src/griddes.c
void gridInit(griddes_t *grid)
{
-Index: cdo-1.6.4+dfsg.1/src/remap_distwgt_scrip.c
-===================================================================
---- cdo-1.6.4+dfsg.1.orig/src/remap_distwgt_scrip.c
-+++ cdo-1.6.4+dfsg.1/src/remap_distwgt_scrip.c
-@@ -296,11 +296,12 @@ void grid_search_nbr(int num_neighbors,
- double distance; /* Angular distance */
- double *dist = (double*) malloc(ndist*sizeof(double));
- int *adds = (int*) malloc(ndist*sizeof(int));
-+ j = 0;
-
- #if defined(_OPENMP) && _OPENMP >= OPENMP4
- #pragma omp simd
- #endif
-- for ( j = 0, i = 0; i < ndist; ++i )
-+ for ( i = 0; i < ndist; ++i )
- {
- nadd = min_add+i;
- /* Find distance to this point */
diff --git a/debian/patches/gotocc-fix.patch b/debian/patches/gotocc-fix.patch
new file mode 100644
index 0000000..3e17f22
--- /dev/null
+++ b/debian/patches/gotocc-fix.patch
@@ -0,0 +1,19 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix expr() definition conflict spotted by gotocc project
+Origin-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747001
+Last-Updated: 2014-10-28
+Forwarded: no
+
+Index: cdo-1.6.5+dfsg.1/src/expr_yacc.c
+===================================================================
+--- cdo-1.6.5+dfsg.1.orig/src/expr_yacc.c
++++ cdo-1.6.5+dfsg.1/src/expr_yacc.c
+@@ -86,7 +86,7 @@ nodeType *expr_con(double value);
+ nodeType *expr_fun(char *fname, nodeType *p);
+
+ void freeNode(nodeType *p);
+-int expr_run(nodeType *p, parse_parm_t *parse_arg);
++nodeType *expr_run(nodeType *p, parse_parm_t *parse_arg);
+
+
+ /* Line 371 of yacc.c */
diff --git a/debian/patches/series b/debian/patches/series
index f5e9d56..c424ce3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
fix_typos.patch
ignore.patch
build-fixes.patch
-# disable-tests.patch
-uchar_fix.patch
+gotocc-fix.patch
diff --git a/debian/patches/uchar_fix.patch b/debian/patches/uchar_fix.patch
deleted file mode 100644
index 4167c67..0000000
--- a/debian/patches/uchar_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Patch needed for UCHAR_MAX defintion on mips, powerpc and other
- archs.
-Last-Updated: 2014-07-08
-Forwarded: no
-
-Index: cdo-1.6.4+dfsg.1/libcdi/src/cksum.c
-===================================================================
---- cdo-1.6.4+dfsg.1.orig/libcdi/src/cksum.c
-+++ cdo-1.6.4+dfsg.1/libcdi/src/cksum.c
-@@ -5,6 +5,7 @@
-
- #include <stdlib.h>
- #include <sys/types.h>
-+#include <limits.h>
-
- static const uint32_t crctab[] = {
- 0x00000000,
diff --git a/debian/rules b/debian/rules
index e4a71fc..ee586d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ export DH_VERBOSE=1
DESTDIR:=`pwd`/debian/tmp/
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
-TOPDIR=:=`pwd`
# To enable all, uncomment following line
DEB_BUILD_MAINT_OPTIONS:= hardening=+all
@@ -25,8 +24,6 @@ WITH_JASPER:= --with-jasper=/usr
AS_NEEDED= -Wl,--as-needed
WITH_MAGICS:= --with-magics=/usr
-# export LIBTOOLIZE=true
-
# On powerpc, amd64, arm*, don't do fPIE, only relro
ifeq ($(ARCH), amd64)
export LDFLAGS= -Wl,-z,relro -Wl,-z,now
@@ -88,11 +85,9 @@ override_dh_auto_configure:
--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr --with-proj=/usr $(WITH_HDF5) \
--enable-iso-c-interface \
$(WITH_GRIB) $(WITH_JASPER) $(WITH_MAGICS) FC=gfortran \
- LIBS="-Wl,-Bstatic -lpng -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \
+ LIBS=" -lpng -ljasper -lm -ljpeg -lz -lcurl" \
LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"
- #rm -f libtool libcdi/libtool
- #ln -sf /usr/bin/libtool libtool
- #ln -sf /usr/bin/libtool libcdi/libtool
+ # LIBS="-Wl,-Bstatic -lpng -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl"
override_dh_auto_install:
dh_auto_install
@@ -104,6 +99,6 @@ override_dh_auto_install:
override_dh_auto_test:
# Need to define path to 'cdo' for python tests
- # export PATH=$(PATH):$(TOPDIR)/src make check
+ # export PATH=$(PATH):$(CURDIR)/src make check
#test/Makefile.am:5: error: using '$(top_srcdir)' in TESTS is currently broken: '$(top_srcdir)/test/test_info.py'
@echo "Tests currently disabled"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git
More information about the debian-science-commits
mailing list