Skip to content
Commits on Source (3)
proj (5.0.0~rc4-1~exp2) experimental; urgency=medium
* Update datumgrids.shar (XZ compressed) with proj-datumgrid-1.7RC1.
* Add patch to also install .gtx files from proj-datumgrid.
-- Bas Couwenberg <sebastic@debian.org> Thu, 22 Feb 2018 19:06:16 +0100
proj (5.0.0~rc4-1~exp1) experimental; urgency=medium
* New upstream release candidate.
......
......@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 9),
default-jdk-headless,
ant,
doxygen,
graphviz
graphviz,
xz-utils
Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/proj.git
Vcs-Git: https://anonscm.debian.org/git/pkg-grass/proj.git -b experimental
......
A66_National_13_09_01.gsb
alaska
BETA2007.gsb
conus
dvr90.gtx
FL
fvr09.gtx
GDA94_GDA2020_conformal_and_distortion.gsb
GDA94_GDA2020_conformal.gsb
gvr2016.gtx
hawaii
MD
National_84_02_07_01.gsb
ntf_r93.gsb
ntv1_can.dat
null
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Description: Also install .gtx files from proj-datumgrid.
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: https://github.com/OSGeo/proj.4/pull/813
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
@@ -50,7 +50,7 @@ install-data-local: process-nad2bin
else \
echo "nad2nad NADCON source files not present"; \
fi
- @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy \
+ @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/*.gtx $(NADPATH)/ntv1_can.dat dummy \
$(NADPATH)/alaska $(NADPATH)/conus $(NADPATH)/hawaii $(NADPATH)/null \
$(NADPATH)/prvi $(NADPATH)/stgeorge $(NADPATH)/stlrnc $(NADPATH)/stpaul \
$(NADPATH)/FL $(NADPATH)/MD $(NADPATH)/TN $(NADPATH)/WI $(NADPATH)/WO; do \
@@ -63,7 +63,7 @@ install-data-local: process-nad2bin
check-local: process-nad2bin
# Check if we are doing an out-of-tree build
@if test ! -f epsg; then \
- for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \
+ for gridfile in $(NADPATH)/*.gsb $(NADPATH)/*.gtx $(NADPATH)/ntv1_can.dat dummy ; do \
if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \
cp $$gridfile .; \
fi; \
--- a/nad/CMakeLists.txt
+++ b/nad/CMakeLists.txt
@@ -23,7 +23,8 @@ set(PROJ_DICTIONARY epsg
#
file(GLOB GSB_FILES *.gsb)
-set(GRIDSHIFT_FILES ${GSB_FILES})
+file(GLOB GTX_FILES *.gtx)
+set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES})
set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES}
)
option(CONVERT_DATA "convert some ascii file to binary file for use in proj4" OFF)
install-nad-gtx.patch