[bibutils] 02/10: Merge tag 'upstream/5.0'

[David Bremner]

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

bremner pushed a commit to annotated tag debian/5.0-1
in repository bibutils.

commit 3dbcd9728599b611d74672763350154744397850
Merge: d0f8323 f4a3f01
Author: David Bremner <bremner at debian.org>
Date:   Sat Aug 10 14:54:35 2013 +0200

    Merge tag 'upstream/5.0'
    
    upstream version 5.0 from sourceforge
    
    Conflicts:
    	bibutils.dbk
    	lib/Makefile.dynamic
    	test/Makefile
    
    conflicts (manually) resolved in favour of upstream

 ChangeLog             |  200 +-
 Makefile              |   46 -
 Makefile_start        |   94 +-
 bibutils.dbk          |   92 +-
 bin/Makefile          |   97 -
 bin/Makefile.dynamic  |   16 +-
 bin/Makefile.static   |   22 +-
 bin/args.c            |   68 +-
 bin/args.h            |   15 +-
 bin/bib2xml.c         |    4 +-
 bin/biblatex2xml.c    |    4 +-
 bin/bibprog.c         |    4 +-
 bin/bibprog.h         |    4 +-
 bin/copac2xml.c       |    4 +-
 bin/ebi2xml.c         |    4 +-
 bin/end2xml.c         |    4 +-
 bin/endx2xml.c        |    4 +-
 bin/isi2xml.c         |    4 +-
 bin/med2xml.c         |    4 +-
 bin/modsclean.c       |    4 +
 bin/ris2xml.c         |    4 +-
 bin/tomods.c          |   25 +-
 bin/tomods.h          |   13 +-
 bin/wordbib2xml.c     |    4 +-
 bin/xml2ads.c         |   20 +-
 bin/xml2bib.c         |   40 +-
 bin/xml2end.c         |   15 +-
 bin/xml2isi.c         |   16 +-
 bin/xml2ris.c         |   16 +-
 bin/xml2wordbib.c     |   19 +-
 configure             |  452 +-
 lib/Makefile          |   47 -
 lib/Makefile.dynamic  |   86 +-
 lib/Makefile.static   |   82 +-
 lib/adsout.c          |  346 +-
 lib/adsout.h          |    6 +-
 lib/adsout_journals.c |  556 +-
 lib/bibcore.c         |  499 +-
 lib/bibl.c            |   63 +-
 lib/bibl.h            |    8 +-
 lib/biblatexin.c      |  771 +-
 lib/biblatexin.h      |    6 +-
 lib/bibtexin.c        |  667 +-
 lib/bibtexin.h        |    6 +-
 lib/bibtexout.c       |  109 +-
 lib/bibtexout.h       |    4 +-
 lib/bibtextypes.c     |  338 +-
 lib/bibutils.c        |    4 +-
 lib/bibutils.h        |   17 +-
 lib/bltypes.c         | 1174 +-
 lib/charsets.c        |55440 ++++++++++++++++++++++++++++++-------------------
 lib/charsets.h        |   28 +-
 lib/copacin.c         |  173 +-
 lib/copacin.h         |    6 +-
 lib/copactypes.c      |    5 +-
 lib/doi.c             |   68 +-
 lib/doi.h             |    5 +-
 lib/ebiin.c           |   14 +-
 lib/ebiin.h           |    5 +-
 lib/endin.c           |  178 +-
 lib/endin.h           |    6 +-
 lib/endout.c          |  310 +-
 lib/endout.h          |    4 +-
 lib/endtypes.c        |   37 +-
 lib/endxmlin.c        |   69 +-
 lib/endxmlin.h        |    4 +-
 lib/entities.c        |   27 +-
 lib/entities.h        |    6 +-
 lib/entities.txt      |  461 -
 lib/fields.c          |  620 +-
 lib/fields.h          |   76 +-
 lib/gb18030.h         |    4 +-
 lib/intlist.c         |  250 +
 lib/intlist.h         |   40 +
 lib/is_ws.c           |    4 +-
 lib/is_ws.h           |    4 +-
 lib/isiin.c           |  108 +-
 lib/isiin.h           |    6 +-
 lib/isiout.c          |  339 +-
 lib/isiout.h          |    4 +-
 lib/isitypes.c        |   31 +-
 lib/iso639_2.c        |  645 +
 lib/iso639_2.h        |   10 +
 lib/latex.c           |  259 +-
 lib/latex.h           |    4 +-
 lib/list.c            |  362 +-
 lib/list.h            |   59 +-
 lib/marc.c            |    8 +
 lib/marc.h            |    4 +-
 lib/medin.c           |   38 +-
 lib/medin.h           |    5 +-
 lib/modsin.c          |  214 +-
 lib/modsin.h          |    5 +-
 lib/modsout.c         |  670 +-
 lib/modsout.h         |    4 +-
 lib/modstypes.c       |    8 +
 lib/modstypes.h       |    4 +-
 lib/mycvout.c         |   10 +-
 lib/name.c            |  686 +-
 lib/name.h            |   15 +-
 lib/newstr.c          |  298 +-
 lib/newstr.h          |   31 +-
 lib/newstr_conv.c     |   82 +-
 lib/newstr_conv.h     |   15 +-
 lib/reftypes.c        |   20 +-
 lib/reftypes.h        |   51 +-
 lib/risin.c           |  204 +-
 lib/risin.h           |    6 +-
 lib/risout.c          |  515 +-
 lib/risout.h          |    4 +-
 lib/ristypes.c        | 2341 ++-
 lib/rules.h           |   49 -
 lib/serialno.c        |   12 +-
 lib/serialno.h        |    6 +-
 lib/strsearch.c       |    8 +-
 lib/strsearch.h       |    5 +-
 lib/title.c           |   30 +-
 lib/title.h           |    6 +-
 lib/tmp1              |   17 -
 lib/unicode.c         |  333 +
 lib/unicode.h         |   22 +
 lib/utf8.c            |   16 +-
 lib/utf8.h            |    6 +-
 lib/vplist.c          |  216 +
 lib/vplist.h          |   68 +
 lib/wordin.c          |  356 +-
 lib/wordin.h          |    5 +-
 lib/wordout.c         |  223 +-
 lib/wordout.h         |    4 +-
 lib/xml.c             |    4 +-
 lib/xml.h             |    4 +-
 lib/xml_encoding.c    |   13 +-
 lib/xml_encoding.h    |    4 +-
 makedeb.csh           |   91 -
 makedeb.sh            |  105 +
 maketgz.csh           |   27 -
 maketgz.sh            |   28 +
 readme.txt            |    2 +-
 test/Makefile         |   22 +-
 test/Makefile.dynamic |   40 +
 test/Makefile.static  |   35 +
 test/entities_test.o  |  Bin 0 -> 4528 bytes
 todos.txt             |    4 -
 143 files changed, 45802 insertions(+), 26975 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/bibutils.git