diff -Nru pyferret-7.1.1.beta/debian/changelog pyferret-7.1.1.beta/debian/changelog --- pyferret-7.1.1.beta/debian/changelog 2017-06-25 05:05:57.000000000 -0500 +++ pyferret-7.1.1.beta/debian/changelog 2017-07-21 13:47:36.000000000 -0500 @@ -1,3 +1,10 @@ +pyferret (7.1.1.beta-1ubuntu1) artful; urgency=medium + + * Merge from Debian Sid (LP: #1705759). Remaining changes: + - debian/rules: Stop assuming we're building for Python 3.5. + + -- Simon Quigley Fri, 21 Jul 2017 13:47:36 -0500 + pyferret (7.1.1.beta-1) unstable; urgency=medium * New upstream release. diff -Nru pyferret-7.1.1.beta/debian/control pyferret-7.1.1.beta/debian/control --- pyferret-7.1.1.beta/debian/control 2017-06-25 05:05:57.000000000 -0500 +++ pyferret-7.1.1.beta/debian/control 2017-07-21 13:47:36.000000000 -0500 @@ -2,7 +2,8 @@ Standards-Version: 4.0.0 Homepage: http://ferret.pmel.noaa.gov/Ferret/documentation/pyferret Vcs-Git: git://git.debian.org/git/debian-science/packages/pyferret.git -Maintainer: Alastair McKinstry +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Alastair McKinstry Section: science Priority: optional X-Python-Version: >= 2.6 diff -Nru pyferret-7.1.1.beta/debian/rules pyferret-7.1.1.beta/debian/rules --- pyferret-7.1.1.beta/debian/rules 2017-06-25 05:05:57.000000000 -0500 +++ pyferret-7.1.1.beta/debian/rules 2017-07-21 13:47:31.000000000 -0500 @@ -17,6 +17,7 @@ PY2:=$(shell pyversions -d) PY3:=$(shell py3versions -d) +PY3nodot:=$(shell py3versions -dv | tr -d '.') override_dh_auto_build: cp debian/platform_specific.mk.debian . @@ -34,7 +35,7 @@ mkdir -p $(INSTALLDIR)/lib/$(PY3) ln -s $(CURDIR)/install/lib/$(PY2)/site-packages/pyferret/libpyferret.so \ $(INSTALLDIR)/lib/$(PY2)/libpyferret.so - ln -s $(CURDIR)/install/lib/$(PY3)/site-packages//pyferret/libpyferret.cpython-35m-$(ARCH).so \ + ln -s $(CURDIR)/install/lib/$(PY3)/site-packages//pyferret/libpyferret.cpython-$(PY3nodot)m-$(ARCH).so \ $(INSTALLDIR)/lib/$(PY3)/libpyferret.so # Build and install # Horrible hack breaks The Debian Way. I'm doing the build in the 'install' phase, as i'm installing into debian/tmp