[cmor] 134/190: Add debian branch
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 15d7048ed1effc212a5a41831c70bbf069c132c6
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 10 17:50:22 2013 +0100
Add debian branch
---
debian/changelog | 195 ++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 49 +++++++
debian/copyright | 16 +++
debian/libcmor-dev.docs | 1 +
debian/libcmor-dev.examples | 1 +
debian/libcmor-dev.install | 2 +
debian/libcmor2.dirs | 2 +
debian/patches/clean.patch | 21 +++
debian/patches/debug-test.patch | 22 +++
debian/patches/explicit-tests.patch | 257 ++++++++++++++++++++++++++++++++++
debian/patches/ld-no-add-needed.patch | 24 ++++
debian/patches/makefile-fix.patch | 36 +++++
debian/patches/pkgconfig.patch | 36 +++++
debian/patches/series | 6 +
debian/patches/shlib-link.patch | 107 ++++++++++++++
debian/rules | 47 +++++++
debian/source/format | 1 +
18 files changed, 824 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2cc3990
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,195 @@
+cmor (2.8.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Depend on debhelper >=9 now. Remove lintian override.
+ * Enable hardening.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 31 Dec 2012 11:57:20 +0000
+
+cmor (2.8.0-3) unstable; urgency=low
+
+ * Drop reference to upstream git repo for now. Closes: #661325
+ * Fix broken symlink libcmor.so. Closes: #681891
+ * Don't run test suite on kfreebsd-i386 as the buildds typically don't
+ have DFLSIZ set high enough. Closes: #598745.
+ * Standards-Version: 3.9.3
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 09 Sep 2012 13:56:03 +0100
+
+cmor (2.8.0-2) unstable; urgency=low
+
+ * Add lintian override for DH 9 without versioned depends.
+ * Remove libcmor2.install that adds incorrect double copy of library.
+ Closes: #650387.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 04 Feb 2012 16:33:01 +0000
+
+cmor (2.8.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 27 Nov 2011 14:35:02 +0000
+
+cmor (2.7.1-4) unstable; urgency=low
+
+ * Add Multiarch support.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 01 Oct 2011 13:24:48 +0100
+
+cmor (2.7.1-3) unstable; urgency=low
+
+ * Add dh_numpy call to get versioned depends on numpy. Closes: #641791.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 16 Sep 2011 14:03:07 +0100
+
+cmor (2.7.1-2) unstable; urgency=low
+
+ * Use python2 instead of python-central (and python-support)
+ Closes: #616778.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 16 Sep 2011 14:03:07 +0100
+
+cmor (2.7.1-1) unstable; urgency=low
+
+ * New upstream release. (Minor debugging statements removed).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 03 Jul 2011 18:24:50 +0100
+
+cmor (2.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 21 Jun 2011 17:00:17 +0100
+
+cmor (2.6.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 14 Jun 2011 10:39:10 +0100
+
+cmor (2.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 07 Jun 2011 09:36:53 +0100
+
+cmor (2.5.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * Recommend latest cmip5 tables. (1.3.9).
+ * Standards-Version : 3.9.2
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 28 Apr 2011 10:19:48 +0100
+
+cmor (2.5.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 12 Apr 2011 09:41:12 +0100
+
+cmor (2.5.7-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 25 Feb 2011 23:24:49 +0000
+
+cmor (2.5.5-1) unstable; urgency=low
+
+ * New upstream release, fixing MPI issue.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 17 Feb 2011 09:33:18 +0000
+
+cmor (2.5.4-1) unstable; urgency=low
+
+ * New upstream release, fixing memory issue in python module.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 03 Feb 2011 15:42:41 +0000
+
+cmor (2.5.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add Recommends: cmip5-cmor-tables to libcmor2
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 01 Feb 2011 09:51:35 +0000
+
+cmor (2.5.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 24 Dec 2010 15:17:40 +0000
+
+cmor (2.5.1-2) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * Fix build failure with ld --no-add-needed. Closes: #606210.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 07 Dec 2010 19:23:17 +0000
+
+cmor (2.5.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added debug-test.patch to help debug FTFBS on s390, kfreebsd-*
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 05 Dec 2010 15:16:25 +0000
+
+cmor (2.5.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 13 Nov 2010 15:15:27 +0000
+
+cmor (2.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Minor patch to ensure Tables is created for tests to run.
+ * Build-Conflict: libcmor2. Package may fail to build in strange ways if
+ a pre-existing version of the library is present.
+ * Update Git server; its moved.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 29 Oct 2010 07:20:46 +0100
+
+cmor (2.3.0-2) unstable; urgency=low
+
+ * --enable-netcdf-4 not a valid option; remove. Just use autodetection.
+ * libcmor.so.2 should be linked against -lossp-uuid;
+ * Add -I${includedir}/cdTime to CFlags in cmor.pc
+ * Add FFlags variable to cmor.pc for Fortran.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 12 Oct 2010 00:24:35 +0100
+
+cmor (2.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 08 Oct 2010 06:28:20 +0100
+
+cmor (2.2.1-1) unstable; urgency=low
+
+ * New Upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 17 Sep 2010 14:20:15 +0100
+
+cmor (2.2.0-2) unstable; urgency=low
+
+ * Include automake dependency; autoconf not needed. Closes: #592097.
+ * gfortran, python-numpy b-deps needed for python functionality.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 31 Aug 2010 18:40:03 +0100
+
+cmor (2.2.0-1) unstable; urgency=low
+
+ * Upstream release 2.2.0.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 25 Aug 2010 19:16:37 +0100
+
+cmor (2.0~rc10-2) unstable; urgency=low
+
+ * Add autoconf as build-dependency. Closes: #591932.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 06 Aug 2010 18:05:36 +0100
+
+cmor (2.0~rc10-1) unstable; urgency=low
+
+ * Initial release. (Closes: #584636).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 29 Jul 2010 10:50:58 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..ea01ccc
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,49 @@
+Source: cmor
+Section: utils
+Priority: extra
+Maintainer: Alastair McKinstry <mckinstry at debian.org>
+Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev, libudunits2-dev, libnetcdf-dev, uuid-dev, python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), libgfortran3, automake, python-numpy, gfortran
+Build-Conflicts: libcmor2
+Standards-Version: 3.9.4
+Homepage: http://www2-pcmdi.llnl.gov/cmor
+
+Package: libcmor2
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: cmip5-cmor-tables (>= 1.3.9-1)
+Description: Climate Model Output Rewriter library
+ The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour")
+ comprises a set of C-based functions, with bindings to both python
+ and FORTRAN 90, that can be used to produce CF-compliant netCDF files
+ that fulfill the requirements of many of the climate community's
+ standard model experiments. These experiments are collectively
+ referred to as MIP's and include, for example, AMIP, CMIP, CFMIP,
+ PMIP, APE, and IPCC scenario runs. The output resulting from CMOR
+ is "self-describing" and facilitates analysis of results across models.
+
+Package: libcmor-dev
+Section: libdevel
+Architecture: any
+Depends: libcmor2 ( = ${binary:Version}), ${misc:Depends}
+Recommends: pkg-config
+Description: Development files for Climate Model Output Rewriter
+ The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour")
+ comprises a set of C-based functions, with bindings to both python
+ and FORTRAN 90, that can be used to produce CF-compliant netCDF files
+ that fulfill the requirements of many of the climate community's
+ standard model experiments. These experiments are collectively
+ referred to as MIP's and include, for example, AMIP, CMIP, CFMIP,
+ PMIP, APE, and IPCC scenario runs. The output resulting from CMOR
+ is "self-describing" and facilitates analysis of results across models.
+
+Package: python-cmor
+Section: python
+Architecture: any
+Multi-Arch: foreign
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
+Description: python interface to CMOR
+ This is a python interface to CMOR, the Climate Model Output Rewriter.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..86d53ad
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,16 @@
+CMOR2 was downloaded from PCDMI at: http://www2-pcmdi.llnl.gov/cmor, April 25, 2010,
+and packaged for Debian by Alastair McKinstry <mckinstry at debian.org>.
+
+CMOR is available for unrestricted release as explained below by PCDMI Legal staff:
+
+Copyright (c) 2010-2011, Lawrence Livermore National Security, LLC.
+
+Dear Alistair,
+
+Dean tells me that you also are interested in distributing CMOR as well as CDAT. CMOR is approved for unrestricted release which is not an official open source license, but from our institution’s perspective we are supportive of it being included in your Debian distribution along with CDAT. I will be happy to work with you to achieve this. Feel free to call me at 925 422 3538 if you would like to discuss it by phone. All the best, Leah
+
+Leah Rogers
+
+Business Development Executive
+Industrial Partnerships Office
+Lawrence Livermore National Laboratory
diff --git a/debian/libcmor-dev.docs b/debian/libcmor-dev.docs
new file mode 100644
index 0000000..7762be7
--- /dev/null
+++ b/debian/libcmor-dev.docs
@@ -0,0 +1 @@
+Doc/*
diff --git a/debian/libcmor-dev.examples b/debian/libcmor-dev.examples
new file mode 100644
index 0000000..cd56ec1
--- /dev/null
+++ b/debian/libcmor-dev.examples
@@ -0,0 +1 @@
+Test/*
diff --git a/debian/libcmor-dev.install b/debian/libcmor-dev.install
new file mode 100644
index 0000000..3a09fc1
--- /dev/null
+++ b/debian/libcmor-dev.install
@@ -0,0 +1,2 @@
+/usr/include/* usr/include
+
diff --git a/debian/libcmor2.dirs b/debian/libcmor2.dirs
new file mode 100644
index 0000000..3266411
--- /dev/null
+++ b/debian/libcmor2.dirs
@@ -0,0 +1,2 @@
+/usr/share/cmor/Tables
+/usr/share/cmor/Tables_csv
diff --git a/debian/patches/clean.patch b/debian/patches/clean.patch
new file mode 100644
index 0000000..216d492
--- /dev/null
+++ b/debian/patches/clean.patch
@@ -0,0 +1,21 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: clean up more fully.
+Last-Updated: 2010-07-29
+Forwarded: no
+
+Index: cmor-2.0/Makefile.in
+===================================================================
+--- cmor-2.0.orig/Makefile.in 2010-07-29 10:38:27.000000000 +0100
++++ cmor-2.0/Makefile.in 2010-07-29 10:39:28.000000000 +0100
+@@ -28,8 +28,9 @@
+ INCFILES = @INCFILES@
+
+ # Temporary Files
+-TMPFILES = *~ $(LIBFILES) *.mod a.out *.stb Test/*.nc Test/IPCC_Fourth_Assessment *.LOG* *.dSYM Test/IPCC Test/CMIP5 CMIP5 Tables
+-DISTFILES = libcmor.a
++TMPFILES = *~ $(LIBFILES) *.mod a.out *.stb Test/*.nc Test/IPCC_Fourth_Assessment *.LOG* *.dSYM Test/IPCC Test/CMIP5 CMIP5 Tables \
++ configure config.sub config.log cmor.pc include/cmor_locale.h
++DISTFILES = libcmor.a libcmor.so.2
+ DEPEND= makedepend -c @DEBUG@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@
+
+ all: cmor
diff --git a/debian/patches/debug-test.patch b/debian/patches/debug-test.patch
new file mode 100644
index 0000000..67869d6
--- /dev/null
+++ b/debian/patches/debug-test.patch
@@ -0,0 +1,22 @@
+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
+
+Index: cmor-2.8.2/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 @@
+ 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/explicit-tests.patch b/debian/patches/explicit-tests.patch
new file mode 100644
index 0000000..dffbf01
--- /dev/null
+++ b/debian/patches/explicit-tests.patch
@@ -0,0 +1,257 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Be more explicit in what is being run during tests. Useful in debugging failures on buildds in debian.
+Last-Updated: 2010-10-13
+Forwarded: no
+
+Index: cmor/Makefile.in
+===================================================================
+--- cmor.orig/Makefile.in 2010-10-12 00:45:29.000000000 +0100
++++ cmor/Makefile.in 2010-10-12 00:46:56.000000000 +0100
+@@ -112,136 +112,136 @@
+ Tables: TestTables
+ ln -sf TestTables Tables
+ test_C: cmor
+- @rm -f ./ipcc_test_code ; @CC@ @CPPFLAGS@ @CFLAGS@ 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@ @CPPFLAGS@ @CFLAGS@ @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@ @CPPFLAGS@ @CFLAGS@ @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@ @CPPFLAGS@ @CFLAGS@ 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@ @CPPFLAGS@ @CFLAGS@ @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@ @CPPFLAGS@ @CFLAGS@ @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@;
+ python:
+ @echo "Building Python interface"
+- @${PYTHONEXEC} setup.py install @CDATPREFIX@
++ ${PYTHONEXEC} setup.py install @CDATPREFIX@
+ test_a_python:
+ @echo "${OK_COLOR}Testing ${TEST_NAME} ${NO_COLOR}"
+ ${PYTHONEXEC} ${TEST_NAME} @VERB@
+ test_python: python
+- @env TEST_NAME=Test/test_python_direct_calls.py make test_a_python
+- @env TEST_NAME=Test/test_python_user_interface_00.py make test_a_python
+- @env TEST_NAME=Test/test_python_user_interface_01.py make test_a_python
+- @env TEST_NAME=Test/test_python_user_interface_03.py make test_a_python
+- @env TEST_NAME=Test/test_python_common.py make test_a_python
+- @env TEST_NAME=Test/cmor_speed_and_compression.py make test_a_python
+- @env TEST_NAME=Test/cmor_speed_and_compression_01.py make test_a_python
+-# @env TEST_NAME=Test/cmor_speed_and_compression_02.py make test_a_python
+- @env TEST_NAME=Test/test_compression.py make test_a_python
+- @env TEST_NAME=Test/test_python_appending.py make test_a_python
+- @env TEST_NAME=Test/test_python_bounds_request.py make test_a_python
+- @env TEST_NAME=Test/test_python_new_tables.py make test_a_python
+-# @env TEST_NAME=Test/test_python_index_coord.py make test_a_python
+- @env TEST_NAME=Test/test_python_jamie.py make test_a_python
+- @env TEST_NAME=Test/test_python_jamie_2.py make test_a_python
+- @env TEST_NAME=Test/test_python_jamie_3.py make test_a_python
+- @env TEST_NAME=Test/test_python_jamie_4.py make test_a_python
+- @env TEST_NAME=Test/test_python_jamie_6.py make test_a_python
+- @env TEST_NAME=Test/test_python_memory_check.py make test_a_python
+- @env TEST_NAME=Test/test_python_open_close_cmor_multiple.py make test_a_python
+- @env TEST_NAME=Test/test_python_jamie_7.py make test_a_python
+- @env TEST_NAME=Test/test_python_joerg_1.py make test_a_python
+- @env TEST_NAME=Test/test_python_joerg_2.py make test_a_python
+- @env TEST_NAME=Test/test_python_joerg_3.py make test_a_python
+- @env TEST_NAME=Test/test_python_YYYMMDDHH_exp_fmt.py make test_a_python
+- @env TEST_NAME=Test/test_python_region.py make test_a_python
++ env TEST_NAME=Test/test_python_direct_calls.py make test_a_python
++ env TEST_NAME=Test/test_python_user_interface_00.py make test_a_python
++ env TEST_NAME=Test/test_python_user_interface_01.py make test_a_python
++ env TEST_NAME=Test/test_python_user_interface_03.py make test_a_python
++ env TEST_NAME=Test/test_python_common.py make test_a_python
++ env TEST_NAME=Test/cmor_speed_and_compression.py make test_a_python
++ env TEST_NAME=Test/cmor_speed_and_compression_01.py make test_a_python
++# env TEST_NAME=Test/cmor_speed_and_compression_02.py make test_a_python
++ env TEST_NAME=Test/test_compression.py make test_a_python
++ env TEST_NAME=Test/test_python_appending.py make test_a_python
++ env TEST_NAME=Test/test_python_bounds_request.py make test_a_python
++ env TEST_NAME=Test/test_python_new_tables.py make test_a_python
++# env TEST_NAME=Test/test_python_index_coord.py make test_a_python
++ env TEST_NAME=Test/test_python_jamie.py make test_a_python
++ env TEST_NAME=Test/test_python_jamie_2.py make test_a_python
++ env TEST_NAME=Test/test_python_jamie_3.py make test_a_python
++ env TEST_NAME=Test/test_python_jamie_4.py make test_a_python
++ env TEST_NAME=Test/test_python_jamie_6.py make test_a_python
++ env TEST_NAME=Test/test_python_memory_check.py make test_a_python
++ env TEST_NAME=Test/test_python_open_close_cmor_multiple.py make test_a_python
++ env TEST_NAME=Test/test_python_jamie_7.py make test_a_python
++ env TEST_NAME=Test/test_python_joerg_1.py make test_a_python
++ env TEST_NAME=Test/test_python_joerg_2.py make test_a_python
++ env TEST_NAME=Test/test_python_joerg_3.py make test_a_python
++ env TEST_NAME=Test/test_python_YYYMMDDHH_exp_fmt.py make test_a_python
++ env TEST_NAME=Test/test_python_region.py make test_a_python
+
+ test_case:
+ @echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}"
+- @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
+- @./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
+- @ rm ./${TEST_NAME}
++ rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
++ ./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
++ rm ./${TEST_NAME}
+ ifeq (@MAKEDEPPYTHON@,python)
+- @env TEST_NAME="Test/check_results.py ${TEST_NAME}" make test_a_python
++ env TEST_NAME="Test/check_results.py ${TEST_NAME}" make test_a_python
+ endif
+ test_case_old_cmor_tables:
+ @echo "Testing: "${TEST_NAME}" with input file: "${INPUT_FILE}
+- @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @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} ;
+- @./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
+- @ rm ./${TEST_NAME}
++ rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @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} ;
++ ./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
++ rm ./${TEST_NAME}
+ ifeq (@MAKEDEPPYTHON@,python)
+- @env TEST_NAME="Test/check_results.py old_cmor_tables_${TEST_NAME}" make test_a_python
++ env TEST_NAME="Test/check_results.py old_cmor_tables_${TEST_NAME}" make test_a_python
+ endif
+ test_fortran_old_cmor_tables: cmor
+- @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
+- @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case_old_cmor_tables
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case_old_cmor_tables
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy.input" make test_case_old_cmor_tables
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case_old_cmor_tables
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case_old_cmor_tables
+- @env TEST_NAME="karls_test" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test1" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test2" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test3" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test4" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="main_prog" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_any_from_asc_i" INPUT_FILE="Test/tas_mytest_3d_i.input" make test_case_old_cmor_tables
+- @env TEST_NAME="mytest_4d_r" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="rewrite_harvardf_data" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_3h" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_dimensionless" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_fortran_example_00" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_fortran_example_01" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_station_data" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_region" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_sigma" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="test_singleton" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="mytest_4d_r_big_array" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="mytest_4d_d_big_array_2" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="mytest_4d_d_big_array_3" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="mytest_4d_d_big_array_4" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="mytest_4d_d_big_array_5" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @env TEST_NAME="climatology_test_code" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
+- @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
++ 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
++ env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case_old_cmor_tables
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case_old_cmor_tables
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy.input" make test_case_old_cmor_tables
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case_old_cmor_tables
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case_old_cmor_tables
++ env TEST_NAME="karls_test" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test1" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test2" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test3" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test4" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="main_prog" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_any_from_asc_i" INPUT_FILE="Test/tas_mytest_3d_i.input" make test_case_old_cmor_tables
++ env TEST_NAME="mytest_4d_r" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="rewrite_harvardf_data" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_3h" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_dimensionless" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_fortran_example_00" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_fortran_example_01" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_station_data" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_region" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_sigma" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="test_singleton" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="mytest_4d_r_big_array" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="mytest_4d_d_big_array_2" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="mytest_4d_d_big_array_3" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="mytest_4d_d_big_array_4" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="mytest_4d_d_big_array_5" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ env TEST_NAME="climatology_test_code" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
++ 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
+ test_fortran: cmor
+- @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case
+- @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy.input" make test_case
+- @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case
+- @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy.input" make test_case
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case
+- @env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case
+- @env TEST_NAME="karls_test" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test1" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test2" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test3" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test4" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="main_prog" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_any_from_asc_i" INPUT_FILE="Test/tas_mytest_3d_i.input" make test_case
+- @env TEST_NAME="mytest_4d_r" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="rewrite_harvardf_data" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_3h" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_dimensionless" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_fortran_example_00" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_fortran_example_01" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_station_data" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro.txt" make test_case
+- @env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro_1.txt" make test_case
+- @env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro_2.txt" make test_case
+- @env TEST_NAME="test_region" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_sigma" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_singleton" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="mytest_4d_r_big_array" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="mytest_4d_d_big_array_2" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="mytest_4d_d_big_array_3" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="mytest_4d_d_big_array_4" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="mytest_4d_d_big_array_5" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="climatology_test_code" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_lots_of_variables" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_shrt_exp_nm_set_att_initi" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_sophie" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="ipcc_test_code" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case
++ env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy.input" make test_case
++ env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case
++ env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy.input" make test_case
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case
++ env TEST_NAME="test_any_from_asc_d" INPUT_FILE="Test/3D_xty_split_lon.input" make test_case
++ env TEST_NAME="karls_test" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test1" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test2" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test3" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test4" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="main_prog" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_any_from_asc_i" INPUT_FILE="Test/tas_mytest_3d_i.input" make test_case
++ env TEST_NAME="mytest_4d_r" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="rewrite_harvardf_data" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_3h" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_dimensionless" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_fortran_example_00" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_fortran_example_01" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_station_data" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro.txt" make test_case
++ env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro_1.txt" make test_case
++ env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro_2.txt" make test_case
++ env TEST_NAME="test_region" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_sigma" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_singleton" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="mytest_4d_r_big_array" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="mytest_4d_d_big_array_2" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="mytest_4d_d_big_array_3" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="mytest_4d_d_big_array_4" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="mytest_4d_d_big_array_5" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="climatology_test_code" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_lots_of_variables" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_shrt_exp_nm_set_att_initi" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_sophie" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="ipcc_test_code" INPUT_FILE="Test/noinput" make test_case
+ atest: cmor
+ # @env TEST_NAME="mytest_4d_d_big_array_2" INPUT_FILE="Test/noinput" make test_case
+- @env TEST_NAME="test_lots_of_variables" INPUT_FILE="Test/noinput" make test_case
++ env TEST_NAME="test_lots_of_variables" INPUT_FILE="Test/noinput" make test_case
+ # @env TEST_NAME="wegner_test" INPUT_FILE="Test/noinput" make test_case
+
+
diff --git a/debian/patches/ld-no-add-needed.patch b/debian/patches/ld-no-add-needed.patch
new file mode 100644
index 0000000..9d1e35b
--- /dev/null
+++ b/debian/patches/ld-no-add-needed.patch
@@ -0,0 +1,24 @@
+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
+
+Index: cmor-2.8.2/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 @@
+ 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
new file mode 100644
index 0000000..bbddffd
--- /dev/null
+++ b/debian/patches/makefile-fix.patch
@@ -0,0 +1,36 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+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
+===================================================================
+--- 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 @@
+ @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@;
+@@ -186,7 +186,7 @@
+ ifeq (@MAKEDEPPYTHON@,python)
+ @env TEST_NAME="Test/check_results.py old_cmor_tables_${TEST_NAME}" make test_a_python
+ endif
+-test_fortran_old_cmor_tables: cmor
++test_fortran_old_cmor_tables: cmor Tables
+ @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 @@
+ @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
+-test_fortran: cmor
++test_fortran: cmor Tables
+ @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/tas_3D_noreorder.input" make test_case
+ @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy.input" make test_case
+ @env TEST_NAME="test_any_from_asc" INPUT_FILE="Test/3D_txy_split_lon.input" make test_case
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
new file mode 100644
index 0000000..e011a80
--- /dev/null
+++ b/debian/patches/pkgconfig.patch
@@ -0,0 +1,36 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+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
+===================================================================
+--- /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
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++fflags=-I${includedir}
++
++Name: cmor
++Description: Climate Model Output Rewriter library
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lcmor
++CFlags: -I${prefix}/include
++CFlags: -I${includedir} -I${includedir}/cdTime
++Requires: udunits netcdf ossp-uuid
+Index: cmor-2.8.2/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
+@@ -178,7 +178,7 @@
+ UUIDFLAGS=""
+ fi
+ else
+- UUIDLDFLAGS="-luuid"
++ UUIDLDFLAGS="-lossp-uuid"
+ UUIDFLAGS=""
+ fi
+ AC_CHECK_LIB([uuid],[uuid_create],[],[AC_ERROR([Could not get a working uuid])],[ ${UUIDFLAGS} ${UUIDLDFLAGS} ])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f97cc05
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+# clean.patch
+shlib-link.patch
+pkgconfig.patch
+makefile-fix.patch
+debug-test.patch
+ld-no-add-needed.patch
diff --git a/debian/patches/shlib-link.patch b/debian/patches/shlib-link.patch
new file mode 100644
index 0000000..ea5bc2a
--- /dev/null
+++ b/debian/patches/shlib-link.patch
@@ -0,0 +1,107 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Bugfix to link libcmor.so.2 against -lossp-uuid
+Last-Updated: 2010-10-14
+Forwarded: no
+
+Index: cmor-2.8.2/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 @@
+ # 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@
+
+ all: cmor
+ @echo
++
++PIC_OBJS = $(patsubst %.c, %.pic_o, $(LIBSOURCES)) $(patsubst %.f90,%.pic_o, $(LIBFSOURCES))
++
++%.pic_o: %.c
++ @CC@ @CPPFLAGS@ -fPIC -c -o $@ @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@ $<
++
++%.pic_o: %.f90
++ @FC@ -c -o $@ -fPIC @FCFLAGS@ @DEBUG@ @MACROS@ $<
++
++shlib $(SONAME): $(PIC_OBJS)
++ $(CC) -shared -o $(SONAME) $(SHLIBFLAGS) $(PIC_OBJS) @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@
++
+ 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
+ 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
+ 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
+ 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
+ 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_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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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)
++shlib $(SONAME): $(PIC_OBJS)
++ $(CC) -shared -o $(SONAME) $(SHLIBFLAGS) $(PIC_OBJS) @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@
++
+ clean:
+ @echo "Cleaning [$(WHEREAMI)] ..."
+ @rm -rf $(TMPFILES)
+@@ -91,9 +106,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 +172,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 +180,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/rules b/debian/rules
new file mode 100755
index 0000000..31d778d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+DEB_BUILD_MAINT_OPTIONS:= hardening=+all
+DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
+export DEB_BUILD_MAINT_OPTIONS
+export DEB_CFLAGS_MAINT_APPEND
+
+BUILD_ARCH_OS :-= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+
+%:
+ dh $@ --with python2
+
+override_dh_auto_configure:
+ autoreconf -fiv
+ ln -sf /usr/share/misc/config.sub
+ dh_auto_configure -- --disable-color --enable-verbose-test --with-uuid \
+ UUIDLDFLAGS="-lossp-uuid" UUIDFLAGS="-I/usr/include/ossp" SZLIBFLAGS=nosz
+
+override_dh_auto_clean:
+ rm -rf config.sub config.log config.status libcmor.a libcmor.so.2 build test_grid configure
+
+override_dh_auto_build:
+ $(MAKE) FC=gfortran
+
+ifeq ( $(BUILD_ARCH_OS)-$(BUILD_ARCH_CPU), kfreebsd-i386)
+override_dh_auto_test:
+ @echo "Tests disabled; see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598745"
+endif
+
+override_dh_auto_install:
+ $(MAKE) install DESTDIR=`pwd`/debian/tmp
+ $(MAKE) install_shlib DESTDIR=`pwd`/debian/tmp
+ for p in `pyversions --supported` ; do \
+ $$p ./setup.py install --prefix=`pwd`/debian/python-cmor/usr ; \
+ done
+ dh_numpy
+ dh_install -p libcmor2 libcmor.so.2 $(LIBDIR)
+ dh_install -p libcmor-dev debian/tmp/usr/lib/libcmor.a $(LIBDIR)
+ dh_install -p libcmor-dev debian/tmp/usr/lib/pkgconfig/cmor.pc $(LIBDIR)/pkgconfig
+ dh_link -p libcmor-dev $(LIBDIR)/libcmor.so.2 $(LIBDIR)/libcmor.so
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
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