[cmor] 01/22: refresh patches

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Dec 20 11:10:34 UTC 2016 

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit 079bd86a01d666148ec9fe7b3f63841e5ce9f774
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Aug 8 09:33:38 2016 +0100

    refresh patches
---
 debian/patches/cmor_ver.patch         | 12 ++---
 debian/patches/debug-test.patch       |  5 --
 debian/patches/destdir.patch          | 12 ++---
 debian/patches/ld-no-add-needed.patch |  7 ---
 debian/patches/makefile-fix.patch     | 19 ++-----
 debian/patches/pkgconfig.patch        | 14 +++---
 debian/patches/series                 |  2 -
 debian/patches/shlib-link.patch       | 93 ++++++++++++++++++++++++++++++-----
 8 files changed, 104 insertions(+), 60 deletions(-)

diff --git a/debian/patches/cmor_ver.patch b/debian/patches/cmor_ver.patch
index b131788..a5d1824 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.9.1/cmor.ver
+Index: cmor-3.1/cmor.ver
 ===================================================================
 --- /dev/null
-+++ cmor-2.9.1/cmor.ver
++++ cmor-3.1/cmor.ver
 @@ -0,0 +1,7 @@
 +CMOR_2.0.0 {
 +        global: 
@@ -15,10 +15,10 @@ Index: cmor-2.9.1/cmor.ver
 +                Cd*;
 +        local: *;
 +};
-Index: cmor-2.9.1/configure.ac
+Index: cmor-3.1/configure.ac
 ===================================================================
---- cmor-2.9.1.orig/configure.ac
-+++ cmor-2.9.1/configure.ac
+--- cmor-3.1.orig/configure.ac
++++ cmor-3.1/configure.ac
 @@ -23,7 +23,7 @@ esac
  CMOR_VERSION=${PACKAGE_VERSION}" (commit: ${GIT_TAG})"
  
@@ -26,5 +26,5 @@ Index: cmor-2.9.1/configure.ac
 -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`
+ INCFILES="include/cmor.h include/cmor_func_def.h include/cmor_md5.h `ls include/cdTime/*.h include/cdTime/cdunifpp/*.h include/json-c/*.h | tr \"\n\" \" \" `"
  AC_SUBST(RTAG)
diff --git a/debian/patches/debug-test.patch b/debian/patches/debug-test.patch
deleted file mode 100644
index 587fc91..0000000
--- a/debian/patches/debug-test.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Turn on debugging to work out why it FTBFS on kfreebsd-i386, s390.
-Last-Updated: 2010-12-05
-Forwarded: no
-
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
index ffa5b7b..9979daf 100644
--- a/debian/patches/destdir.patch
+++ b/debian/patches/destdir.patch
@@ -3,11 +3,11 @@ Description: Add DESTDIR support for installing.
 Last-Updated: 2013-06-11
 Forwarded: no
 
-Index: cmor-2.9.1/Makefile.in
+Index: cmor-3.1/Makefile.in
 ===================================================================
---- cmor-2.9.1.orig/Makefile.in
-+++ cmor-2.9.1/Makefile.in
-@@ -109,17 +109,17 @@ distclean: clean
+--- cmor-3.1.orig/Makefile.in
++++ cmor-3.1/Makefile.in
+@@ -129,17 +129,17 @@ distclean: clean
  	@echo "Completely cleaning [$(WHEREAMI)]..."
  	@rm -f $(DISTFILES)
  install: cmor
@@ -36,8 +36,8 @@ Index: cmor-2.9.1/Makefile.in
  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@;
+@@ -156,7 +156,7 @@ test_C: cmor
+ 	@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@ @UUIDLDFLAGS@ @LDFLAGS@ -o test_unit_cat_unique @VERB@; ./test_unit_cat_unique @VERB@;
  python:
  	@echo "Building Python interface"
 -	@${PYTHONEXEC} setup.py install @CDATPREFIX@
diff --git a/debian/patches/ld-no-add-needed.patch b/debian/patches/ld-no-add-needed.patch
deleted file mode 100644
index 56cb604..0000000
--- a/debian/patches/ld-no-add-needed.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: Fix ld --as-needed failure to build
-Origin: Ubuntu, Matthias Klose.
-Bug-Debian: http://bugs.debian.org/606210
-Forwarded: no
-Reviewed-By: Alastair McKinstry <mckinstry at debian.org>
-Last-Update: 2010-12-07:wq
-
diff --git a/debian/patches/makefile-fix.patch b/debian/patches/makefile-fix.patch
index 30a801e..5726ed6 100644
--- a/debian/patches/makefile-fix.patch
+++ b/debian/patches/makefile-fix.patch
@@ -3,20 +3,11 @@ Description: Need to ensure Tables is made before test_fortran is run
 Last-Updated: 2010-10-26
 Forwarded: no
 
-Index: cmor-2.9.1/Makefile.in
+Index: cmor-3.1/Makefile.in
 ===================================================================
---- 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@ @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:
+--- cmor-3.1.orig/Makefile.in
++++ cmor-3.1/Makefile.in
+@@ -236,7 +236,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 +16,7 @@ Index: cmor-2.9.1/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
-@@ -250,7 +250,7 @@ test_fortran_old_cmor_tables: cmor
+@@ -272,7 +272,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/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 181e2a4..bb7c165 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: Add FFlags, includedir, fix for directories needed for C;
 Last-Updated: 2013-06-10
 Forwarded: no
 
-Index: cmor-2.8.3/cmor.pc.in
+Index: cmor-3.1/cmor.pc.in
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ cmor-2.8.3/cmor.pc.in	2013-06-10 18:45:57.000000000 +0100
+--- /dev/null
++++ cmor-3.1/cmor.pc.in
 @@ -0,0 +1,13 @@
 +prefix=@prefix@
 +exec_prefix=${prefix}
@@ -21,11 +21,11 @@ Index: cmor-2.8.3/cmor.pc.in
 +CFlags: -I${prefix}/include 
 +CFlags: -I${includedir} -I${includedir}/cdTime
 +Requires:  udunits netcdf ossp-uuid
-Index: cmor-2.8.3/configure.ac
+Index: cmor-3.1/configure.ac
 ===================================================================
---- cmor-2.8.3.orig/configure.ac	2013-06-10 18:45:57.000000000 +0100
-+++ cmor-2.8.3/configure.ac	2013-06-10 18:45:57.000000000 +0100
-@@ -178,7 +178,7 @@
+--- cmor-3.1.orig/configure.ac
++++ cmor-3.1/configure.ac
+@@ -182,7 +182,7 @@ if [ test ${with_uuidb} != "-yes" ] ; th
      UUIDFLAGS=""
    fi
  else
diff --git a/debian/patches/series b/debian/patches/series
index 874e2e2..492a5c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
-# clean.patch
 shlib-link.patch
 pkgconfig.patch
 makefile-fix.patch
-# ld-no-add-needed.patch
 destdir.patch
 cmor_ver.patch
 # python3.patch
diff --git a/debian/patches/shlib-link.patch b/debian/patches/shlib-link.patch
index 07fa8d2..2a2ef61 100644
--- a/debian/patches/shlib-link.patch
+++ b/debian/patches/shlib-link.patch
@@ -3,11 +3,16 @@ Description: Bugfix to link libcmor.so.2 against -lossp-uuid
 Last-Updated: 2013-06-13
 Forwarded: no
 
-Index: cmor-2.9.1/Makefile.in
+Index: cmor-3.1/Makefile.in
 ===================================================================
---- cmor-2.9.1.orig/Makefile.in
-+++ cmor-2.9.1/Makefile.in
-@@ -34,6 +34,8 @@ MACROS=@MACROS@
+--- cmor-3.1.orig/Makefile.in
++++ cmor-3.1/Makefile.in
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ FC=@FC@
+ CC=@CC@
+ CFLAGS=@CFLAGS@
+@@ -34,6 +33,8 @@ MACROS=@MACROS@
  
  # Library name
  LIBNAME=libcmor.a
@@ -15,8 +20,8 @@ Index: cmor-2.9.1/Makefile.in
 +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
-@@ -48,39 +50,58 @@ INCFILES=@INCFILES@
+ LIBSOURCES=@LIBSOURCES@
+@@ -47,58 +48,75 @@ 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
@@ -26,7 +31,6 @@ Index: cmor-2.9.1/Makefile.in
  all:    cmor
  	@echo
 +
-+
 +PIC_OBJS = $(patsubst %.c, %.pic_o, $(LIBSOURCES)) $(patsubst %.f90,%.pic_o, $(LIBFSOURCES))
 +
 +%.pic_o: %.c
@@ -60,6 +64,9 @@ Index: cmor-2.9.1/Makefile.in
  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
+ cmor_CV.o: Src/cmor_CV.c include/cmor.h include/cmor_func_def.h 
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS} Src/cmor_CV.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS} Src/cmor_CV.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
@@ -78,12 +85,72 @@ Index: cmor-2.9.1/Makefile.in
  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
+ arraylist.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/arraylist.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/arraylist.c
+ debug.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/debug.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/debug.c
+ json_c_version.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/json_c_version.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/json_c_version.c
+ json_object.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/json_object.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/json_object.c
+ json_object_iterator.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/json_object_iterator.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/json_object_iterator.c
+ json_tokener.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/json_tokener.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/json_tokener.c
+ json_util.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/json_util.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/json_util.c
+ libjson.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/libjson.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/libjson.c
+ linkhash.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/linkhash.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/linkhash.c
+ printbuf.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/printbuf.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/printbuf.c
+ random_seed.o:Src/json-c/
+-	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDFLAGS} ${ZFLAGS}  Src/json-c/random_seed.c
++	${CC} -c ${DEBUG} ${MACROS} ${CFLAGS} ${USERCFLAGS}  ${NCCFLAGS} ${UDUNITS2FLAGS} ${UUIDLDFLAGS} ${ZFLAGS}  Src/json-c/random_seed.c
  cmor_fortran_interface.o: 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)
-+
- clean:
- 	@echo "Cleaning [$(WHEREAMI)] ..."
- 	@rm -rf $(TMPFILES)
+@@ -132,10 +150,10 @@ backup: clean
+ 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@ @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@;
+-	@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@;
++	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@ @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@ @UUIDLDFLAGS@ -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@ @UUIDLDFLAGS@ @LDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
++	@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@ @UUIDLDFLAGS@ @LDFLAGS@ -o test_unit_cat_unique @VERB@; ./test_unit_cat_unique @VERB@;
+ python:
+ 	@echo "Building Python interface"
+ 	@${PYTHONEXEC} setup.py install @CDATPREFIX@
+@@ -204,7 +222,7 @@ test_python: python
+ 
+ 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${PREFIX}/lib -L. -lcmor ${NCCFLAGS} ${FNCLDFLAGS} ${FUDUNITS2LDFLAGS} ${UDUNITS2FLAGS} ${FUUIDLDFLAGS} ${UUIDFLAGS} ${ZFLAGS} ${FZLDFLAGS} -o ${TEST_NAME} ;
++	@rm -f ./${TEST_NAME} 2>/dev/null ; ${FC} ${USERFFLAGS} ${FCFLAGS} ${DEBUG}  Test/${TEST_NAME}.f90 -L${PREFIX}/lib -L. -lcmor ${NCCFLAGS} ${FNCLDFLAGS} ${FUDUNITS2LDFLAGS} ${UDUNITS2FLAGS} ${FUUIDLDFLAGS} ${UUIDLDFLAGS} ${ZFLAGS} ${FZLDFLAGS} -o ${TEST_NAME} ;
+ 	@./${TEST_NAME} ${VERB} < ${INPUT_FILE} ;
+ 	@ rm ./${TEST_NAME}
+ ifeq (@MAKEDEPPYTHON@,python)
+@@ -212,7 +230,7 @@ ifeq (@MAKEDEPPYTHON@,python)
+ 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${PREFIX}/lib -L. -lcmor ${NCCFLAGS} ${FNCLDFLAGS} ${FUDUNITS2LDFLAGS} ${UDUNITS2FLAGS} ${FUUIDLDFLAGS} ${UUIDFLAGS} ${ZFLAGS} ${FZLDFLAGS} -o ${TEST_NAME} ;
++	@rm -f ./${TEST_NAME} 2>/dev/null ; ${FC} ${USERFFLAGS} ${FCFLAGS} ${DEBUG}  Test/old_cmor_tables/${TEST_NAME}.f90 -L${PREFIX}/lib -L. -lcmor ${NCCFLAGS} ${FNCLDFLAGS} ${FUDUNITS2LDFLAGS} ${UDUNITS2FLAGS} ${FUUIDLDFLAGS} ${UUIDLDFLAGS} ${ZFLAGS} ${FZLDFLAGS} -o ${TEST_NAME} ;
+ 	@./${TEST_NAME} ${VERB} < ${INPUT_FILE} ;
+ 	@ rm ./${TEST_NAME}
+ ifeq (@MAKEDEPPYTHON@,python)

-- 
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