This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository shapelib.
commit 69dd65579bf208c889b2839b5bebd68695772413 Author: Bas Couwenberg <[email protected]> Date: Fri Dec 9 15:23:25 2016 +0100 Imported Upstream version 1.4.0 --- ChangeLog | 23 +- Makefile.am | 1 + Makefile.in | 1 + README | 0 configure | 2 +- configure.ac | 2 +- contrib/doc/Shape_PointInPoly_README.txt | 2 +- contrib/shpgeo.c | 19 +- web/index.html | 2 +- web/license.html | 2 +- web/manifest.html | 2 +- web/maptools.css | 357 +++++++++++++++++++++++++++++++ web/release.html | 2 +- web/shapelib-tools.html | 6 +- 14 files changed, 409 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46558db..3e17b2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2016-12-09 Even Rouault <even.rouault at spatialys.com> + + * Makefile.am: install web/maptools.css + + * Shapelib 1.4.0 released + +2016-12-06 Even Rouault <even.rouault at spatialys.com> + + * configure.ac: change soname to 2:1:0 to be in sync with Debian soname. + http://bugzilla.maptools.org/show_bug.cgi?id=2628 + Patch by Bas Couwenberg + + * contrib/doc/Shape_PointInPoly_README.txt, contrib/shpgeo.c: typo fixes. + http://bugzilla.maptools.org/show_bug.cgi?id=2629 + Patch by Bas Couwenberg + + * web/*: use a local .css file to avoid a privacy breach issue reported + by the lintian QA tool. + http://bugzilla.maptools.org/show_bug.cgi?id=2630 + Patch by Bas Couwenberg + 2016-12-06 Even Rouault <even.rouault at spatialys.com> * web/release.html, HOWTO-RELEASE, configure.ac, CMakeLists.txt: prepare @@ -12,7 +33,7 @@ 2016-12-05 Even Rouault <even.rouault at spatialys.com> * Major overhaul of Makefile build system to use autoconf/automake. - Contributed by Sandro Mani: https://github.com/manisandro/shapelib/tree/autotools + Contributed by Sandro Mani: https://github.com/manisandro/shapelib/tree/autotools * Warning fixes in contrib/ diff --git a/Makefile.am b/Makefile.am index 3cc5e0b..2d22cc6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,7 @@ endif EXTRA_DIST = makefile.vc CMakeLists.txt autogen.sh \ tests/test1.sh tests/test2.sh tests/test3.sh \ tests/stream1.out tests/stream1.out tests/stream1.out \ + web/maptools.css \ web/codepage.html \ web/index.html \ web/shapelib-tools.html \ diff --git a/Makefile.in b/Makefile.in index 0d8e207..39629e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -626,6 +626,7 @@ AUTOMAKE_OPTIONS = dist-zip EXTRA_DIST = makefile.vc CMakeLists.txt autogen.sh \ tests/test1.sh tests/test2.sh tests/test3.sh \ tests/stream1.out tests/stream1.out tests/stream1.out \ + web/maptools.css \ web/codepage.html \ web/index.html \ web/shapelib-tools.html \ diff --git a/README b/README old mode 100755 new mode 100644 diff --git a/configure b/configure index c985f40..5d8df6f 100755 --- a/configure +++ b/configure @@ -4137,7 +4137,7 @@ unknown) esac -SHAPELIB_SO_VERSION=2:1:1 +SHAPELIB_SO_VERSION=2:1:0 ac_ext=c diff --git a/configure.ac b/configure.ac index 831be7d..619d47f 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AM_SILENT_RULES([yes]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -AC_SUBST([SHAPELIB_SO_VERSION], [2:1:1]) +AC_SUBST([SHAPELIB_SO_VERSION], [2:1:0]) AC_PROG_CC AC_PROG_CXX diff --git a/contrib/doc/Shape_PointInPoly_README.txt b/contrib/doc/Shape_PointInPoly_README.txt index dffe2eb..ed4ff8e 100644 --- a/contrib/doc/Shape_PointInPoly_README.txt +++ b/contrib/doc/Shape_PointInPoly_README.txt @@ -23,7 +23,7 @@ I wrote this function for the Autodesk Autocad 2004 MPolygon, because there was no function to do this in the Object Arx SDK (the Acad programming SDK). Well, it will be in the 2005 release...but, still. There is a function in the Autodesk Map 2004 version...in the menu. -Not usefull when you need the coordinates, not the point on the screen... +Not useful when you need the coordinates, not the point on the screen... So when the Acad version was done I was thinking of doing it on the Shape files, too. A little bit of changing the structures and variable types (so they're not using Object Arx) and I was done. diff --git a/contrib/shpgeo.c b/contrib/shpgeo.c index c849fc2..4d14d3a 100644 --- a/contrib/shpgeo.c +++ b/contrib/shpgeo.c @@ -32,6 +32,23 @@ * use -DPROJ4 to compile in Projection support * * $Log: shpgeo.c,v $ + * Revision 1.15 2016-12-06 21:13:33 erouault + * * configure.ac: change soname to 2:1:0 to be in sync with Debian soname. + * http://bugzilla.maptools.org/show_bug.cgi?id=2628 + * Patch by Bas Couwenberg + * + * * contrib/doc/Shape_PointInPoly_README.txt, contrib/shpgeo.c: typo fixes. + * http://bugzilla.maptools.org/show_bug.cgi?id=2629 + * Patch by Bas Couwenberg + * + * * web/*: use a local .css file to avoid a privacy breach issue reported + * by the lintian QA tool. + * http://bugzilla.maptools.org/show_bug.cgi?id=2630 + * Patch by Bas Couwenberg + * + * + * Contributed by Sandro Mani: https://github.com/manisandro/shapelib/tree/autotools + * * Revision 1.14 2016-12-05 12:44:07 erouault * * Major overhaul of Makefile build system to use autoconf/automake. * @@ -1459,7 +1476,7 @@ SHPObject* SHPClone ( SHPObject *psCShape, int lowPart, int highPart ) { highPart = psCShape->nParts ; #ifdef DEBUG - printf (" cloning SHP (%d parts) from ring %d upto ring %d \n", + printf (" cloning SHP (%d parts) from ring %d to ring %d \n", psCShape->nParts, lowPart, highPart); #endif diff --git a/web/index.html b/web/index.html index d8aff5a..19a4336 100644 --- a/web/index.html +++ b/web/index.html @@ -1,7 +1,7 @@ <html> <head> <title>Shapefile C Library</title> -<link href="http://www.maptools.org/maptools.css"; rel="stylesheet" type="text/css"> +<link href="maptools.css" rel="stylesheet" type="text/css"> </head> <body> diff --git a/web/license.html b/web/license.html index 09a4c47..8f82616 100644 --- a/web/license.html +++ b/web/license.html @@ -1,7 +1,7 @@ <html> <head> <title>Shapelib License</title> -<link href="http://www.maptools.org/maptools.css"; rel="stylesheet" type="text/css"> +<link href="maptools.css" rel="stylesheet" type="text/css"> </head> <body> diff --git a/web/manifest.html b/web/manifest.html index 27aeb0f..c512112 100644 --- a/web/manifest.html +++ b/web/manifest.html @@ -1,7 +1,7 @@ <html> <head> <title>Shapefile C Library V1.2</title> -<link href="http://www.maptools.org/maptools.css"; rel="stylesheet" type="text/css"> +<link href="maptools.css" rel="stylesheet" type="text/css"> </head> <body> diff --git a/web/maptools.css b/web/maptools.css new file mode 100644 index 0000000..0ff995d --- /dev/null +++ b/web/maptools.css @@ -0,0 +1,357 @@ +/* Redefined Tags */ + +body { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} +h1 { + font-family: Arial, Helvetica, sans-serif; + font-size: 24px; + line-height: 32px; + color: #006699; + border-bottom-width: 2px; + border-bottom-style: solid; + border-bottom-color: #80B3CC; +} +h2 { + font-family: Arial, Helvetica, sans-serif; + font-size: 20px; + line-height: 26px; + color: #006699; + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: #80B3CC; +} +h3 { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 20px; + font-weight: bold; + color: #006699; + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: #80B3CC; +} +h4 { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 18px; + font-weight: bold; + color: #006699; +} +h5 { + font-family: Arial, Helvetica, sans-serif; + font-size: 13px; + font-weight: bold; + color: #006699; +} +h6 { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + font-weight: bold; +} + +p { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 16px; +} +span { + font-family: Arial, Helvetica, sans-serif; +} +div { + font-family: Arial, Helvetica, sans-serif; +} +blockquote { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} +pre { + font-family: "Courier New", Courier, mono; + font-size: 12px; +} +ol { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 16px; +} +ul { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 16px; + list-style-type: square; + list-style-image: url(images/bullets/squarebullet.gif); +} +ul.download { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 16px; + list-style-type: square; + list-style-image: url(images/bullets/dlbullet.gif); +} +ul.document { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 16px; + list-style-type: square; + list-style-image: url(images/bullets/pagebullet.gif); +} +li { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 16px; + margin-top: 4px; +} +dl { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} +dd { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} +dt { + margin-top: 8px; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} +td { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} +font { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} + + +a[href] { + font-family: Arial, Helvetica, sans-serif; + color: #006699; + text-decoration: underline; +} +a[href]:link { + font-family: Arial, Helvetica, sans-serif; + color: #006699; + text-decoration: underline; +} +a[href]:hover { + font-family: Arial, Helvetica, sans-serif; + color: #003366; + text-decoration: underline; +} +a[href]:visited { + font-family: Arial, Helvetica, sans-serif; + color: #003366; + text-decoration: underline; +} +a[href]:active { + font-family: Arial, Helvetica, sans-serif; + color: #199DBF; + text-decoration: underline; +} + + +/* Defined Classes */ + +.copyright { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + line-height: 12px; + color: #FFFFFF; + text-decoration: none; +} +a.copyright { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + line-height: 12px; + color: #FFFFFF; + text-decoration: none; +} +a.copyright:link { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + line-height: 12px; + color: #FFFFFF; + text-decoration: none; +} +a.copyright:hover { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + line-height: 12px; + color: #FFFFFF; + text-decoration: underline; +} +a.copyright:visited { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + line-height: 12px; + color: #FFFFFF; + text-decoration: none; +} +a.copyright:active { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + line-height: 12px; + color: #FFFFFF; + text-decoration: underline; +} + + +.TechNewsHead { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + color: #003366; + line-height: 16px; + margin:0px; + padding: 3px; + padding-top: 14px; + padding-left: 20px; + padding-right: 20px; +} +.TechNewsBody { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 13px; + color: #000000; + margin:0px; + padding: 3px; + padding-left: 20px; + padding-right: 20px; +} + + +.Intro { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: normal; + color: #003366; + background-color: #EFF3F7; + border: 1px dashed #DCE4ED; + padding: 6px; +} + +.shopbox { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: normal; + color: #003366; + border: 1px dashed #E7E4DA; + background-color: #F7F7EF; + padding: 6px; + padding-bottom: 18px; + padding-top: 18px; +} + +.shopboxTitle { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 20px; + font-weight: bold; + margin-bottom: 2px; + color: #006699; + text-align: left; +} + +.welcomeTitle { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 18px; + font-weight: bold; + color: #006699; + text-align: left; +} + +.license { + padding: 5px; + border: 1px solid #003366; +} +table.BlueBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + background-color: #003366; + border-spacing: 1px; +} +td.BlueBox { + background-color: #EFF3F7; + font-size: 12px; + color: #003366; + margin:0px; + padding: 4px; +} + +.BlueCopyLt { + color: #006699; +} +.BlueCopyDk { + color: #003366; +} + + +.SideTitle { + font-size: 12px; + font-weight: bold; + line-height: 16px; + color: #003366; + margin:0px; + padding: 4px; + padding-left: 7px; +} +.SideMenuItem { + font-size: 11px; + line-height: 14px; + color: #003366; + margin:0px; + padding:4px; + padding-left: 7px; +} +.SideText { + font-size: 11px; + line-height: 14px; + margin:0px; + padding: 4px; + padding-left: 7px; +} +.TopMenu { + font-size: 11px; + color: #FFFFFF; + margin:0px; + padding: 4px; + padding-left: 7px; +} + +TopMenuItem { + font-size: 11px; + color: #FFFFFF; +} + +a.TopMenuItem { + font-size: 11px; + color: #FFFFFF; + text-decoration: underline; +} + +a.TopMenuItem:link { + font-size: 11px; + color: #FFFFFF; + text-decoration: underline; +} + +a.TopMenuItem:hover { + font-size: 11px; + color: #AFBFCF; + text-decoration: underline; +} + +a.TopMenuItem:visited { + font-size: 11px; + color: #FFFFFF; + text-decoration: underline; +} + +a.TopMenuItem:active { + font-size: 11px; + color: #A0CFFF; + text-decoration: underline; +} + diff --git a/web/release.html b/web/release.html index 67d603d..ea0f3d6 100644 --- a/web/release.html +++ b/web/release.html @@ -1,7 +1,7 @@ <html> <head> <title>Shapelib Release Notes</title> -<link href="http://www.maptools.org/maptools.css"; rel="stylesheet" type="text/css"> +<link href="maptools.css" rel="stylesheet" type="text/css"> </head> <body> diff --git a/web/shapelib-tools.html b/web/shapelib-tools.html index 19ad547..6ff8ea3 100644 --- a/web/shapelib-tools.html +++ b/web/shapelib-tools.html @@ -1,7 +1,7 @@ <html> <head> <title>ShapeLib Tools - User Guide</title> -<link href="http://www.maptools.org/maptools.css"; rel="stylesheet" type="text/css"> +<link href="maptools.css" rel="stylesheet" type="text/css"> </head> <body> @@ -158,7 +158,7 @@ Shape:0 (Polygon) nVertices=4, nParts=1 <hr> <h2><a name="shprewind">shprewind</a></h2> -<b>Purpose</b>: validates and resets the winding order of rings in polygon geometries to match the ordering required by shapefile specification. This is usefull for shapefiles having troubles when checked with a 'shpdump -validate'. +<b>Purpose</b>: validates and resets the winding order of rings in polygon geometries to match the ordering required by shapefile specification. This is useful for shapefiles having troubles when checked with a 'shpdump -validate'. <br> <b>Usage</b>: <font face="courier">shprewind in_shp_file out_shp_file</font> <br> @@ -200,7 +200,7 @@ Shape:0 (Polygon) nVertices=4, nParts=1 <br> <ul> <li><b>-v</b>: verbose mode.</li> - <li><b>-f</b>: forces data convertion if data field types is not the same at both files or if is there any null value into <u>from_DBFfile</u>.</li> + <li><b>-f</b>: forces data conversion if data field types is not the same at both files or if is there any null value into <u>from_DBFfile</u>.</li> <li><b>from_DBFfile</b>: source xBase file.</li> <li><b>to_DBFfile</b>: destiny xBase file.</li> </ul> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/shapelib.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
