[cmor] 186/190: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit 43ebbb7987c4a30bde21f4aaab16c3d85ec231a9
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Jun 24 12:18:15 2014 +0100
refresh patches
---
debian/patches/cmor_ver.patch | 16 ++---
debian/patches/debug-test.patch | 17 -----
debian/patches/destdir.patch | 58 ++++++++--------
debian/patches/fix-makefile.patch | 8 +--
debian/patches/ld-no-add-needed.patch | 17 -----
debian/patches/makefile-fix.patch | 20 +++---
debian/patches/shlib-link.patch | 121 ++++++++++++----------------------
debian/patches/silence-warning.patch | 8 +--
8 files changed, 100 insertions(+), 165 deletions(-)
diff --git a/debian/patches/cmor_ver.patch b/debian/patches/cmor_ver.patch
index 3521019..b131788 100644
--- a/debian/patches/cmor_ver.patch
+++ b/debian/patches/cmor_ver.patch
@@ -3,10 +3,10 @@ Description: Add symbol versioning file.
Last-Updated: 2013-06-11
Forwarded: no
-Index: cmor-2.8.3/cmor.ver
+Index: cmor-2.9.1/cmor.ver
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cmor-2.8.3/cmor.ver 2013-06-13 04:50:16.000000000 +0100
+--- /dev/null
++++ cmor-2.9.1/cmor.ver
@@ -0,0 +1,7 @@
+CMOR_2.0.0 {
+ global:
@@ -15,16 +15,16 @@ Index: cmor-2.8.3/cmor.ver
+ Cd*;
+ local: *;
+};
-Index: cmor-2.8.3/configure.ac
+Index: cmor-2.9.1/configure.ac
===================================================================
---- cmor-2.8.3.orig/configure.ac 2013-06-12 18:03:51.000000000 +0100
-+++ cmor-2.8.3/configure.ac 2013-06-13 04:50:39.000000000 +0100
-@@ -21,7 +21,7 @@
+--- cmor-2.9.1.orig/configure.ac
++++ cmor-2.9.1/configure.ac
+@@ -23,7 +23,7 @@ esac
CMOR_VERSION=${PACKAGE_VERSION}" (commit: ${GIT_TAG})"
AC_PREFIX_DEFAULT([/usr/local/cmor])
-AC_CONFIG_FILES([Makefile setup.py compile_line.txt include/cmor_locale.h])
+AC_CONFIG_FILES([Makefile setup.py compile_line.txt include/cmor_locale.h cmor.pc])
-
INCFILES="include/cmor.h include/cmor_func_def.h include/cmor_md5.h "`ls -x --width=10000 include/cdTime/*.h include/cdTime/cdunifpp/*.h`
+ AC_SUBST(RTAG)
diff --git a/debian/patches/debug-test.patch b/debian/patches/debug-test.patch
index 5891988..587fc91 100644
--- a/debian/patches/debug-test.patch
+++ b/debian/patches/debug-test.patch
@@ -3,20 +3,3 @@ Description: Turn on debugging to work out why it FTBFS on kfreebsd-i386, s390.
Last-Updated: 2010-12-05
Forwarded: no
-Index: cmor-2.8.3/Makefile.in
-===================================================================
---- cmor-2.8.3.orig/Makefile.in 2013-06-10 18:46:10.000000000 +0100
-+++ cmor-2.8.3/Makefile.in 2013-06-10 18:46:10.000000000 +0100
-@@ -111,9 +111,9 @@
- test: cmor test_C @TEST_FORTRAN@ @MAKETESTPYTHON@
- @echo "All C and Fortran Test passed successfully"
- test_C: cmor Tables
-- @rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
-- @rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
-- @rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
-+ rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
-+ rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
-+ rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
- python:
- @echo "Building Python interface"
- @${PYTHONEXEC} setup.py install @CDATPREFIX@
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
index f2723c0..ffa5b7b 100644
--- a/debian/patches/destdir.patch
+++ b/debian/patches/destdir.patch
@@ -3,39 +3,45 @@ Description: Add DESTDIR support for installing.
Last-Updated: 2013-06-11
Forwarded: no
-Index: cmor-2.8.3/Makefile.in
+Index: cmor-2.9.1/Makefile.in
===================================================================
---- cmor-2.8.3.orig/Makefile.in 2013-06-12 14:10:28.000000000 +0100
-+++ cmor-2.8.3/Makefile.in 2013-06-12 15:48:46.000000000 +0100
-@@ -87,14 +87,14 @@
+--- cmor-2.9.1.orig/Makefile.in
++++ cmor-2.9.1/Makefile.in
+@@ -109,17 +109,17 @@ distclean: clean
@echo "Completely cleaning [$(WHEREAMI)]..."
@rm -f $(DISTFILES)
install: cmor
-- mkdir -p @prefix@/lib
-- mkdir -p @prefix@/include
-- mkdir -p @prefix@/include/cdTime
-- mkdir -p @prefix@/include/cdTime/cdunifpp
-- cp -p $(LIBNAME) @prefix@/lib
-- cp -pr include/*.h @MODFILES@ @prefix@/include
-- cp -pr include/cdTime/*.h @prefix@/include/cdTime
-- cp -pr include/cdTime/cdunifpp/*.h @prefix@/include/cdTime/cdunifpp
-+ mkdir -p $(DESTDIR)@prefix@/lib
-+ mkdir -p $(DESTDIR)@prefix@/include
-+ mkdir -p $(DESTDIR)@prefix@/include/cdTime
-+ mkdir -p $(DESTDIR)@prefix@/include/cdTime/cdunifpp
-+ cp -p $(LIBNAME) $(DESTDIR)@prefix@/lib
-+ cp -pr include/*.h @MODFILES@ $(DESTDIR)@prefix@/include
-+ cp -pr include/cdTime/*.h $(DESTDIR)@prefix@/include/cdTime
-+ cp -pr include/cdTime/cdunifpp/*.h $(DESTDIR)@prefix@/include/cdTime/cdunifpp
- install_shlib: $(SONAME)
- mkdir -p $(DESTDIR)@prefix@/lib
- cp -p $(SONAME) $(DESTDIR)@prefix@/lib
-@@ -116,7 +116,7 @@
- rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -lm -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
+- mkdir -p ${PREFIX}/lib
+- mkdir -p ${PREFIX}/include
+- mkdir -p ${PREFIX}/include/cdTime
+- mkdir -p ${PREFIX}/include/cdTime/cdunifpp
+- cp -p $(LIBNAME) ${PREFIX}/lib
+- cp -pr include/*.h @MODFILES@ ${PREFIX}/include
+- cp -pr include/cdTime/*.h ${PREFIX}/include/cdTime
+- cp -pr include/cdTime/cdunifpp/*.h ${PREFIX}/include/cdTime/cdunifpp
+-uninstall: distclean
+- rm ${PREFIX}/lib/$(LIBNAME)
+- cd ${PREFIX} ; rm $(INCFILES)
++ mkdir -p ${DESTDIR}${PREFIX}/lib
++ mkdir -p ${DESTDIR}${PREFIX}/include
++ mkdir -p ${DESTDIR}${PREFIX}/include/cdTime
++ mkdir -p ${DESTDIR}${PREFIX}/include/cdTime/cdunifpp
++ cp -p $(LIBNAME) ${DESTDIR}${PREFIX}/lib
++ cp -pr include/*.h @MODFILES@ ${DESTDIR}${PREFIX}/include
++ cp -pr include/cdTime/*.h ${DESTDIR}${PREFIX}/include/cdTime
++ cp -pr include/cdTime/cdunifpp/*.h ${DESTDIR}${PREFIX}/include/cdTime/cdunifpp
++uninstall: distclean
++ rm ${DESTDIR}${PREFIX}/lib/$(LIBNAME)
++ cd ${DESTDIR}${PREFIX} ; rm $(INCFILES)
+ backup: clean
+ @echo "Creating full backup tar file..."
+ @(cd ..; \
+@@ -136,7 +136,7 @@ test_C: cmor Tables
+ @rm -f test_cat_unique ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_unit_cat_unique.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @LDFLAGS@ -o test_unit_cat_unique @VERB@; ./test_unit_cat_unique @VERB@;
python:
@echo "Building Python interface"
- @${PYTHONEXEC} setup.py install @CDATPREFIX@
+ @${PYTHONEXEC} setup.py install --prefix=${DESTDIR}${PREFIX}
test_a_python:
@echo "${OK_COLOR}Testing ${TEST_NAME} ${NO_COLOR}"
- ${PYTHONEXEC} ${TEST_NAME} @VERB@
+ ${PYTHONEXEC} ${TEST_NAME} ${VERB}
diff --git a/debian/patches/fix-makefile.patch b/debian/patches/fix-makefile.patch
index 6f3251a..f0df3d1 100644
--- a/debian/patches/fix-makefile.patch
+++ b/debian/patches/fix-makefile.patch
@@ -1,8 +1,8 @@
-Index: cmor-2.8.3/Makefile.in
+Index: cmor-2.9.1/Makefile.in
===================================================================
---- cmor-2.8.3.orig/Makefile.in 2013-12-20 01:49:22.000000000 +0000
-+++ cmor-2.8.3/Makefile.in 2013-12-20 01:54:31.000000000 +0000
-@@ -154,8 +154,8 @@
+--- cmor-2.9.1.orig/Makefile.in
++++ cmor-2.9.1/Makefile.in
+@@ -174,8 +174,8 @@ test_python: python
@env TEST_NAME=Test/test_python_joerg_8.py make test_a_python
# @env TEST_NAME=Test/test_python_joerg_9.py make test_a_python
@env TEST_NAME=Test/test_python_joerg_10.py make test_a_python
diff --git a/debian/patches/ld-no-add-needed.patch b/debian/patches/ld-no-add-needed.patch
index 10c6205..56cb604 100644
--- a/debian/patches/ld-no-add-needed.patch
+++ b/debian/patches/ld-no-add-needed.patch
@@ -5,20 +5,3 @@ Forwarded: no
Reviewed-By: Alastair McKinstry <mckinstry at debian.org>
Last-Update: 2010-12-07:wq
-Index: cmor-2.8.3/Makefile.in
-===================================================================
---- cmor-2.8.3.orig/Makefile.in 2013-06-10 18:46:14.000000000 +0100
-+++ cmor-2.8.3/Makefile.in 2013-06-10 18:46:14.000000000 +0100
-@@ -111,9 +111,9 @@
- test: cmor test_C @TEST_FORTRAN@ @MAKETESTPYTHON@
- @echo "All C and Fortran Test passed successfully"
- test_C: cmor Tables
-- rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
-- rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
-- rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
-+ rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -lm -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
-+ rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -lm -o test_grid @VERB@; ./test_grid @VERB@;
-+ rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -lm -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
- python:
- @echo "Building Python interface"
- @${PYTHONEXEC} setup.py install @CDATPREFIX@
diff --git a/debian/patches/makefile-fix.patch b/debian/patches/makefile-fix.patch
index b1ce2a0..30a801e 100644
--- a/debian/patches/makefile-fix.patch
+++ b/debian/patches/makefile-fix.patch
@@ -3,20 +3,20 @@ Description: Need to ensure Tables is made before test_fortran is run
Last-Updated: 2010-10-26
Forwarded: no
-Index: cmor-2.8.3/Makefile.in
+Index: cmor-2.9.1/Makefile.in
===================================================================
---- cmor-2.8.3.orig/Makefile.in 2013-06-10 18:46:06.000000000 +0100
-+++ cmor-2.8.3/Makefile.in 2013-06-10 18:46:06.000000000 +0100
-@@ -110,7 +110,7 @@
+--- cmor-2.9.1.orig/Makefile.in
++++ cmor-2.9.1/Makefile.in
+@@ -129,7 +129,7 @@ backup: clean
@echo "Full backup tar file created : $$TGZNAME")
test: cmor test_C @TEST_FORTRAN@ @MAKETESTPYTHON@
@echo "All C and Fortran Test passed successfully"
-test_C: cmor
-+test_C: cmor Tables
- @rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
- @rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
- @rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
-@@ -191,7 +191,7 @@
++test_C: cmor Tables
+ rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @LDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
+ @rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_grid @LDFLAGS@ @VERB@; ./test_grid @VERB@;
+ @rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @LDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
+@@ -215,7 +215,7 @@ test_case_old_cmor_tables:
ifeq (@MAKEDEPPYTHON@,python)
@env TEST_NAME="Test/check_results.py old_cmor_tables_${TEST_NAME}" make test_a_python
endif
@@ -25,7 +25,7 @@ Index: cmor-2.8.3/Makefile.in
@env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case_old_cmor_tables
@env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy.input" make test_case_old_cmor_tables
@env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case_old_cmor_tables
-@@ -226,7 +226,7 @@
+@@ -250,7 +250,7 @@ test_fortran_old_cmor_tables: cmor
@env TEST_NAME="test_lots_of_variables" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="test_shrt_exp_nm_set_att_initi" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="test_sophie" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
diff --git a/debian/patches/shlib-link.patch b/debian/patches/shlib-link.patch
index 58cbeb2..07fa8d2 100644
--- a/debian/patches/shlib-link.patch
+++ b/debian/patches/shlib-link.patch
@@ -3,124 +3,87 @@ Description: Bugfix to link libcmor.so.2 against -lossp-uuid
Last-Updated: 2013-06-13
Forwarded: no
-Index: cmor-2.8.3/Makefile.in
+Index: cmor-2.9.1/Makefile.in
===================================================================
---- cmor-2.8.3.orig/Makefile.in 2013-06-10 18:18:06.000000000 +0100
-+++ cmor-2.8.3/Makefile.in 2013-06-10 18:45:47.000000000 +0100
-@@ -16,6 +16,8 @@
+--- cmor-2.9.1.orig/Makefile.in
++++ cmor-2.9.1/Makefile.in
+@@ -34,6 +34,8 @@ MACROS=@MACROS@
# Library name
- LIBNAME = libcmor.a
+ LIBNAME=libcmor.a
+SONAME := libcmor.so.2
+SHLIBFLAGS:= -Wl,-O1 -Wl,-soname,$(SONAME) -Wl,--version-script,cmor.ver -lgfortran
# Library sources
- #LIBSOURCES = Src/cmor.c Src/cmor_variables.c Src/cmor_axes.c Src/cmor_tables.c Src/cmor_grids.c Src/cdTime/cdTimeConv.c Src/cdTime/cdUtil.c Src/cdTime/timeConv.c Src/cdTime/timeArith.c
-@@ -30,39 +32,54 @@
+ #LIBSOURCES=Src/cmor.c Src/cmor_variables.c Src/cmor_axes.c Src/cmor_tables.c Src/cmor_grids.c Src/cdTime/cdTimeConv.c Src/cdTime/cdUtil.c Src/cdTime/timeConv.c Src/cdTime/timeArith.c
+@@ -48,39 +50,58 @@ INCFILES=@INCFILES@
# Temporary Files
- TMPFILES = *~ $(LIBFILES) *.mod a.out *.stb Test/*.nc Test/IPCC_Fourth_Assessment *.LOG* *.dSYM Test/IPCC Test/CMIP5 CMIP5
- DISTFILES = libcmor.a
--DEPEND= makedepend -c @DEBUG@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@
-+DEPEND= makedepend -c @DEBUG@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@
+ TMPFILES=*~ $(LIBFILES) *.mod a.out *.stb Test/*.nc Test/IPCC_Fourth_Assessment *.LOG* *.dSYM Test/IPCC Test/CMIP5 CMIP5
+ DISTFILES=libcmor.a
+-DEPEND= makedepend -c ${DEBUG} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}
++DEPEND= makedepend -c ${DEBUG} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}
all: cmor
@echo
+
++
+PIC_OBJS = $(patsubst %.c, %.pic_o, $(LIBSOURCES)) $(patsubst %.f90,%.pic_o, $(LIBFSOURCES))
+
+%.pic_o: %.c
-+ @CC@ @CPPFLAGS@ -I/usr/include/ossp -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -fPIC -c -o $@ @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ $<
++ @CC@ @CPPFLAGS@ -I/usr/include/ossp -fstack-protector --param=ssp-buffer-size=4 \
++ -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 \
++ -fPIC -c -o $@ @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ $<
+
+%.pic_o: %.f90
+ @FC@ -c -o $@ -fPIC @FCFLAGS@ @DEBUG@ @MACROS@ $<
+
-+shlib $(SONAME): $(PIC_OBJS)
++shlib $(SONAME): $(PIC_OBJS)
+ $(CC) -shared -o $(SONAME) $(LDFLAGS) $(SHLIBFLAGS) $(PIC_OBJS) @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@
++install_shlib: $(SONAME)
++ mkdir -p $(DESTDIR)@prefix@/lib
++ cp -p $(SONAME) $(DESTDIR)@prefix@/lib
+
depend: $(LIBSOURCES)
${DEPEND} $(LIBSOURCES)
cmor.o: Src/cmor.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cmor.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor.c
cmor_variables.o: Src/cmor_variables.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_variables.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cmor_variables.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor_variables.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor_variables.c
cmor_axes.o: Src/cmor_axes.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_axes.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cmor_axes.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor_axes.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor_axes.c
cmor_tables.o: Src/cmor_tables.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_tables.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cmor_tables.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor_tables.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor_tables.c
cmor_grids.o: Src/cmor_grids.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_grids.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cmor_grids.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor_grids.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor_grids.c
cmor_md5.o: Src/cmor_md5.c include/cmor.h include/cmor_func_def.h include/cmor_md5.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_md5.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cmor_md5.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor_md5.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor_md5.c
cmor_cfortran_interface.o: Src/cmor_cfortran_interface.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_cfortran_interface.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cmor_cfortran_interface.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor_cfortran_interface.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor_cfortran_interface.c
cdTimeConv.o: Src/cdTime/cdTimeConv.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/cdTimeConv.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cdTime/cdTimeConv.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cdTime/cdTimeConv.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cdTime/cdTimeConv.c
cdUtil.o: Src/cdTime/cdUtil.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/cdUtil.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cdTime/cdUtil.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cdTime/cdUtil.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cdTime/cdUtil.c
timeConv.o: Src/cdTime/timeConv.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/timeConv.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cdTime/timeConv.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cdTime/timeConv.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cdTime/timeConv.c
timeArith.o:Src/cdTime/timeArith.c include/cmor.h include/cmor_func_def.h
-- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/timeArith.c
-+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ Src/cdTime/timeArith.c
+- ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cdTime/timeArith.c
++ ${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS} ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cdTime/timeArith.c
cmor_fortran_interface.o: Src/cmor_fortran_interface.f90
- @FC@ -c @FCFLAGS@ @USERFFLAGS@ @DEBUG@ @MACROS@ Src/cmor_fortran_interface.f90
+ ${FC} -c ${FCFLAGS} ${USERFFLAGS} ${DEBUG} ${MACROS} Src/cmor_fortran_interface.f90
cmor: $(LIBFILES) @MAKEDEPPYTHON@
@ar crv $(LIBNAME) $(LIBFILES)
@ranlib $(LIBNAME)
-+shlib $(SONAME): $(PIC_OBJS)
-+ $(CC) -shared -o $(SONAME) $(SHLIBFLAGS) $(PIC_OBJS) @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@
+
clean:
@echo "Cleaning [$(WHEREAMI)] ..."
@rm -rf $(TMPFILES)
-@@ -78,6 +95,9 @@
- cp -pr include/*.h @MODFILES@ @prefix@/include
- cp -pr include/cdTime/*.h @prefix@/include/cdTime
- cp -pr include/cdTime/cdunifpp/*.h @prefix@/include/cdTime/cdunifpp
-+install_shlib: $(SONAME)
-+ mkdir -p $(DESTDIR)@prefix@/lib
-+ cp -p $(SONAME) $(DESTDIR)@prefix@/lib
- uninstall: distclean
- rm @prefix@/lib/$(LIBNAME)
- cd @prefix@ ; rm $(INCFILES)
-@@ -91,9 +111,9 @@
- test: cmor test_C @TEST_FORTRAN@ @MAKETESTPYTHON@
- @echo "All C and Fortran Test passed successfully"
- test_C: cmor
-- @rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
-- @rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
-- @rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
-+ @rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
-+ @rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
-+ @rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
- python:
- @echo "Building Python interface"
- @${PYTHONEXEC} setup.py install @CDATPREFIX@
-@@ -157,7 +177,7 @@
-
- test_case:
- @echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}"
-- @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @USERFFLAGS@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
-+ @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @USERFFLAGS@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
- @./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
- @ rm ./${TEST_NAME}
- ifeq (@MAKEDEPPYTHON@,python)
-@@ -165,7 +185,7 @@
- endif
- test_case_old_cmor_tables:
- @echo "Testing: "${TEST_NAME}" with input file: "${INPUT_FILE}
-- @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @USERFFLAGS@ @FCFLAGS@ @DEBUG@ Test/old_cmor_tables/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
-+ @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @USERFFLAGS@ @FCFLAGS@ @DEBUG@ Test/old_cmor_tables/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
- @./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
- @ rm ./${TEST_NAME}
- ifeq (@MAKEDEPPYTHON@,python)
diff --git a/debian/patches/silence-warning.patch b/debian/patches/silence-warning.patch
index eefaf5c..fb7e8a9 100644
--- a/debian/patches/silence-warning.patch
+++ b/debian/patches/silence-warning.patch
@@ -1,8 +1,8 @@
-Index: cmor-2.8.3/Lib/__init__.py
+Index: cmor-2.9.1/Lib/__init__.py
===================================================================
---- cmor-2.8.3.orig/Lib/__init__.py 2013-12-20 01:43:03.000000000 +0000
-+++ cmor-2.8.3/Lib/__init__.py 2013-12-20 01:44:43.000000000 +0000
-@@ -3,7 +3,11 @@
+--- cmor-2.9.1.orig/Lib/__init__.py
++++ cmor-2.9.1/Lib/__init__.py
+@@ -3,7 +3,11 @@ from cmor_const import *
from pywrapper import axis,variable,write,setup,load_table,dataset,set_table,zfactor,close,grid,set_grid_mapping,time_varying_grid_coordinate,set_cur_dataset_attribute,get_cur_dataset_attribute,has_cur_dataset_attribute,create_output_path,set_variable_attribute,get_variable_attribute,has_variable_attribute
try:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list