This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental-2.1 in repository gdal.
commit 37bea8b9e78bcc4ce3ec3ab25e5d45ad5ae5aa1c Author: Bas Couwenberg <[email protected]> Date: Fri Apr 29 11:01:52 2016 +0200 Imported Upstream version 2.1.0~rc3+dfsg --- configure | 68 +++++++++++++++++++++++++++- configure.in | 18 +++++++- gcore/gdal_version.h | 2 +- man/man1/_home_rouault_dist_wrk_gdal_apps_.1 | 2 +- man/man1/gdal-config.1 | 2 +- man/man1/gdal2tiles.1 | 2 +- man/man1/gdal_calc.1 | 2 +- man/man1/gdal_contour.1 | 2 +- man/man1/gdal_edit.1 | 2 +- man/man1/gdal_fillnodata.1 | 2 +- man/man1/gdal_grid.1 | 2 +- man/man1/gdal_merge.1 | 2 +- man/man1/gdal_pansharpen.1 | 2 +- man/man1/gdal_polygonize.1 | 2 +- man/man1/gdal_proximity.1 | 2 +- man/man1/gdal_rasterize.1 | 2 +- man/man1/gdal_retile.1 | 2 +- man/man1/gdal_sieve.1 | 2 +- man/man1/gdal_translate.1 | 2 +- man/man1/gdal_utilities.1 | 2 +- man/man1/gdaladdo.1 | 2 +- man/man1/gdalbuildvrt.1 | 2 +- man/man1/gdalcompare.1 | 2 +- man/man1/gdaldem.1 | 2 +- man/man1/gdalinfo.1 | 2 +- man/man1/gdallocationinfo.1 | 2 +- man/man1/gdalmanage.1 | 2 +- man/man1/gdalmove.1 | 2 +- man/man1/gdalsrsinfo.1 | 2 +- man/man1/gdaltindex.1 | 2 +- man/man1/gdaltransform.1 | 2 +- man/man1/gdalwarp.1 | 2 +- man/man1/gnm_utilities.1 | 2 +- man/man1/gnmanalyse.1 | 2 +- man/man1/gnmmanage.1 | 2 +- man/man1/nearblack.1 | 2 +- man/man1/ogr2ogr.1 | 2 +- man/man1/ogr_utilities.1 | 2 +- man/man1/ogrinfo.1 | 2 +- man/man1/ogrlineref.1 | 2 +- man/man1/ogrtindex.1 | 2 +- man/man1/pct2rgb.1 | 2 +- man/man1/rgb2pct.1 | 2 +- swig/python/setup.py | 2 +- 44 files changed, 125 insertions(+), 45 deletions(-) diff --git a/configure b/configure index c1fd46d..c41febc 100755 --- a/configure +++ b/configure @@ -29162,11 +29162,77 @@ fi if test -f /usr/include/qhull/libqhull.h; then EXTRA_INCLUDES="-I/usr/include/qhull $EXTRA_INCLUDES" else - EXTRA_INCLUDES="-I/usr/include/local/qhull $EXTRA_INCLUDES" + EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES" fi LIBS="-lqhull $LIBS" fi fi + for ac_header in libqhull/libqhull.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libqhull/libqhull.h" "ac_cv_header_libqhull_libqhull_h" "$ac_includes_default" +if test "x$ac_cv_header_libqhull_libqhull_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBQHULL_LIBQHULL_H 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_libqhull_libqhull_h" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qh_new_qhull in -lqhull" >&5 +$as_echo_n "checking for qh_new_qhull in -lqhull... " >&6; } +if ${ac_cv_lib_qhull_qh_new_qhull+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lqhull $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char qh_new_qhull (); +int +main () +{ +return qh_new_qhull (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_qhull_qh_new_qhull=yes +else + ac_cv_lib_qhull_qh_new_qhull=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qhull_qh_new_qhull" >&5 +$as_echo "$ac_cv_lib_qhull_qh_new_qhull" >&6; } +if test "x$ac_cv_lib_qhull_qh_new_qhull" = xyes; then : + QHULL_SETTING=yes +else + QHULL_SETTING=no +fi + + if test "$QHULL_SETTING" = "yes"; then + QHULL_SETTING=external + if test -f /usr/include/libqhull/libqhull.h; then + EXTRA_INCLUDES="-I/usr/include/libqhull $EXTRA_INCLUDES" + else + EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES" + fi + LIBS="-lqhull $LIBS" + fi + fi + if test "$QHULL_SETTING" = "no" ; then if test "$with_qhull" = "yes"; then as_fn_error $? "--with-qhull requested, but library not found!" "$LINENO" 5 diff --git a/configure.in b/configure.in index 836a0bf..2f32fd2 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl *************************************************************************** -dnl $Id: configure.in 33877 2016-04-03 16:26:48Z rouault $ +dnl $Id: configure.in 34060 2016-04-22 11:15:16Z rouault $ dnl dnl Project: GDAL dnl Purpose: Configure source file. @@ -3636,11 +3636,25 @@ elif test "$with_qhull" = "yes" -o "$with_qhull" = "" ; then if test -f /usr/include/qhull/libqhull.h; then EXTRA_INCLUDES="-I/usr/include/qhull $EXTRA_INCLUDES" else - EXTRA_INCLUDES="-I/usr/include/local/qhull $EXTRA_INCLUDES" + EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES" fi LIBS="-lqhull $LIBS" fi fi + AC_CHECK_HEADERS([libqhull/libqhull.h]) + if test "$ac_cv_header_libqhull_libqhull_h" = "yes"; then + AC_CHECK_LIB(qhull,qh_new_qhull,QHULL_SETTING=yes,QHULL_SETTING=no,) + if test "$QHULL_SETTING" = "yes"; then + QHULL_SETTING=external + if test -f /usr/include/libqhull/libqhull.h; then + EXTRA_INCLUDES="-I/usr/include/libqhull $EXTRA_INCLUDES" + else + EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES" + fi + LIBS="-lqhull $LIBS" + fi + fi + if test "$QHULL_SETTING" = "no" ; then if test "$with_qhull" = "yes"; then AC_MSG_ERROR([--with-qhull requested, but library not found!]) diff --git a/gcore/gdal_version.h b/gcore/gdal_version.h index f9ca3ef..c9e6e14 100644 --- a/gcore/gdal_version.h +++ b/gcore/gdal_version.h @@ -22,7 +22,7 @@ #endif #ifndef GDAL_RELEASE_DATE -# define GDAL_RELEASE_DATE 20160421 +# define GDAL_RELEASE_DATE 20160422 #endif #ifndef GDAL_RELEASE_NAME # define GDAL_RELEASE_NAME "2.1.0" diff --git a/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 b/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 index 1deacc7..b41a99d 100644 --- a/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 +++ b/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 @@ -1,4 +1,4 @@ -.TH "apps Directory Reference" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "apps Directory Reference" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal-config.1 b/man/man1/gdal-config.1 index fcc15bb..2c2ef53 100644 --- a/man/man1/gdal-config.1 +++ b/man/man1/gdal-config.1 @@ -1,4 +1,4 @@ -.TH "gdal-config" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal-config" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal2tiles.1 b/man/man1/gdal2tiles.1 index 0a14a78..29cd475 100644 --- a/man/man1/gdal2tiles.1 +++ b/man/man1/gdal2tiles.1 @@ -1,4 +1,4 @@ -.TH "gdal2tiles" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal2tiles" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_calc.1 b/man/man1/gdal_calc.1 index 15d829d..a845af2 100644 --- a/man/man1/gdal_calc.1 +++ b/man/man1/gdal_calc.1 @@ -1,4 +1,4 @@ -.TH "gdal_calc" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_calc" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_contour.1 b/man/man1/gdal_contour.1 index bf8b4a1..18d81e1 100644 --- a/man/man1/gdal_contour.1 +++ b/man/man1/gdal_contour.1 @@ -1,4 +1,4 @@ -.TH "gdal_contour" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_contour" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_edit.1 b/man/man1/gdal_edit.1 index 3375b56..cb6ae42 100644 --- a/man/man1/gdal_edit.1 +++ b/man/man1/gdal_edit.1 @@ -1,4 +1,4 @@ -.TH "gdal_edit" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_edit" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_fillnodata.1 b/man/man1/gdal_fillnodata.1 index 7b76a5a..3fd9863 100644 --- a/man/man1/gdal_fillnodata.1 +++ b/man/man1/gdal_fillnodata.1 @@ -1,4 +1,4 @@ -.TH "gdal_fillnodata" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_fillnodata" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_grid.1 b/man/man1/gdal_grid.1 index 7acb8e0..d066e0c 100644 --- a/man/man1/gdal_grid.1 +++ b/man/man1/gdal_grid.1 @@ -1,4 +1,4 @@ -.TH "gdal_grid" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_grid" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_merge.1 b/man/man1/gdal_merge.1 index 28ba6be..dd1ce35 100644 --- a/man/man1/gdal_merge.1 +++ b/man/man1/gdal_merge.1 @@ -1,4 +1,4 @@ -.TH "gdal_merge" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_merge" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_pansharpen.1 b/man/man1/gdal_pansharpen.1 index be191d5..54517d3 100644 --- a/man/man1/gdal_pansharpen.1 +++ b/man/man1/gdal_pansharpen.1 @@ -1,4 +1,4 @@ -.TH "gdal_pansharpen" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_pansharpen" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_polygonize.1 b/man/man1/gdal_polygonize.1 index 8c194e4..c6243df 100644 --- a/man/man1/gdal_polygonize.1 +++ b/man/man1/gdal_polygonize.1 @@ -1,4 +1,4 @@ -.TH "gdal_polygonize" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_polygonize" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_proximity.1 b/man/man1/gdal_proximity.1 index b3c37a4..5442589 100644 --- a/man/man1/gdal_proximity.1 +++ b/man/man1/gdal_proximity.1 @@ -1,4 +1,4 @@ -.TH "gdal_proximity" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_proximity" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_rasterize.1 b/man/man1/gdal_rasterize.1 index 75d2908..89e575c 100644 --- a/man/man1/gdal_rasterize.1 +++ b/man/man1/gdal_rasterize.1 @@ -1,4 +1,4 @@ -.TH "gdal_rasterize" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_rasterize" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_retile.1 b/man/man1/gdal_retile.1 index be11df5..d28f619 100644 --- a/man/man1/gdal_retile.1 +++ b/man/man1/gdal_retile.1 @@ -1,4 +1,4 @@ -.TH "gdal_retile" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_retile" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_sieve.1 b/man/man1/gdal_sieve.1 index 30af76a..18e1b13 100644 --- a/man/man1/gdal_sieve.1 +++ b/man/man1/gdal_sieve.1 @@ -1,4 +1,4 @@ -.TH "gdal_sieve" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_sieve" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_translate.1 b/man/man1/gdal_translate.1 index 62667dc..03107fb 100644 --- a/man/man1/gdal_translate.1 +++ b/man/man1/gdal_translate.1 @@ -1,4 +1,4 @@ -.TH "gdal_translate" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_translate" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_utilities.1 b/man/man1/gdal_utilities.1 index b67d0b9..c95c96d 100644 --- a/man/man1/gdal_utilities.1 +++ b/man/man1/gdal_utilities.1 @@ -1,4 +1,4 @@ -.TH "gdal_utilities" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_utilities" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaladdo.1 b/man/man1/gdaladdo.1 index c079353..b9d39be 100644 --- a/man/man1/gdaladdo.1 +++ b/man/man1/gdaladdo.1 @@ -1,4 +1,4 @@ -.TH "gdaladdo" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdaladdo" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalbuildvrt.1 b/man/man1/gdalbuildvrt.1 index d4d9cfc..cdf664a 100644 --- a/man/man1/gdalbuildvrt.1 +++ b/man/man1/gdalbuildvrt.1 @@ -1,4 +1,4 @@ -.TH "gdalbuildvrt" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdalbuildvrt" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalcompare.1 b/man/man1/gdalcompare.1 index f9a6d0f..d90183c 100644 --- a/man/man1/gdalcompare.1 +++ b/man/man1/gdalcompare.1 @@ -1,4 +1,4 @@ -.TH "gdalcompare" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdalcompare" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaldem.1 b/man/man1/gdaldem.1 index f45e086..6792f62 100644 --- a/man/man1/gdaldem.1 +++ b/man/man1/gdaldem.1 @@ -1,4 +1,4 @@ -.TH "gdaldem" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdaldem" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalinfo.1 b/man/man1/gdalinfo.1 index 3ad8c14..f073a45 100644 --- a/man/man1/gdalinfo.1 +++ b/man/man1/gdalinfo.1 @@ -1,4 +1,4 @@ -.TH "gdalinfo" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdalinfo" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdallocationinfo.1 b/man/man1/gdallocationinfo.1 index c4ce547..2717926 100644 --- a/man/man1/gdallocationinfo.1 +++ b/man/man1/gdallocationinfo.1 @@ -1,4 +1,4 @@ -.TH "gdallocationinfo" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdallocationinfo" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalmanage.1 b/man/man1/gdalmanage.1 index 49a9a76..db2b0f3 100644 --- a/man/man1/gdalmanage.1 +++ b/man/man1/gdalmanage.1 @@ -1,4 +1,4 @@ -.TH "gdalmanage" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdalmanage" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalmove.1 b/man/man1/gdalmove.1 index 4f42e59..277e63f 100644 --- a/man/man1/gdalmove.1 +++ b/man/man1/gdalmove.1 @@ -1,4 +1,4 @@ -.TH "gdalmove" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdalmove" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalsrsinfo.1 b/man/man1/gdalsrsinfo.1 index 915701b..d26e899 100644 --- a/man/man1/gdalsrsinfo.1 +++ b/man/man1/gdalsrsinfo.1 @@ -1,4 +1,4 @@ -.TH "gdalsrsinfo" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdalsrsinfo" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaltindex.1 b/man/man1/gdaltindex.1 index c9eba67..06df3d6 100644 --- a/man/man1/gdaltindex.1 +++ b/man/man1/gdaltindex.1 @@ -1,4 +1,4 @@ -.TH "gdaltindex" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdaltindex" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaltransform.1 b/man/man1/gdaltransform.1 index c0b8676..1ea7f04 100644 --- a/man/man1/gdaltransform.1 +++ b/man/man1/gdaltransform.1 @@ -1,4 +1,4 @@ -.TH "gdaltransform" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdaltransform" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalwarp.1 b/man/man1/gdalwarp.1 index d9dc1ec..d043c3f 100644 --- a/man/man1/gdalwarp.1 +++ b/man/man1/gdalwarp.1 @@ -1,4 +1,4 @@ -.TH "gdalwarp" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gdalwarp" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gnm_utilities.1 b/man/man1/gnm_utilities.1 index 89b38b7..0baf4db 100644 --- a/man/man1/gnm_utilities.1 +++ b/man/man1/gnm_utilities.1 @@ -1,4 +1,4 @@ -.TH "gnm_utilities" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gnm_utilities" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gnmanalyse.1 b/man/man1/gnmanalyse.1 index 3114ea4..39becec 100644 --- a/man/man1/gnmanalyse.1 +++ b/man/man1/gnmanalyse.1 @@ -1,4 +1,4 @@ -.TH "gnmanalyse" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gnmanalyse" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gnmmanage.1 b/man/man1/gnmmanage.1 index 745d148..faa3b65 100644 --- a/man/man1/gnmmanage.1 +++ b/man/man1/gnmmanage.1 @@ -1,4 +1,4 @@ -.TH "gnmmanage" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "gnmmanage" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/nearblack.1 b/man/man1/nearblack.1 index 6100699..0ab9b00 100644 --- a/man/man1/nearblack.1 +++ b/man/man1/nearblack.1 @@ -1,4 +1,4 @@ -.TH "nearblack" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "nearblack" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogr2ogr.1 b/man/man1/ogr2ogr.1 index c1c8286..be85c0f 100644 --- a/man/man1/ogr2ogr.1 +++ b/man/man1/ogr2ogr.1 @@ -1,4 +1,4 @@ -.TH "ogr2ogr" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "ogr2ogr" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogr_utilities.1 b/man/man1/ogr_utilities.1 index 5582e16..81f6c78 100644 --- a/man/man1/ogr_utilities.1 +++ b/man/man1/ogr_utilities.1 @@ -1,4 +1,4 @@ -.TH "ogr_utilities" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "ogr_utilities" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogrinfo.1 b/man/man1/ogrinfo.1 index 3647f2a..d570e33 100644 --- a/man/man1/ogrinfo.1 +++ b/man/man1/ogrinfo.1 @@ -1,4 +1,4 @@ -.TH "ogrinfo" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "ogrinfo" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogrlineref.1 b/man/man1/ogrlineref.1 index dcea114..1412f62 100644 --- a/man/man1/ogrlineref.1 +++ b/man/man1/ogrlineref.1 @@ -1,4 +1,4 @@ -.TH "ogrlineref" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "ogrlineref" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogrtindex.1 b/man/man1/ogrtindex.1 index dfa5237..273ffa2 100644 --- a/man/man1/ogrtindex.1 +++ b/man/man1/ogrtindex.1 @@ -1,4 +1,4 @@ -.TH "ogrtindex" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "ogrtindex" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/pct2rgb.1 b/man/man1/pct2rgb.1 index 34b1508..3ba10e3 100644 --- a/man/man1/pct2rgb.1 +++ b/man/man1/pct2rgb.1 @@ -1,4 +1,4 @@ -.TH "pct2rgb" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "pct2rgb" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/rgb2pct.1 b/man/man1/rgb2pct.1 index 10a619f..ce78a69 100644 --- a/man/man1/rgb2pct.1 +++ b/man/man1/rgb2pct.1 @@ -1,4 +1,4 @@ -.TH "rgb2pct" 1 "Thu Apr 21 2016" "GDAL" \" -*- nroff -*- +.TH "rgb2pct" 1 "Fri Apr 22 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/swig/python/setup.py b/swig/python/setup.py index d73af84..85d8799 100644 --- a/swig/python/setup.py +++ b/swig/python/setup.py @@ -249,7 +249,7 @@ py_modules = ['gdal', if os.path.exists('setup_vars.ini'): with open('setup_vars.ini') as f: lines = f.readlines() - if 'GNM_ENABLED=yes' or 'GNM_ENABLED=yes\n' in lines: + if 'GNM_ENABLED=yes' in lines or 'GNM_ENABLED=yes\n' in lines: GNM_ENABLED = True if GNM_ENABLED: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
