[med-svn] [ncbi-entrez-direct] 02/06: Merge tag 'upstream/6.00.20170105+ds'

[Aaron M. Ucko]

This is an automated email from the git hooks/post-receive script.

ucko pushed a commit to branch master
in repository ncbi-entrez-direct.

commit b31d2e839b179e5e9124f3e3f86ffc8400281ed4
Merge: ce48425 5d2c52c
Author: Aaron M. Ucko <ucko at debian.org>
Date:   Thu Jan 5 22:12:53 2017 -0500

    Merge tag 'upstream/6.00.20170105+ds'
    
    Merge upstream version 6.00.20170105(+ds); start changelog entry for -1.

 debian/changelog              |   6 +
 debian/patches/debian-changes |   9 +-
 edirect.pl                    |  27 +++-
 nquire                        |   2 +
 xtract.go                     | 304 +++++++++++++++++++++++++-----------------
 5 files changed, 214 insertions(+), 134 deletions(-)

diff --cc debian/changelog
index 7317f02,0000000..5e253e8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,0 +1,39 @@@
++ncbi-entrez-direct (6.00.20170105+ds-1) UNRELEASED; urgency=medium
++
++  * New upstream release.  (NOT YET RELEASED.)
++
++ -- Aaron M. Ucko <ucko at debian.org>  Thu, 05 Jan 2017 22:12:53 -0500
++
 +ncbi-entrez-direct (5.90.20161221+ds-4) unstable; urgency=medium
 +
 +  * debian/control: Remove annotations from conflicts here.  (Oops.)
 +
 + -- Aaron M. Ucko <ucko at debian.org>  Sat, 24 Dec 2016 23:48:49 -0500
 +
 +ncbi-entrez-direct (5.90.20161221+ds-3) unstable; urgency=medium
 +
 +  * debian/control:
 +    - Build-Depends: Correct syntax for multiple exclusions.
 +    - Conflicts: acedb-other (over efetch), epub-utils (over einfo).
 +
 + -- Aaron M. Ucko <ucko at debian.org>  Sat, 24 Dec 2016 23:25:29 -0500
 +
 +ncbi-entrez-direct (5.90.20161221+ds-2) unstable; urgency=medium
 +
 +  * .gitignore: Account for files created outside debian/ at build time.
 +  * debian/control:
 +    - Set debian-med as maintainer, and myself as uploader.
 +    - Don't build depend on golang-any on architectures on
 +      which it's currently uninstallable.
 +  * debian/rules: If building xtract.go fails for any reason, fall back on
 +    installing the original Perl implementation.
 +  * debian/source/options: single-debian-patch.
 +  * xtract.pl: Don't insist on -fallback.
 +
 + -- Aaron M. Ucko <ucko at debian.org>  Sat, 24 Dec 2016 22:43:40 -0500
 +
 +ncbi-entrez-direct (5.90.20161221+ds-1) unstable; urgency=low
 +
 +  * Initial release.  (Closes: #810949.)
 +
 + -- Aaron M. Ucko <ucko at debian.org>  Fri, 23 Dec 2016 16:35:19 -0500
diff --cc debian/patches/debian-changes
index 6c1078b,0000000..fbd209a
mode 100644,000000..100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@@ -1,41 -1,0 +1,36 @@@
 +Description: <short summary of the patch>
 + TODO: Put a short summary on the line above and replace this paragraph
 + with a longer explanation of this change. Complete the meta-information
 + with other relevant fields (see below for details). To make it easier, the
 + information below has been extracted from the changelog. Adjust it or drop
 + it.
 + .
 + ncbi-entrez-direct (5.90.20161221+ds-4) unstable; urgency=medium
 + .
 +   * debian/control: Remove annotations from conflicts here.  (Oops.)
 +Author: Aaron M. Ucko <ucko at debian.org>
 +
 +---
 +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: <vendor|upstream|other>, <url of original patch>
 +Bug: <url in upstream bugtracker>
 +Bug-Debian: https://bugs.debian.org/<bugnumber>
 +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 +Forwarded: <no|not-needed|url proving that it has been forwarded>
 +Reviewed-By: <name and email of someone who approved the patch>
 +Last-Update: 2016-12-25
 +
- --- /dev/null
- +++ ncbi-entrez-direct-5.90.20161221+ds/.gitignore
- @@ -0,0 +1,2 @@
- +.pc
- +bin
- --- ncbi-entrez-direct-5.90.20161221+ds.orig/xtract.pl
- +++ ncbi-entrez-direct-5.90.20161221+ds/xtract.pl
++--- ncbi-entrez-direct-6.00.20170105+ds.orig/xtract.pl
+++++ ncbi-entrez-direct-6.00.20170105+ds/xtract.pl
 +@@ -1788,7 +1788,7 @@ sub xtract {
 +     # report execution time of original Perl implementation for comparison to new Go compiled version
 +     $timer = true;
 + 
 +-  } elsif ( $ARGV[0] ne "-fallback" ) {
 ++  } elsif ( 0 && $ARGV[0] ne "-fallback" ) {
 + 
 +     # ensure that platform-specific Go compiled version was used if available
 +     print STDERR "\nPLEASE REWRITE YOUR SCRIPT TO CALL XTRACT INSTEAD OF XTRACT.PL.\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-entrez-direct.git