diff -Nru pyferret-7.5.0/debian/changelog pyferret-7.5.0/debian/changelog --- pyferret-7.5.0/debian/changelog 2019-06-17 11:41:41.000000000 +0000 +++ pyferret-7.5.0/debian/changelog 2019-07-16 12:14:37.000000000 +0000 @@ -1,3 +1,10 @@ +pyferret (7.5.0-2) unstable; urgency=medium + + * Drop python-ferret for python2 transition + * Standards-Version: 4.4.0 + + -- Alastair McKinstry Tue, 16 Jul 2019 13:14:37 +0100 + pyferret (7.5.0-1) unstable; urgency=medium * New upstream release diff -Nru pyferret-7.5.0/debian/control pyferret-7.5.0/debian/control --- pyferret-7.5.0/debian/control 2019-06-17 11:24:36.000000000 +0000 +++ pyferret-7.5.0/debian/control 2019-07-16 12:14:37.000000000 +0000 @@ -1,5 +1,5 @@ Source: pyferret -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Homepage: http://ferret.pmel.noaa.gov/Ferret/documentation/pyferret Vcs-Browser: https://salsa.debian.org:/science-team/pyferret Vcs-Git: https://salsa.debian.org:/science-team/pyferret.git @@ -21,27 +21,11 @@ libxt-dev, libcairo2-dev, libpango1.0-dev, - python-dev, python3-dev, - python-numpy, python3-numpy, - python-future, python3-future, ferret-vis -Package: python-ferret -Architecture: any -Section: python -Depends: ${misc:Depends}, ${shlibs:Depends}, ferret-vis, ${python:Depends}, python-future -Recommends: ferret-datasets, python-scipy, python-pyshp -Description: Python wrapper for the Ferret visualization and analysis environment - Ferret is an interactive computer visualization and analysis environment - designed to meet the needs of oceanographers and meteorologists analyzing - large and complex gridded data sets. It can transparently access extensive - remote Internet data bases using OPeNDAP (formerly known as DODS) - . - This is the Python wrapper for Ferret - Package: python3-ferret Architecture: any Section: python diff -Nru pyferret-7.5.0/debian/python-ferret.install pyferret-7.5.0/debian/python-ferret.install --- pyferret-7.5.0/debian/python-ferret.install 2019-06-17 11:24:36.000000000 +0000 +++ pyferret-7.5.0/debian/python-ferret.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -lib/python2.7/site-packages/* /usr/lib/python2.7/dist-packages -debian/pyferret2 /usr/bin -# efmem/ferret_ef_mem_subsc.so /usr/lib/ferret-vis/efmem diff -Nru pyferret-7.5.0/debian/python-ferret.postinst pyferret-7.5.0/debian/python-ferret.postinst --- pyferret-7.5.0/debian/python-ferret.postinst 2019-06-17 11:24:36.000000000 +0000 +++ pyferret-7.5.0/debian/python-ferret.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - configure) - # Continue below - ;; - abort-upgrade|abort-remove|abort-deconfigure) - exit 0; - ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0; - ;; -esac - -update-alternatives \ - --install /usr/bin/pyferret pyferret /usr/bin/pyferret2 50 \ - -#DEBHELPER# - -exit 0 - diff -Nru pyferret-7.5.0/debian/python-ferret.prerm pyferret-7.5.0/debian/python-ferret.prerm --- pyferret-7.5.0/debian/python-ferret.prerm 2019-06-17 11:24:36.000000000 +0000 +++ pyferret-7.5.0/debian/python-ferret.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" != "upgrade" ]; then - update-alternatives --remove pyferret /usr/bin/pyferret2 -fi - -#DEBHELPER# - -exit 0 diff -Nru pyferret-7.5.0/debian/rules pyferret-7.5.0/debian/rules --- pyferret-7.5.0/debian/rules 2019-06-17 11:24:36.000000000 +0000 +++ pyferret-7.5.0/debian/rules 2019-07-16 12:14:37.000000000 +0000 @@ -5,7 +5,7 @@ # magic debhelper rule %: - dh $@ --with python2,python3 + dh $@ --with python3 # To aid reproducible builds LC_ALL=C @@ -21,7 +21,6 @@ FC:=$(shell basename $(shell readlink /etc/alternatives/f95)) endif -PY2:=$(shell pyversions -d) PY3:=$(shell py3versions -d) PY3nodot:=$(shell py3versions -dv | tr -d '.') @@ -37,28 +36,23 @@ override_dh_auto_install: # Need temp. libraries during build. - mkdir -p $(INSTALLDIR)/lib/$(PY2) 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-$(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 # 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 \ + for p in $(PY3) ; do \ $(MAKE) HOSTTYPE=debian PYTHON_EXE=$$p clean all install ; \ done find debian \( -name '*.pyo' -o -name '*.pyc' \) -delete find debian -type d -name __pycache__ -delete - dh_numpy dh_numpy3 @echo "Now doing bench tests" - ln -s debian/pyferret2 $(INSTALLDIR)/lib/$(PY2)/pyferret ln -s debian/pyferret3 $(INSTALLDIR)/lib/$(PY3)/pyferret # First build necessary files - for p in $(PY2) $(PY3) ; do \ + for p in $(PY3) ; do \ sed -e 's%@ARCH@%${ARCH}%' \ -e 's%@LIBDIR@%${LIBDIR}%' \ -e 's%@CURDIR@%${CURDIR}%' \