[Git][debian-gis-team/proj][experimental] Add patch to install null grid file if available.

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / proj


Commits:
7267f2fa by Bas Couwenberg at 2020-02-18T17:53:51+01:00
Add patch to install null grid file if available.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/install-null-grid.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+proj (7.0.0~rc1-1~exp2) UNRELEASED; urgency=medium
+
+  * Add patch to install null grid file if available.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 18 Feb 2020 17:46:25 +0100
+
 proj (7.0.0~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
debian/patches/install-null-grid.patch
=====================================
@@ -0,0 +1,25 @@
+Description: Install null grid file if available.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/OSGeo/PROJ/pull/1939
+
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -93,7 +93,7 @@ EXTRA_DIST = proj.ini GL27 nad.lst nad27
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ 	@for gridfile in $(DATAPATH)/*.gsb $(DATAPATH)/*.gtx $(DATAPATH)/ntv1_can.dat dummy \
+-	                 $(DATAPATH)/alaska $(DATAPATH)/conus $(DATAPATH)/hawaii \
++	                 $(DATAPATH)/alaska $(DATAPATH)/conus $(DATAPATH)/hawaii $(DATAPATH)/null \
+ 	                 $(DATAPATH)/prvi $(DATAPATH)/stgeorge $(DATAPATH)/stlrnc $(DATAPATH)/stpaul \
+ 	                 $(DATAPATH)/FL $(DATAPATH)/MD $(DATAPATH)/TN $(DATAPATH)/WI $(DATAPATH)/WO; do \
+ 	  if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -7,6 +7,7 @@ set(CONFIG_FILES
+ )
+ 
+ set(PROJ_DICTIONARY
++  null
+   world
+   other.extra
+   nad27


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 read_grid_from_user_writable_directory.patch
+install-null-grid.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/commit/7267f2fa112fe8228a8a2d6512afdbc86785d81d

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/commit/7267f2fa112fe8228a8a2d6512afdbc86785d81d
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/20200218/6b2873ed/attachment-0001.html>