[pyferret] 100/110: patch to fixup setup.py for py3 libname

[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 0295a25c75dcda93814b9f9dd263c94fd91bbea7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 26 15:59:25 2017 +0100

    patch to fixup setup.py for py3 libname
---
 debian/changelog                 |  1 +
 debian/patches/libname-fix.patch | 18 ++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  1 -
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a3e2f1e..7af2110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pyferret (7.1.1.beta-1) unstable; urgency=medium
 
   * New upstream release.
     - remove obsolete py3 patches
+    - patch to fixup setup.py for py3 libname
   * Ignore tests for this build 
   * Standards-Version: 4.0.0. No changes required
   * Enable builds with python3.5, py3.6 simultaneously. Closes: #863004
diff --git a/debian/patches/libname-fix.patch b/debian/patches/libname-fix.patch
new file mode 100644
index 0000000..38b4760
--- /dev/null
+++ b/debian/patches/libname-fix.patch
@@ -0,0 +1,18 @@
+Index: pyferret-7.1.1.beta/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":
+     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
diff --git a/debian/patches/series b/debian/patches/series
index 7122c66..fa5e8cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ set-envvars.patch
 automate-tests.parch
 reproducible.patch
 soname-fix.patch
+libname-fix.patch
diff --git a/debian/rules b/debian/rules
index d300ce2..39fef76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,6 @@ override_dh_auto_install:
 	# Doing it any earlier, and dh_prep will remove debian/tmp. 
 	# This means I'm also doing 'test' after the Install, not between during make & install. gack.
 	for p in $(PY2) $(PY3) ; do \
-		( cd ./lib && ln -sf /usr/lib/$(ARCH)/lib$(PY3)m.so lib$(PY3).so ) ; \
 		$(MAKE) HOSTTYPE=debian PYTHON_EXE=$$p clean all install ; \
 		done
 	find debian -name '*.pyo' -o -name '*.pyc' -delete

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