[cmor] 10/12: refresh patches. makefile fix no longer needed

[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 b5536a2089c1336eb926cd05320a39c07567100a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 13 11:53:28 2016 +0100

    refresh patches. makefile fix no longer needed
---
 debian/changelog                     |  3 ++-
 debian/patches/fix-makefile.patch    | 15 ---------------
 debian/patches/series                |  2 --
 debian/patches/silence-warning.patch | 17 -----------------
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 349e3d4..9465c6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-cmor (2.9.3-1) UNRELEASED; urgency=medium
+cmor (2.9.3-1) unstable; urgency=medium
 
   * New upstream release
+   - refresh patches. makefile fix no longer needed
   * Standards-Version: 3.9.8
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 13 Jun 2016 11:07:02 +0100
diff --git a/debian/patches/fix-makefile.patch b/debian/patches/fix-makefile.patch
deleted file mode 100644
index f0df3d1..0000000
--- a/debian/patches/fix-makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: cmor-2.9.1/Makefile.in
-===================================================================
---- 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
--        @env TEST_NAME=Test/test_python_joerg_11.py make test_a_python
--        @env TEST_NAME=Test/test_python_joerg_12.py make test_a_python
-+	@env TEST_NAME=Test/test_python_joerg_11.py make test_a_python
-+	@env TEST_NAME=Test/test_python_joerg_12.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/jamie_hybrid_height.py make test_a_python
diff --git a/debian/patches/series b/debian/patches/series
index 2ce8c48..874e2e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,3 @@ makefile-fix.patch
 destdir.patch
 cmor_ver.patch
 # python3.patch
-silence-warning.patch
-fix-makefile.patch
diff --git a/debian/patches/silence-warning.patch b/debian/patches/silence-warning.patch
deleted file mode 100644
index fb7e8a9..0000000
--- a/debian/patches/silence-warning.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: cmor-2.9.1/Lib/__init__.py
-===================================================================
---- 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:
--  from check_CMOR_compliant import checkCMOR
-+   from check_CMOR_compliant import checkCMOR
-+except ImportError as e:
-+   if e == 'No module named cdms2':
-+      print("Warning: cdms2 module not found")
-+      pass
- except Exception,err:
-   print err
-   pass

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