diff -Nru ncbi-blast+-2.9.0/debian/changelog ncbi-blast+-2.9.0/debian/changelog --- ncbi-blast+-2.9.0/debian/changelog 2019-09-29 21:57:31.000000000 -0400 +++ ncbi-blast+-2.9.0/debian/changelog 2021-07-01 18:55:45.000000000 -0400 @@ -1,3 +1,9 @@ +ncbi-blast+ (2.9.0-2ubuntu2) UNRELEASED; urgency=medium + + * c++/src/app/blast/get_species_taxids.sh: Updated script to upstream 2.12.0 to fix api breakage. + + -- Andrew Robbins Thu, 01 Jul 2021 18:55:45 -0400 + ncbi-blast+ (2.9.0-2) unstable; urgency=medium * debian/control: Standards-Version: 4.4.1 (already compliant). diff -Nru ncbi-blast+-2.9.0/debian/control ncbi-blast+-2.9.0/debian/control --- ncbi-blast+-2.9.0/debian/control 2019-09-29 21:56:46.000000000 -0400 +++ ncbi-blast+-2.9.0/debian/control 2021-07-01 18:55:45.000000000 -0400 @@ -1,5 +1,6 @@ Source: ncbi-blast+ -Maintainer: Debian Med Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Med Packaging Team Uploaders: Olivier Sallou , Andreas Tille , Aaron M. Ucko diff -Nru ncbi-blast+-2.9.0/debian/patches/series ncbi-blast+-2.9.0/debian/patches/series --- ncbi-blast+-2.9.0/debian/patches/series 2019-09-29 15:29:47.000000000 -0400 +++ ncbi-blast+-2.9.0/debian/patches/series 2021-07-01 18:55:45.000000000 -0400 @@ -14,3 +14,4 @@ fix_unit_tests #support_boost_1_67 system_mbedtls_only +update-get_species_taxids.sh diff -Nru ncbi-blast+-2.9.0/debian/patches/update-get_species_taxids.sh ncbi-blast+-2.9.0/debian/patches/update-get_species_taxids.sh --- ncbi-blast+-2.9.0/debian/patches/update-get_species_taxids.sh 1969-12-31 19:00:00.000000000 -0500 +++ ncbi-blast+-2.9.0/debian/patches/update-get_species_taxids.sh 2021-07-01 18:55:45.000000000 -0400 @@ -0,0 +1,79 @@ +Description: Fix API breakage in get_species_taxids> + . + ncbi-blast+ (2.9.0-2ubuntu2) UNRELEASED; urgency=high + . + * c++/src/app/blast/get_species_taxids.sh: Updated script to upstream 2.12.0 to fix api breakage in parsing logic.. +Author: Andrew Robbins + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug-Ubuntu: https://launchpad.net/bugs/1934402 +Forwarded: +Reviewed-By: +Last-Update: 2021-07-01 + +--- ncbi-blast+-2.9.0.orig/c++/src/app/blast/get_species_taxids.sh ++++ ncbi-blast+-2.9.0/c++/src/app/blast/get_species_taxids.sh +@@ -1,5 +1,5 @@ + #!/bin/bash +-# $Id: get_species_taxids.sh 581766 2019-03-05 17:46:45Z ivanov $ ++# $Id: get_species_taxids.sh 631570 2021-05-19 13:54:06Z ivanov $ + # =========================================================================== + # + # PUBLIC DOMAIN NOTICE +@@ -34,25 +34,25 @@ + # + # =========================================================================== + +-export PATH=/bin:/usr/bin:/am/ncbiapdata/bin:$HOME/edirect ++export PATH=/bin:/usr/bin:/am/ncbiapdata/bin:$HOME/edirect:$PATH + set -uo pipefail + + TOO_MANY_MATCHES=500 +-OUTPUT=`mktemp -t $(basename -s .sh $0)-XXXXXXX` +-TMP=`mktemp -t $(basename -s .sh $0)-XXXXXXX` ++OUTPUT=`mktemp` ++TMP=`mktemp` + trap " /bin/rm -fr $OUTPUT $TMP" INT QUIT EXIT HUP KILL ALRM + + usage() { + echo "$0 usage:"; + echo -e "\t-t \n\t\tGet taxonomy IDs at or below input taxonomy ID level"; + echo -e "\t-n \n\t\tGet taxonomy information for organism"; +- exit 1; ++ exit 0; + } + + error_exit() { + msg=$1 + exit_code=${2:-1} +- echo $msg; ++ >&2 echo $msg; + exit $exit_code; + } + +@@ -135,15 +135,16 @@ if [ ! -z "${NAME}" ]; then + fi + fi + +- esummary -db taxonomy -mode json < $OUTPUT > $TMP ++ esummary -mode json < $OUTPUT > $TMP + + if [ $? -ne 0 ]; then + error_exit "esummary error" $? + fi + +- grep 'uid\|rank\|division\|scientificname\|commonname' $TMP | \ +- grep -v "uids\|genbankdivision" | tr -d '"\|,' | tr -s ' ' | \ +- sed 's/uid/\nTaxid/g;s/name/ name/g' > $OUTPUT ++ cat $TMP | tr ',|{' '\n' | \ ++ grep 'uid\|rank\|division\|scientificname\|commonname' | \ ++ grep -v "uids\|genbankdivision" | tr '"\|,' " " | tr -s ' ' | \ ++ sed 's/ uid/Taxid/g;s/name/ name/g' | awk '/Taxid/{print ""}1' > $OUTPUT + + echo -e "\n$NUM_RESULTS matche(s) found.\n" >> $OUTPUT + fi