This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository proj.
commit 21a24cc3db81623de4dceb13c91ab59bd507b735
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Feb 23 20:41:14 2018 +0100
Drop install-nad-gtx.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/install-nad-gtx.patch | 37 ------------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0753071..19d9582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
proj (5.0.0~rc5-1) UNRELEASED; urgency=medium
* New upstream release candidate.
+ * Drop install-nad-gtx.patch, applied upstream.
-- Bas Couwenberg <sebas...@debian.org> Fri, 23 Feb 2018 20:40:32 +0100
diff --git a/debian/patches/install-nad-gtx.patch
b/debian/patches/install-nad-gtx.patch
deleted file mode 100644
index 3936f9d..0000000
--- a/debian/patches/install-nad-gtx.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Also install .gtx files from proj-datumgrid.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: https://github.com/OSGeo/proj.4/pull/813
-Applied-Upstream:
https://github.com/OSGeo/proj.4/commit/b65e8ef7b29f19c6b4b4a49cf95766ec1f752491
-
---- 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)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 44c66a0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-install-nad-gtx.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/proj.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
