[bibutils] 01/06: Merge tag 'upstream/6.0'

David Bremner bremner at debian.org
Wed Jul 5 01:17:43 UTC 2017


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

bremner pushed a commit to branch master
in repository bibutils.

commit 0eeb13d897e657d293c23395d88e3496f92a620f
Merge: a35d638 e80b3f6
Author: David Bremner <bremner at debian.org>
Date:   Tue Jul 4 20:34:43 2017 -0300

    Merge tag 'upstream/6.0'
    
    downloaded from sourceforge

 ChangeLog                          |   14 +
 Makefile_start                     |    6 +-
 bibutils.dbk                       |    2 +-
 bin/args.c                         |    2 +-
 bin/args.h                         |    2 +-
 bin/bib2xml.c                      |    2 +-
 bin/biblatex2xml.c                 |    2 +-
 bin/bibprog.c                      |    2 +-
 bin/bibprog.h                      |    2 +-
 bin/copac2xml.c                    |    2 +-
 bin/ebi2xml.c                      |    2 +-
 bin/end2xml.c                      |    2 +-
 bin/endx2xml.c                     |    2 +-
 bin/isi2xml.c                      |    2 +-
 bin/med2xml.c                      |    2 +-
 bin/modsclean.c                    |    2 +-
 bin/nbib2xml.c                     |    2 +-
 bin/ris2xml.c                      |    2 +-
 bin/tomods.c                       |    6 +-
 bin/tomods.h                       |    4 +-
 bin/wordbib2xml.c                  |    2 +-
 bin/xml2ads.c                      |    2 +-
 bin/xml2bib.c                      |    2 +-
 bin/xml2end.c                      |    2 +-
 bin/xml2isi.c                      |    2 +-
 bin/xml2ris.c                      |    2 +-
 bin/xml2wordbib.c                  |    2 +-
 lib/Makefile.dynamic               |    8 +-
 lib/Makefile.static                |    9 +-
 lib/adsout.c                       |  138 +--
 lib/bibcore.c                      |  158 ++--
 lib/bibformats.h                   |    2 +-
 lib/bibl.c                         |    2 +-
 lib/bibl.h                         |    4 +-
 lib/biblatexin.c                   |  579 ++++++------
 lib/bibtexin.c                     |  488 +++++-----
 lib/bibtexout.c                    |  205 ++--
 lib/bibtextypes.c                  |    5 +-
 lib/bibutils.c                     |    2 +-
 lib/bibutils.h                     |   18 +-
 lib/bltypes.c                      |    4 +-
 lib/charsets.c                     |    2 +-
 lib/charsets.h                     |    2 +-
 lib/copacin.c                      |  106 ++-
 lib/copactypes.c                   |    2 +-
 lib/ebiin.c                        |  140 +--
 lib/endin.c                        |  141 +--
 lib/endout.c                       |   83 +-
 lib/endtypes.c                     |    2 +-
 lib/endxmlin.c                     |   78 +-
 lib/entities.c                     |    2 +-
 lib/entities.h                     |    2 +-
 lib/fields.c                       |   50 +-
 lib/fields.h                       |    8 +-
 lib/gb18030.h                      |    2 +-
 lib/generic.c                      |   24 +-
 lib/generic.h                      |   20 +-
 lib/intlist.c                      |  392 ++++++--
 lib/intlist.h                      |   58 +-
 lib/is_ws.c                        |    2 +-
 lib/is_ws.h                        |    2 +-
 lib/isiin.c                        |  192 ++--
 lib/isiout.c                       |  109 ++-
 lib/isitypes.c                     |    2 +-
 lib/latex.c                        |    2 +-
 lib/latex.h                        |    2 +-
 lib/list.c                         |  660 -------------
 lib/list.h                         |   88 --
 lib/marc.c                         |    2 +-
 lib/marc.h                         |    2 +-
 lib/medin.c                        |  153 +--
 lib/modsin.c                       |  380 ++++----
 lib/modsout.c                      |   41 +-
 lib/modstypes.c                    |    2 +-
 lib/modstypes.h                    |    2 +-
 lib/mycvout.c                      |  110 +--
 lib/name.c                         |  182 ++--
 lib/name.h                         |   16 +-
 lib/nbibin.c                       |  203 ++--
 lib/nbibtypes.c                    |    2 +-
 lib/newstr.h                       |  106 ---
 lib/newstr_conv.h                  |   23 -
 lib/notes.c                        |   11 +-
 lib/notes.h                        |    4 +-
 lib/pages.c                        |   28 +-
 lib/pages.h                        |    5 +-
 lib/reftypes.c                     |    2 +-
 lib/reftypes.h                     |    2 +-
 lib/risin.c                        |  187 ++--
 lib/risout.c                       |  105 ++-
 lib/ristypes.c                     |    2 +-
 lib/serialno.c                     |    2 +-
 lib/serialno.h                     |    2 +-
 lib/slist.c                        |  865 +++++++++++++++++
 lib/slist.h                        |  100 ++
 lib/{newstr.c => str.c}            |  535 ++++++-----
 lib/str.h                          |  124 +++
 lib/{newstr_conv.c => str_conv.c}  |   61 +-
 lib/str_conv.h                     |   23 +
 lib/strsearch.c                    |    2 +-
 lib/strsearch.h                    |    2 +-
 lib/title.c                        |   50 +-
 lib/title.h                        |    6 +-
 lib/unicode.c                      |    4 +-
 lib/unicode.h                      |    6 +-
 lib/url.c                          |   55 +-
 lib/url.h                          |   18 +-
 lib/utf8.c                         |    2 +-
 lib/utf8.h                         |    2 +-
 lib/vplist.c                       |  378 +++++---
 lib/vplist.h                       |   62 +-
 lib/wordin.c                       |  106 +--
 lib/wordout.c                      |   84 +-
 lib/xml.c                          |  200 ++--
 lib/xml.h                          |   41 +-
 lib/xml_encoding.c                 |   46 +-
 lib/xml_encoding.h                 |    4 +-
 maketgz.sh                         |    2 +-
 test/Makefile.dynamic              |   19 +-
 test/Makefile.static               |   17 +-
 test/doi_test.c                    |    4 +-
 test/entities_test.c               |    2 +-
 test/intlist_test.c                |  886 ++++++++++++++++++
 test/list_test.c                   | 1435 ----------------------------
 test/slist_test.c                  | 1822 ++++++++++++++++++++++++++++++++++++
 test/{newstr_test.c => str_test.c} |  696 +++++++-------
 test/utf8_test.c                   |    2 +-
 test/vplist_test.c                 | 1416 ++++++++++------------------
 128 files changed, 8197 insertions(+), 6325 deletions(-)

diff --cc lib/Makefile.dynamic
index f5b26ef,9cfec3c..f101b5f
--- a/lib/Makefile.dynamic
+++ b/lib/Makefile.dynamic
@@@ -38,12 -38,12 +38,14 @@@ INPUT_OBJS    = bibtexin.o bibtextypes.
  		copacin.o copactypes.o \
  		endin.o endtypes.o \
  		endxmlin.o \
+ 		generic.o \
  		isiin.o isitypes.o \
  		medin.o \
+ 		nbibin.o nbibtypes.o \
  		modsin.o modstypes.o marc.o \
  		risin.o ristypes.o \
 +		nbibin.o nbibtypes.o \
 +		generic.o \
  		ebiin.o wordin.o
  
  OUTPUT_OBJS   = adsout.o \

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



More information about the debian-science-commits mailing list