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

sebastic pushed a commit to branch master
in repository shapelib.

commit 8e74db9ac9b6105176e92293f3ac4e9962a32ee3
Merge: 33b6d2d 26a60b4
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Dec 6 19:43:38 2016 +0100

    Merge tag 'upstream/1.4.0_rc1'
    
    Upstream version 1.4.0~rc1
    
    Conflicts:
        .cvsignore
        ChangeLog
        Makefile
        README
        contrib/.cvsignore
        contrib/Makefile
        contrib/ShapeFileII.pas
        contrib/Shape_PointInPoly.cpp
        contrib/dbfinfo.c
        contrib/shpdata.c
        contrib/shpgeo.c
        contrib/shpgeo.h
        contrib/shpinfo.c
        contrib/shpwkb.c
        contrib/tests/shpproj.sh
        dbfadd.c
        dbfcreate.c
        dbfdump.c
        dbfopen.c
        makefile.vc
        makeshape.sh
        safileio.c
        shapefil.h
        shapelib.def
        shpadd.c
        shpcreate.c
        shpdump.c
        shpopen.c
        shprewind.c
        shptest.c
        shptree.c
        shptreedump.c
        shputils.c
        stream2.out
        stream3.out
        web/index.html
        web/license.html
        web/release.html

 .cvsignore                                     |    15 -
 AUTHORS                                        |     2 +
 CMakeLists.txt                                 |   237 +
 LICENSE.LGPL => COPYING                        |     0
 ChangeLog                                      |    46 +
 HOWTO-RELEASE                                  |    16 -
 INSTALL                                        |   370 +
 Makefile                                       |   113 -
 Makefile.am                                    |    75 +
 Makefile.in                                    |  1557 ++
 NEWS                                           |     2 +
 README                                         |    66 +-
 README.CMake                                   |    63 +
 aclocal.m4                                     |  1217 ++
 ar-lib                                         |   270 +
 autogen.sh                                     |    42 +
 compile                                        |   347 +
 config.guess                                   |  1441 ++
 config.sub                                     |  1813 +++
 configure                                      | 19184 +++++++++++++++++++++++
 configure.ac                                   |    70 +
 contrib/.cvsignore                             |    12 -
 contrib/Makefile                               |    66 -
 contrib/Makefile.am                            |    59 +
 contrib/Makefile.in                            |  1437 ++
 contrib/ShapeFileII.pas                        |     9 +-
 contrib/Shape_PointInPoly.cpp                  |    11 +-
 contrib/csv2shp.c                              |   558 -
 contrib/dbfinfo.c                              |     9 +-
 contrib/{ => doc}/Shape_PointInPoly_README.txt |     0
 contrib/{ => doc}/shpsort.txt                  |     0
 contrib/my_nan.h                               |    46 -
 contrib/shpdata.c                              |     7 +-
 contrib/shpdxf.c                               |     4 +-
 contrib/shpgeo.c                               |    29 +-
 contrib/shpgeo.h                               |    10 +-
 contrib/shpinfo.c                              |     7 +-
 contrib/shpwkb.c                               |     6 +
 contrib/tests/shpproj.sh                       |    59 +-
 dbfadd.c                                       |    11 +-
 dbfcreate.c                                    |    11 +-
 dbfdump.c                                      |    18 +-
 dbfopen.c                                      |   556 +-
 depcomp                                        |   791 +
 install-sh                                     |   508 +
 ltmain.sh                                      | 11156 +++++++++++++
 m4/libtool.m4                                  |  8388 ++++++++++
 m4/ltoptions.m4                                |   437 +
 m4/ltsugar.m4                                  |   124 +
 m4/ltversion.m4                                |    23 +
 m4/lt~obsolete.m4                              |    99 +
 makefile.vc                                    |     8 +-
 missing                                        |   215 +
 mkdist.sh                                      |    37 -
 mkinstalldirs                                  |    38 -
 mkrelease.sh                                   |    55 -
 safileio.c                                     |    11 +-
 sbnsearch.c                                    |   985 ++
 shapefil.h                                     |   354 +-
 shapelib.def                                   |    46 -
 shapelib.pc.in                                 |    14 +
 shpadd.c                                       |    30 +-
 shpcreate.c                                    |    11 +-
 shpdump.c                                      |    89 +-
 shpopen.c                                      |  1122 +-
 shprewind.c                                    |     9 +-
 shptest.c                                      |    11 +-
 shptree.c                                      |   235 +-
 shptreedump.c                                  |    11 +-
 shputils.c                                     |    11 +-
 stream2.out                                    |   530 -
 stream2.sh                                     |    11 -
 stream3.out                                    |    37 -
 test-driver                                    |   148 +
 stream1.out => tests/stream1.out               |     0
 stream1.sh => tests/test1.sh                   |    19 +-
 tests/test2.sh                                 |    27 +
 makeshape.sh => tests/test3.sh                 |    21 +-
 web/.cvsignore                                 |     2 -
 web/dbf_api.html                               |     4 +-
 web/index.html                                 |     9 +-
 web/license.html                               |     4 +-
 web/release.html                               |    17 +
 83 files changed, 53132 insertions(+), 2386 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/shapelib.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to