[cmor] 136/190: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:47 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 9c8302791b8c025551b0dc0dad1720674803d7a3
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 10 18:50:36 2013 +0100
refresh patches
---
debian/patches/debug-test.patch | 8 ++++----
debian/patches/destdir.patch | 12 ++++++------
debian/patches/ld-no-add-needed.patch | 8 ++++----
debian/patches/makefile-fix.patch | 12 ++++++------
debian/patches/pkgconfig.patch | 10 +++++-----
debian/patches/shlib-link.patch | 33 ++++++++++++++++++++++++++-------
6 files changed, 51 insertions(+), 32 deletions(-)
diff --git a/debian/patches/debug-test.patch b/debian/patches/debug-test.patch
index 67869d6..5891988 100644
--- a/debian/patches/debug-test.patch
+++ b/debian/patches/debug-test.patch
@@ -3,11 +3,11 @@ 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.2/Makefile.in
+Index: cmor-2.8.3/Makefile.in
===================================================================
---- cmor-2.8.2.orig/Makefile.in 2013-06-10 16:45:11.000000000 +0100
-+++ cmor-2.8.2/Makefile.in 2013-06-10 16:45:40.000000000 +0100
-@@ -106,9 +106,9 @@
+--- 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
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
index 5c2f958..9e8fa8f 100644
--- a/debian/patches/destdir.patch
+++ b/debian/patches/destdir.patch
@@ -5,9 +5,9 @@ Forwarded: no
Index: cmor-2.8.3/Makefile.in
===================================================================
---- cmor-2.8.3.orig/Makefile.in 2013-06-10 17:50:32.000000000 +0100
-+++ cmor-2.8.3/Makefile.in 2013-06-10 18:13:49.000000000 +0100
-@@ -85,14 +85,14 @@
+--- cmor-2.8.3.orig/Makefile.in 2013-06-10 18:46:27.000000000 +0100
++++ cmor-2.8.3/Makefile.in 2013-06-10 18:47:10.000000000 +0100
+@@ -87,14 +87,14 @@
@echo "Completely cleaning [$(WHEREAMI)]..."
@rm -f $(DISTFILES)
install: cmor
@@ -27,6 +27,6 @@ Index: cmor-2.8.3/Makefile.in
+ 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 @prefix@/lib/$(LIBNAME)
- cd @prefix@ ; rm $(INCFILES)
+ install_shlib: $(SONAME)
+ mkdir -p $(DESTDIR)@prefix@/lib
+ cp -p $(SONAME) $(DESTDIR)@prefix@/lib
diff --git a/debian/patches/ld-no-add-needed.patch b/debian/patches/ld-no-add-needed.patch
index 9d1e35b..10c6205 100644
--- a/debian/patches/ld-no-add-needed.patch
+++ b/debian/patches/ld-no-add-needed.patch
@@ -5,11 +5,11 @@ Forwarded: no
Reviewed-By: Alastair McKinstry <mckinstry at debian.org>
Last-Update: 2010-12-07:wq
-Index: cmor-2.8.2/Makefile.in
+Index: cmor-2.8.3/Makefile.in
===================================================================
---- cmor-2.8.2.orig/Makefile.in 2013-06-10 16:45:50.000000000 +0100
-+++ cmor-2.8.2/Makefile.in 2013-06-10 16:48:00.000000000 +0100
-@@ -106,9 +106,9 @@
+--- 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
diff --git a/debian/patches/makefile-fix.patch b/debian/patches/makefile-fix.patch
index bbddffd..b1ce2a0 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-2.8.2/Makefile.in
+Index: cmor-2.8.3/Makefile.in
===================================================================
---- cmor-2.8.2.orig/Makefile.in 2013-06-10 16:43:14.000000000 +0100
-+++ cmor-2.8.2/Makefile.in 2013-06-10 16:43:58.000000000 +0100
-@@ -105,7 +105,7 @@
+--- 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 @@
@echo "Full backup tar file created : $$TGZNAME")
test: cmor test_C @TEST_FORTRAN@ @MAKETESTPYTHON@
@echo "All C and Fortran Test passed successfully"
@@ -16,7 +16,7 @@ Index: cmor-2.8.2/Makefile.in
@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@;
-@@ -186,7 +186,7 @@
+@@ -191,7 +191,7 @@
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.2/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
-@@ -221,7 +221,7 @@
+@@ -226,7 +226,7 @@
@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 e011a80..181e2a4 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.2/cmor.pc.in
+Index: cmor-2.8.3/cmor.pc.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cmor-2.8.2/cmor.pc.in 2013-06-10 16:56:47.000000000 +0100
++++ cmor-2.8.3/cmor.pc.in 2013-06-10 18:45:57.000000000 +0100
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=${prefix}
@@ -21,10 +21,10 @@ Index: cmor-2.8.2/cmor.pc.in
+CFlags: -I${prefix}/include
+CFlags: -I${includedir} -I${includedir}/cdTime
+Requires: udunits netcdf ossp-uuid
-Index: cmor-2.8.2/configure.ac
+Index: cmor-2.8.3/configure.ac
===================================================================
---- cmor-2.8.2.orig/configure.ac 2012-12-31 11:54:53.000000000 +0000
-+++ cmor-2.8.2/configure.ac 2013-06-10 17:20:57.000000000 +0100
+--- 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 @@
UUIDFLAGS=""
fi
diff --git a/debian/patches/shlib-link.patch b/debian/patches/shlib-link.patch
index ea5bc2a..6710ed8 100644
--- a/debian/patches/shlib-link.patch
+++ b/debian/patches/shlib-link.patch
@@ -3,11 +3,20 @@ Description: Bugfix to link libcmor.so.2 against -lossp-uuid
Last-Updated: 2010-10-14
Forwarded: no
-Index: cmor-2.8.2/Makefile.in
+Index: cmor-2.8.3/Makefile.in
===================================================================
---- cmor-2.8.2.orig/Makefile.in 2012-12-31 11:54:53.000000000 +0000
-+++ cmor-2.8.2/Makefile.in 2013-06-10 16:42:22.000000000 +0100
-@@ -30,39 +30,54 @@
+--- 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 @@
+
+ # Library name
+ 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 @@
# Temporary Files
TMPFILES = *~ $(LIBFILES) *.mod a.out *.stb Test/*.nc Test/IPCC_Fourth_Assessment *.LOG* *.dSYM Test/IPCC Test/CMIP5 CMIP5
DISTFILES = libcmor.a
@@ -74,7 +83,17 @@ Index: cmor-2.8.2/Makefile.in
clean:
@echo "Cleaning [$(WHEREAMI)] ..."
@rm -rf $(TMPFILES)
-@@ -91,9 +106,9 @@
+@@ -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
@@ -87,7 +106,7 @@ Index: cmor-2.8.2/Makefile.in
python:
@echo "Building Python interface"
@${PYTHONEXEC} setup.py install @CDATPREFIX@
-@@ -157,7 +172,7 @@
+@@ -157,7 +177,7 @@
test_case:
@echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}"
@@ -96,7 +115,7 @@ Index: cmor-2.8.2/Makefile.in
@./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
@ rm ./${TEST_NAME}
ifeq (@MAKEDEPPYTHON@,python)
-@@ -165,7 +180,7 @@
+@@ -165,7 +185,7 @@
endif
test_case_old_cmor_tables:
@echo "Testing: "${TEST_NAME}" with input file: "${INPUT_FILE}
--
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