[pyferret] 22/110: Updated for 1.1.0

[Alastair McKinstry]

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

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

commit dfad12de49210fb214aadcf9ef046c371358d6bb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 9 22:43:01 2015 +0100

    Updated for 1.1.0
---
 debian/changelog                 |  2 +-
 debian/patches/common.patch      | 13 -------------
 debian/patches/series            |  1 -
 debian/patches/set-envvars.patch | 11 ++++++++---
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da8a693..89f20b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ pyferret (1.1.0-1) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #732290)
 
- -- Alastair McKinstry <mckinstry at debian.org>  Tue, 18 Nov 2014 09:35:16 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 12 May 2015 09:35:16 +0100
diff --git a/debian/patches/common.patch b/debian/patches/common.patch
deleted file mode 100644
index 6e6c7ad..0000000
--- a/debian/patches/common.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pyferret-1.0.2/external_functions/ef_utility/ferret_cmn/EF_mem_subsc.cmn
-===================================================================
---- pyferret-1.0.2.orig/external_functions/ef_utility/ferret_cmn/EF_mem_subsc.cmn
-+++ pyferret-1.0.2/external_functions/ef_utility/ferret_cmn/EF_mem_subsc.cmn
-@@ -26,7 +26,7 @@
-         INTEGER     ef_max_mem_args
-         PARAMETER ( ef_max_mem_args = 12 )
- 
--        EXTERNAL FERRET_EF_MEM_SUBSC
-+!       EXTERNAL FERRET_EF_MEM_SUBSC
-         COMMON / FERRET_EF_MEM_SUBSC /
-      .      mem1lox, mem2lox, mem3lox, mem4lox,  mem5lox,  mem6lox,
-      .      mem7lox, mem8lox, mem9lox, mem10lox, mem11lox, mem12lox,
diff --git a/debian/patches/series b/debian/patches/series
index a969ca3..1808cda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-common.patch
 set-envvars.patch
diff --git a/debian/patches/set-envvars.patch b/debian/patches/set-envvars.patch
index c8820fa..5f62cb3 100644
--- a/debian/patches/set-envvars.patch
+++ b/debian/patches/set-envvars.patch
@@ -1,7 +1,12 @@
-Index: pyferret-1.0.2/pyfermod/__init__.py
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Ensure pyferret can run without Environmental variables set
+Last-Updated: 2015-05-11
+Forwarded: no
+
+Index: pyferret-1.1.0/pyfermod/__init__.py
 ===================================================================
---- pyferret-1.0.2.orig/pyfermod/__init__.py
-+++ pyferret-1.0.2/pyfermod/__init__.py
+--- pyferret-1.1.0.orig/pyfermod/__init__.py
++++ pyferret-1.1.0/pyfermod/__init__.py
 @@ -47,6 +47,21 @@ import numpy
  import numpy.ma
  import StringIO

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