Bas Couwenberg pushed to branch master at Debian GIS Project / gdal
Commits: 56e93d23 by Bas Couwenberg at 2020-09-04T12:14:20+02:00 Add upstream patch to fix FTBFS with poppler 20.09.0. - - - - - cb828a33 by Bas Couwenberg at 2020-09-04T12:14:29+02:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - + debian/patches/0001-Unix-build-fix-detection-of-minor-version-number-of-.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,11 @@ -gdal (3.1.2+dfsg-2) UNRELEASED; urgency=medium +gdal (3.1.2+dfsg-2) unstable; urgency=medium * Fix duplicate files in copyright file. * Add lintian overrides for file-references-package-build-path. * Drop libspatialite-dev version requirement. + * Add upstream patch to fix FTBFS with poppler 20.09.0. - -- Bas Couwenberg <[email protected]> Sun, 23 Aug 2020 19:38:18 +0200 + -- Bas Couwenberg <[email protected]> Fri, 04 Sep 2020 12:14:21 +0200 gdal (3.1.2+dfsg-1) unstable; urgency=medium ===================================== debian/patches/0001-Unix-build-fix-detection-of-minor-version-number-of-.patch ===================================== @@ -0,0 +1,31 @@ +Description: Unix build: fix detection of minor version number of Poppler with the new YY.MM.X numbering scheme. +Author: Even Rouault <[email protected]> +Origin: https://github.com/OSGeo/gdal/commit/2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 +Bug: https://github.com/OSGeo/gdal/issues/2823 + +--- a/configure ++++ b/configure +@@ -40695,8 +40695,8 @@ $as_echo "yes" >&6; } + fi + if test "$POPPLER_VERSION" != ""; then + HAVE_POPPLER=yes +- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'` +- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'` ++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` ++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` + POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` + fi + else +--- a/configure.ac ++++ b/configure.ac +@@ -4945,8 +4945,8 @@ if test "$with_poppler" != "no" -a "$wit + [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=]) + if test "$POPPLER_VERSION" != ""; then + HAVE_POPPLER=yes +- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'` +- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` ++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` ++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` + POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` + fi + else ===================================== debian/patches/series ===================================== @@ -7,3 +7,4 @@ spatialite java.opt perl-vendor perl-doxyfile +0001-Unix-build-fix-detection-of-minor-version-number-of-.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/a2a5f06d06abf0b6143e2f10335cb0b455539447...cb828a33c3797f56f8a3f43c85098f48e3b3eeae -- View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/a2a5f06d06abf0b6143e2f10335cb0b455539447...cb828a33c3797f56f8a3f43c85098f48e3b3eeae You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
