diff -Nru funtools-1.4.7/debian/changelog funtools-1.4.7/debian/changelog --- funtools-1.4.7/debian/changelog 2017-11-22 09:09:53.000000000 +0000 +++ funtools-1.4.7/debian/changelog 2018-05-19 12:23:25.000000000 +0000 @@ -1,3 +1,12 @@ +funtools (1.4.7-3) unstable; urgency=low + + * Update VCS fields to use salsa.d.o + * mklib: clean up abi flags for x86 targets + * Push compat to 11 + * Push Standards-Version to 4.1.4. Change URLs to https + + -- Ole Streicher Sat, 19 May 2018 14:23:25 +0200 + funtools (1.4.7-2) unstable; urgency=low * Let failing mklibs fail the build (Closes: #882357) diff -Nru funtools-1.4.7/debian/compat funtools-1.4.7/debian/compat --- funtools-1.4.7/debian/compat 2016-10-28 09:58:36.000000000 +0000 +++ funtools-1.4.7/debian/compat 2018-05-19 12:22:36.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru funtools-1.4.7/debian/control funtools-1.4.7/debian/control --- funtools-1.4.7/debian/control 2017-11-22 09:07:39.000000000 +0000 +++ funtools-1.4.7/debian/control 2018-05-19 12:23:25.000000000 +0000 @@ -4,16 +4,16 @@ Maintainer: Debian Astro Team Uploaders: Ole Streicher Build-Depends: autotools-dev, - debhelper (>= 9), + debhelper (>= 11), dh-autoreconf, gawk, libwcstools-dev, tcl-dev, zlib1g-dev -Standards-Version: 4.1.1 +Standards-Version: 4.1.4 Homepage: https://github.com/ericmandel/funtools -Vcs-Git: https://anonscm.debian.org/git/debian-astro/packages/funtools.git -Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/funtools.git +Vcs-Git: https://salsa.debian.org/debian-astro-team/funtools.git +Vcs-Browser: https://salsa.debian.org/debian-astro-team/funtools Package: funtools Architecture: any diff -Nru funtools-1.4.7/debian/copyright funtools-1.4.7/debian/copyright --- funtools-1.4.7/debian/copyright 2016-10-28 09:58:36.000000000 +0000 +++ funtools-1.4.7/debian/copyright 2018-05-19 12:23:25.000000000 +0000 @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: funtools Upstream-Author: Eric Mandel -Source: http://hea-www.harvard.edu/saord/funtools/ +Source: https://github.com/ericmandel/funtools Files: * Copyright: Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory, diff -Nru funtools-1.4.7/debian/patches/mklib-clean-up-abi-flags-for-x86-targets.patch funtools-1.4.7/debian/patches/mklib-clean-up-abi-flags-for-x86-targets.patch --- funtools-1.4.7/debian/patches/mklib-clean-up-abi-flags-for-x86-targets.patch 1970-01-01 00:00:00.000000000 +0000 +++ funtools-1.4.7/debian/patches/mklib-clean-up-abi-flags-for-x86-targets.patch 2018-05-19 12:22:32.000000000 +0000 @@ -0,0 +1,97 @@ +From: Mike Frysinger +Date: Tue, 11 Sep 2012 01:57:25 -0400 +Subject: mklib: clean up abi flags for x86 targets + +The current code is duplicated in two places and relies on `uname` to +detect the flags. This is no good for cross-compiling, and the current +logic uses -m64 for the x32 ABI which breaks things. + +Unify the code in one place, avoid `uname` completely, and add support +for the new x32 ABI. + +Signed-off-by: Mike Frysinger +--- + mklib | 49 ++++++++++++++++++++++++++----------------------- + 1 file changed, 26 insertions(+), 23 deletions(-) + +diff --git a/mklib b/mklib +index 2f99336..79ed488 100755 +--- a/mklib ++++ b/mklib +@@ -216,6 +216,25 @@ case $ARCH in + fi + fi + ++ # Check if objects are 32-bit and we're running in 64-bit ++ # environment. If so, pass -m32 flag to linker. ++ add_abi_flag_to_opts() { ++ case $(file $1) in ++ *32-bit*x86-64*) ++ # x86_64 x32 ABI. ++ OPTS="-mx32 ${OPTS}" ++ ;; ++ *64-bit*x86-64*) ++ # x86_64 64-bit ABI. ++ OPTS="-m64 ${OPTS}" ++ ;; ++ *32-bit*Intel*) ++ # x86 32-bit ABI. ++ OPTS="-m32 ${OPTS}" ++ ;; ++ esac ++ } ++ + if [ $NOPREFIX = 1 ] ; then + # No "lib" or ".so" part + echo "mklib: Making" $ARCH "shared library: " ${LIBNAME} +@@ -227,13 +246,8 @@ case $ARCH in + ;; + esac + +- # Check if objects are 32-bit and we're running in 64-bit +- # environment. If so, pass -m32 flag to linker. +- set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi ++ # Check to see if we are building for a different ABI. ++ add_abi_flag_to_opts ${OBJECTS} + + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -280,13 +294,9 @@ case $ARCH in + # exptmp is removed below + fi + +- # Check if objects are 32-bit and we're running in 64-bit +- # environment. If so, pass -m32 flag to linker. +- set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi ++ # Check to see if we are building for a different ABI. ++ add_abi_flag_to_opts ${OBJECTS} ++ + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} + fi +@@ -354,15 +364,8 @@ case $ARCH in + OPTS="-G" + else + # gcc linker +- # Check if objects are 32-bit and we're running in 64-bit +- # environment. If so, pass -m32 flag to linker. +- set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" ] ; then +- OPTS="-m32 -shared -Wl,-Bdynamic" +- else +- OPTS="-m64 -shared -Wl,-Bdynamic" +- fi ++ # Check to see if we are building for a different ABI. ++ add_abi_flag_to_opts ${OBJECTS} + fi + + # Check if objects are SPARC v9 diff -Nru funtools-1.4.7/debian/patches/series funtools-1.4.7/debian/patches/series --- funtools-1.4.7/debian/patches/series 2017-11-22 09:05:25.000000000 +0000 +++ funtools-1.4.7/debian/patches/series 2018-05-19 12:22:32.000000000 +0000 @@ -5,3 +5,4 @@ Sort-object-files.patch Fix-missing-template-in-AC_DEFINE.patch Let-failing-mklibs-fail-the-build.patch +mklib-clean-up-abi-flags-for-x86-targets.patch diff -Nru funtools-1.4.7/debian/rules funtools-1.4.7/debian/rules --- funtools-1.4.7/debian/rules 2017-11-22 09:07:05.000000000 +0000 +++ funtools-1.4.7/debian/rules 2018-05-19 12:23:25.000000000 +0000 @@ -4,7 +4,7 @@ #export DH_VERBOSE=1 %: - dh $@ --with autoreconf + dh $@ --no-parallel --with autoreconf override_dh_autoreconf: for i in . filter fitsy util wcs; do \