[pyferret] 109/110: Fix to patch

[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 720bfb45cd32ffbe44f5d3185fbb6ebc030a4278
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 22 17:51:48 2017 +0100

    Fix to patch
---
 debian/patches/libname-fix.patch | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/patches/libname-fix.patch b/debian/patches/libname-fix.patch
index 7f7c6f9..1b0ba4a 100644
--- a/debian/patches/libname-fix.patch
+++ b/debian/patches/libname-fix.patch
@@ -1,40 +1,39 @@
-Index: pyferret-7.1.1.beta/setup.py
+Index: pyferret-7.2/setup.py
 ===================================================================
---- pyferret-7.1.1.beta.orig/setup.py
-+++ pyferret-7.1.1.beta/setup.py
-@@ -89,7 +89,12 @@ if buildtype != "intel-mac":
+--- pyferret-7.2.orig/setup.py
++++ pyferret-7.2/setup.py
+@@ -89,6 +89,12 @@ if buildtype != "intel-mac":
      lib_list.extend(fer_lib_list)
      lib_list.extend(fer_lib_list)
- # Add required system libraries to the list to link in
--lib_list.append("python%d.%d" % sys.version_info[:2])
+ 
 +maj,_,_,_,_ = sys.version_info
 +if maj == 2:
 +    lib_list.append("python%d.%d" % sys.version_info[:2])
 +else:
 +    lib_list.append("python%d.%dm" % sys.version_info[:2])
 +
- 
  # Linking in the rest of the system libraries were moved to addn_link_flags
  # in order to make sure the appropriate netcdff, netcdf, hdf5_hl, hdf5, and
-Index: pyferret-7.1.1.beta/pyfermod/__init__.py
+ # cairo libraries are used.
+Index: pyferret-7.2/pyfermod/__init__.py
 ===================================================================
---- pyferret-7.1.1.beta.orig/pyfermod/__init__.py
-+++ pyferret-7.1.1.beta/pyfermod/__init__.py
+--- pyferret-7.2.orig/pyfermod/__init__.py
++++ pyferret-7.2/pyfermod/__init__.py
 @@ -56,6 +56,20 @@ if os.environ.get('FER_MODEL_RUNS') is N
      os.environ['FER_MODEL_RUNS'] = '/usr/share/ferret-vis/model_runs'
  if os.environ.get('FER_LIBS') is None:
      os.environ['FER_LIBS'] = '/usr/lib/ferret-vis/efmem:/usr/lib/ferret-vis/external_functions'
-+if os.environ['FER_PALETTE'] is None:
++if os.environ.get('FER_PALETTE') is None:
 +    os.environ['FER_PALETTE'] = '/usr/share/ferret-vis/ppl/palettes'
-+if os.environ['FER_FONTS'] is None:
++if os.environ.get('FER_FONTS') is None:
 +    os.environ['FER_FONTS'] = '/usr/share/ferret-vis/ppl/fonts'
-+if os.environ['FER_DSETS'] is None:
++if os.environ.get('FER_DSETS') is None:
 +    os.environ['FER_DSETS'] = '/usr/share/ferret-vis/datasets'
-+if os.environ['TMAP'] is None:
++if os.environ.get('TMAP') is None:
 +    os.environ['TMAP'] = '/usr/share/ferret-vis/fmt'
-+if os.environ['SPECTRA'] is None:
++if os.environ.get('SPECTRA') is None:
 +    os.environ['SPECTRA'] = '/usr/share/ferret-vis/ppl'
-+if os.environ['PLOTFONTS'] is None:
++if os.environ.get('PLOTFONTS') is None:
 +    os.environ['PLOTFONTS'] = '/usr/share/ferret-vis/ppl/fonts'
 +
 +

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