[cmor] 12/13: New PrePARE.py script ships in libcmor-dev

[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 f7c13982cafa609384dff3feaee94f28daa7622a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Dec 20 15:04:01 2016 +0000

    New PrePARE.py script ships in libcmor-dev
---
 debian/changelog             | 5 +++--
 debian/libcmor-dev.install   | 2 +-
 debian/patches/python3.patch | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a419cc8..ecc3aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cmor (3.2.1-1) UNRELEASED; urgency=medium
+cmor (3.2.1-1) experimental; urgency=medium
 
   * New upstream release
   * DH_COMPAT=10, with debhelper dependency = 10
@@ -6,8 +6,9 @@ cmor (3.2.1-1) UNRELEASED; urgency=medium
   * Add license change and clarification to debian/copyright.
     Closes: #821148
   * Add dependency on libffi-dev
+  * New PrePARE.py script ships in libcmor-dev
 
- -- Alastair McKinstry <mckinstry at debian.org>  Fri, 17 Jun 2016 16:16:11 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 20 Dec 2016 15:03:14 +0000
 
 cmor (2.9.3-2) experimental; urgency=medium
 
diff --git a/debian/libcmor-dev.install b/debian/libcmor-dev.install
index 3a09fc1..b903367 100644
--- a/debian/libcmor-dev.install
+++ b/debian/libcmor-dev.install
@@ -1,2 +1,2 @@
 /usr/include/*	usr/include
-
+usr/bin/PrePARE.py
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index e8be04d..0058a60 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -35,17 +35,19 @@ Index: cmor-3.2.1/Lib/pywrapper.py
 ===================================================================
 --- cmor-3.2.1.orig/Lib/pywrapper.py
 +++ cmor-3.2.1/Lib/pywrapper.py
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,9 @@
  import numpy
  import os
  
 -import cmor_const
 -import _cmor
+-from _cmor import CMORError
 +from . import cmor_const
 +from . import _cmor
- from _cmor import CMORError
++from ._cmor import CMORError
  
  try:
+     import cdtime
 @@ -46,26 +46,26 @@ def time_varying_grid_coordinate(grid_id
      omitted or assigned the value 'none' (i.e., missing_value='none').
      """
@@ -2776,7 +2778,8 @@ Index: cmor-3.2.1/Src/_cmormodule.c
 +    struct module_state *st = GETSTATE(module);
 +
      CMORError = PyErr_NewException("_cmor.CMORError", NULL, NULL);
-     PyModule_AddObject(cmor_module, "CMORError", CMORError);
+-    PyModule_AddObject(cmor_module, "CMORError", CMORError);
++    PyModule_AddObject(module, "CMORError", CMORError);
 +
 +#if PY_MAJOR_VERSION >= 3
 +    return module;

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