[cmor] 06/22: refresh patches

[Alastair McKinstry]

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

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

commit e39d054b2f247a4ac997e97bff8e8205d68df0e9
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Sep 14 17:51:08 2016 +0100

    refresh patches
---
 debian/patches/cmor_ver.patch     | 10 +++++-----
 debian/patches/destdir.patch      | 25 ++++++++++++++-----------
 debian/patches/makefile-fix.patch | 10 +++++-----
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/debian/patches/cmor_ver.patch b/debian/patches/cmor_ver.patch
index a5d1824..5291bb0 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-3.1/cmor.ver
+Index: cmor-3.1.2/cmor.ver
 ===================================================================
 --- /dev/null
-+++ cmor-3.1/cmor.ver
++++ cmor-3.1.2/cmor.ver
 @@ -0,0 +1,7 @@
 +CMOR_2.0.0 {
 +        global: 
@@ -15,10 +15,10 @@ Index: cmor-3.1/cmor.ver
 +                Cd*;
 +        local: *;
 +};
-Index: cmor-3.1/configure.ac
+Index: cmor-3.1.2/configure.ac
 ===================================================================
---- cmor-3.1.orig/configure.ac
-+++ cmor-3.1/configure.ac
+--- cmor-3.1.2.orig/configure.ac
++++ cmor-3.1.2/configure.ac
 @@ -23,7 +23,7 @@ esac
  CMOR_VERSION=${PACKAGE_VERSION}" (commit: ${GIT_TAG})"
  
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
index 9979daf..7e97197 100644
--- a/debian/patches/destdir.patch
+++ b/debian/patches/destdir.patch
@@ -3,40 +3,43 @@ Description: Add DESTDIR support for installing.
 Last-Updated: 2013-06-11
 Forwarded: no
 
-Index: cmor-3.1/Makefile.in
+Index: cmor-3.1.2/Makefile.in
 ===================================================================
---- cmor-3.1.orig/Makefile.in
-+++ cmor-3.1/Makefile.in
-@@ -129,17 +129,17 @@ distclean: clean
+--- cmor-3.1.2.orig/Makefile.in
++++ cmor-3.1.2/Makefile.in
+@@ -130,19 +130,19 @@ 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/json-c
 -	mkdir -p ${PREFIX}/include/cdTime/cdunifpp
 -	cp -p $(LIBNAME) ${PREFIX}/lib
 -	cp -pr include/*.h @MODFILES@ ${PREFIX}/include
+-	cp -pr include/json-c/*.h ${PREFIX}/include/json-c
 -	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/json-c
 +	mkdir -p ${DESTDIR}${PREFIX}/include/cdTime/cdunifpp
 +	cp -p $(LIBNAME) ${DESTDIR}${PREFIX}/lib
 +	cp -pr include/*.h @MODFILES@ ${DESTDIR}${PREFIX}/include
++	cp -pr include/json-c/*.h ${DESTDIR}${PREFIX}/include/json-c
 +	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)
+ uninstall: distclean 
+-	rm ${PREFIX}/lib/$(LIBNAME)    
+-	cd ${PREFIX} ; rm $(INCFILES)  
++	rm ${DESTDIR}${PREFIX}/lib/$(LIBNAME)    
++	cd ${DESTDIR}${PREFIX} ; rm $(INCFILES)  
  backup: clean
  	@echo "Creating full backup tar file..."
  	@(cd ..; \
-@@ -156,7 +156,7 @@ test_C: cmor
+@@ -159,7 +159,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"
diff --git a/debian/patches/makefile-fix.patch b/debian/patches/makefile-fix.patch
index 5726ed6..6bf7863 100644
--- a/debian/patches/makefile-fix.patch
+++ b/debian/patches/makefile-fix.patch
@@ -3,11 +3,11 @@ Description: Need to ensure Tables is made before test_fortran is run
 Last-Updated: 2010-10-26
 Forwarded: no
 
-Index: cmor-3.1/Makefile.in
+Index: cmor-3.1.2/Makefile.in
 ===================================================================
---- cmor-3.1.orig/Makefile.in
-+++ cmor-3.1/Makefile.in
-@@ -236,7 +236,7 @@ test_case_old_cmor_tables:
+--- cmor-3.1.2.orig/Makefile.in
++++ cmor-3.1.2/Makefile.in
+@@ -239,7 +239,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
@@ -16,7 +16,7 @@ Index: cmor-3.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
-@@ -272,7 +272,7 @@ test_fortran_old_cmor_tables: cmor
+@@ -275,7 +275,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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git