[Git][debian-gis-team/postgis][master] 3 commits: Add patch to fix expected test output with GDAL 2.3.0 & PROJ 5.1.0. (closes: #901158)

Bas Couwenberg gitlab at salsa.debian.org
Sat Jun 9 18:29:20 BST 2018


Bas Couwenberg pushed to branch master at Debian GIS Project / postgis


Commits:
88252783 by Bas Couwenberg at 2018-06-09T18:49:50+02:00
Add patch to fix expected test output with GDAL 2.3.0 & PROJ 5.1.0. (closes: #901158)

- - - - -
88e0b45a by Bas Couwenberg at 2018-06-09T19:10:58+02:00
Don't use parallel for doc & docs-install targets.

- - - - -
1b81f91d by Bas Couwenberg at 2018-06-09T19:11:14+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/rt_gdalwarp.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-postgis (2.4.4+dfsg-2) UNRELEASED; urgency=medium
+postgis (2.4.4+dfsg-2) unstable; urgency=medium
 
   * Drop unnecessary get-orig-source target from rules file.
   * Bump Standards-Version to 4.1.4, changes: get-orig-source target.
   * Enable parallel builds.
-  * Don't use parallel for doc & man-install targets.
+  * Don't use parallel for doc, docs-install & man-install targets.
   * Strip trailing whitespace from changelog & control files.
+  * Add patch to fix expected test output with GDAL 2.3.0 & PROJ 5.1.0.
+    (closes: #901158)
 
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Apr 2018 16:39:56 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 09 Jun 2018 19:11:01 +0200
 
 postgis (2.4.4+dfsg-1) unstable; urgency=medium
 


=====================================
debian/patches/rt_gdalwarp.patch
=====================================
--- /dev/null
+++ b/debian/patches/rt_gdalwarp.patch
@@ -0,0 +1,33 @@
+Description: Fix expected test output with GDAL 2.3.0 & PROJ 5.1.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://trac.osgeo.org/postgis/ticket/4104
+Bug-Debian: https://bugs.debian.org/901158
+
+--- a/raster/test/regress/rt_gdalwarp_expected
++++ b/raster/test/regress/rt_gdalwarp_expected
+@@ -19,8 +19,8 @@ NOTICE:  Values must be provided for bot
+ 0.17|993309|243|243|1|50.000|50.000|0.000|0.000|950760.000|1396957.000|t|t|t
+ 0.18|992163|10|10|1|1000.000|-1000.000|3.000|3.000|-500030.000|600000.000|t|t|t
+ 0.19|993310|12|12|1|1009.894|-1009.894|3.000|3.000|950691.792|1409281.783|t|t|t
+-0.2|993309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
+-0.20|993309|12|12|1|1009.916|-1009.916|1.000|3.000|950742.107|1409088.896|t|t|t
++0.2|993309|12|12|1|1009.876|-1009.876|0.000|0.000|950808.447|1409091.640|t|t|t
++0.20|993309|12|12|1|1009.876|-1009.876|1.000|3.000|950788.250|1409091.640|t|t|t
+ 0.21|993310|24|24|1|500.000|500.000|3.000|3.000|950657.188|1397356.783|t|t|t
+ 0.22|993310|26|26|1|500.000|500.000|0.000|6.000|950452.000|1396632.000|t|t|t
+ 0.23|984269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+@@ -63,12 +63,12 @@ NOTICE:  Values must be provided for bot
+ 1.9|992163|11|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+ 2.1|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+ 2.10|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+-2.11|993309|121|121|1|100.000|100.000|0.000|0.000|950762.305|1396988.896|t|t|t
++2.11|993309|121|121|1|100.000|100.000|0.000|0.000|950808.447|1396991.640|t|t|t
+ 2.12|993310|6|6|1|2000.000|2000.000|0.000|0.000|950732.188|1397281.783|t|t|t
+ 2.13|993310|8|8|1|1500.000|1500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+ 2.14|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+ 2.15|993310|16|16|1|750.000|750.000|0.000|0.000|950732.188|1397281.783|t|t|t
+-2.2|993309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
++2.2|993309|12|12|1|1009.876|-1009.876|0.000|0.000|950808.447|1409091.640|t|t|t
+ 2.3|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+ 2.4|||||||||||||
+ 2.5|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 link-liblwgeom
 relax-test-timing-constraints.patch
+rt_gdalwarp.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -247,9 +247,9 @@ override_dh_auto_install-indep:
 	done)
 
 #	Compile and install docs
-	$(MAKE) $(NJOBS) -C doc docs-install \
-			DESTDIR=$(CURDIR)/debian/tmp \
-			PGSQL_DOCDIR=/usr/share/doc
+	$(MAKE) -C doc docs-install \
+		DESTDIR=$(CURDIR)/debian/tmp \
+		PGSQL_DOCDIR=/usr/share/doc
 
 override_dh_install-indep:
 	dh_install -i



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/6fc0103fc3a89a88bf134f21b0b3f43addc269f3...1b81f91d155f701b83ffae1b92ca98cca02a0df4

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/6fc0103fc3a89a88bf134f21b0b3f43addc269f3...1b81f91d155f701b83ffae1b92ca98cca02a0df4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180609/d2d66501/attachment-0001.html>


More information about the Pkg-grass-devel mailing list